1.0

README.md

@@ -1,144 +1,2 @@
-# 小初高数学学习系统
+# Partner_Project
-
-## 项目简介
-
-这是一个基于Java Swing开发的数学学习软件，专门为小学、初中和高中学生设计。系统提供个性化的数学题目生成、答题练习和成绩记录功能，支持用户注册、登录和密码管理。
-
-## 功能特性
-
-### 用户管理
-- **用户注册**：支持邮箱、用户名、密码和年级选择注册
-- **用户登录**：支持邮箱或用户名登录
-- **密码修改**：安全的密码修改功能
-- **数据持久化**：用户数据使用JSON格式存储
-
-### 题目生成
-- **分级题目**：根据用户年级（小学、初中、高中）生成相应难度的数学题目
-- **智能去重**：避免重复题目，确保练习效果
-- **题目保存**：自动保存生成的题目到用户专属文件夹
-
-### 答题系统
-- **选择题形式**：每题提供4个选项
-- **实时评分**：答题后立即显示结果
-- **成绩记录**：记录每次练习的成绩
-
-### 年级适配
-- **小学**：基础四则运算
-- **初中**：包含平方、平方根运算
-- **高中**：包含三角函数运算
-
-## 技术架构
-
-### 开发环境
-- **语言**：Java 21
-- **构建工具**：Maven
-- **GUI框架**：Swing
-- **数据格式**：JSON
-
-### 项目结构
-```
-src/
-├── model/                           # 数据模型层
-│   ├── UserManager.java             # 用户管理
-│   ├── QuestionMaker.java           # 题目生成器
-│   ├── Question.java                # 题目模型
-│   ├── Grade.java                   # 年级枚举
-│   ├── PrimaryMaker.java            # 小学题目生成
-│   ├── MiddleMaker.java             # 初中题目生成
-│   └── HighMaker.java               # 高中题目生成
-├── ui/                              # 用户界面层
-│   ├── MathLearningApp.java         # 主程序入口
-│   ├── LoginFrame.java              # 登录界面
-│   ├── RegisterDialog.java          # 注册对话框
-│   ├── GradeSelectionFrame.java     # 年级选择界面
-│   ├── QuizFrame.java               # 答题界面
-│   ├── ResultFrame.java             # 结果界面
-│   ├── UserSettingsDialog.java      # 用户设置
-│   └── ChangePasswordDialog.java    # 修改密码
-├── others/                          # 资源文件
-└── Math.exe                         # 可执行文件    
-```
-
-### 依赖库
-- **Gson 2.10.1**：JSON数据处理
-- **JavaMail 1.6.2**：邮件功能支持
-- **JAF 1.1.1**：JavaBeans激活框架
-
-## 安装与运行
-
-### 平台支持
-![Windows](https://img.shields.io/badge/Windows-Supported-0078D6?logo=windows)
-
-| 操作系统    | 版本要求        | 支持状态   | 应用      |
-|---------|-------------|--------|---------|
-| Windows | 11          | ✅ 完全支持 | exe应用程序 |
-
-运行前，请确保系统已安装以下环境：
-
-**Windows:**
-- **openjdk** 21.0.5(2024-10-15 LTS)
-- **OpenJDK Runtime Environment** build 21.0.5+11-LTS
-- **OpenJDK 64-Bit Server VM** build 21.0.5+11-LTS, mixed mode, sharing  
-- **Maven** 3.6或更高版本
-
-### 直接运行
- - 双击Math.exe程序
-
-### 编译运行
-```bash
-# 使用Maven编译
-mvn compile
-
-# 运行程序
-mvn exec:java
-
-# 打包为可执行JAR
-mvn package
-```
-
-## 使用说明
-
-### 首次使用
-1. 启动程序后进入登录界面
-2. 点击"注册"按钮创建新账户
-3. 填写邮箱、验证码
-4. 验证完成后填写用户名、密码并选择年级
-5. 注册成功后返回登录界面登录
-
-### 练习流程
-1. 登录成功后选择年级（系统会根据注册信息自动推荐）以及题目数量（10-30）
-2. 进入答题界面开始练习
-3. 选择答案后点击“下一题”继续
-4. 完成所有题目后自动生成并显示成绩
-
-### 用户设置
-- 在登录后界面可以修改密码
-- 系统会自动保存练习记录
-
-## 数据存储
-
-### 用户数据
-- 位置：`users.json`
-- 格式：JSON格式存储用户信息
-
-### 题目记录
-- 位置：`questions/{邮箱}/` 目录
-- 格式：按时间戳命名的文本文件
-
-## 开发说明
-
-### 扩展题目类型
-要添加新的题目类型，需要：
-1. 在相应的`*Maker.java`类中添加题目生成逻辑
-2. 在`QuestionMaker.java`中更新表达式解析逻辑
-3. 如果需要新的年级，更新`Grade.java`枚举
-
-### 自定义界面
-所有UI组件都使用Swing开发，可以通过修改对应的`*.java`文件来自定义界面样式和布局。
-
-### 分工
-后端：张一帆  
-前端：赵俊杰  
-邮箱注册实现：张一帆，赵俊杰  
-调试：赵俊杰，张一帆 
 

doc/README.md

@@ -1,143 +0,0 @@
-# 小初高数学学习系统
-
-## 项目简介
-
-这是一个基于Java Swing开发的数学学习软件，专门为小学、初中和高中学生设计。系统提供个性化的数学题目生成、答题练习和成绩记录功能，支持用户注册、登录和密码管理。
-
-## 功能特性
-
-### 用户管理
-- **用户注册**：支持邮箱、用户名、密码和年级选择注册
-- **用户登录**：支持邮箱或用户名登录
-- **密码修改**：安全的密码修改功能
-- **数据持久化**：用户数据使用JSON格式存储
-
-### 题目生成
-- **分级题目**：根据用户年级（小学、初中、高中）生成相应难度的数学题目
-- **智能去重**：避免重复题目，确保练习效果
-- **题目保存**：自动保存生成的题目到用户专属文件夹
-
-### 答题系统
-- **选择题形式**：每题提供4个选项
-- **实时评分**：答题后立即显示结果
-- **成绩记录**：记录每次练习的成绩
-
-### 年级适配
-- **小学**：基础四则运算
-- **初中**：包含平方、平方根运算
-- **高中**：包含三角函数运算
-
-## 技术架构
-
-### 开发环境
-- **语言**：Java 21
-- **构建工具**：Maven
-- **GUI框架**：Swing
-- **数据格式**：JSON
-
-### 项目结构
-```
-src/
-├── model/                           # 数据模型层
-│   ├── UserManager.java             # 用户管理
-│   ├── QuestionMaker.java           # 题目生成器
-│   ├── Question.java                # 题目模型
-│   ├── Grade.java                   # 年级枚举
-│   ├── PrimaryMaker.java            # 小学题目生成
-│   ├── MiddleMaker.java             # 初中题目生成
-│   └── HighMaker.java               # 高中题目生成
-├── ui/                              # 用户界面层
-│   ├── MathLearningApp.java         # 主程序入口
-│   ├── LoginFrame.java              # 登录界面
-│   ├── RegisterDialog.java          # 注册对话框
-│   ├── GradeSelectionFrame.java     # 年级选择界面
-│   ├── QuizFrame.java               # 答题界面
-│   ├── ResultFrame.java             # 结果界面
-│   ├── UserSettingsDialog.java      # 用户设置
-│   └── ChangePasswordDialog.java    # 修改密码
-├── others/                          # 资源文件
-└── Math.exe                         # 可执行文件    
-```
-
-### 依赖库
-- **Gson 2.10.1**：JSON数据处理
-- **JavaMail 1.6.2**：邮件功能支持
-- **JAF 1.1.1**：JavaBeans激活框架
-
-## 安装与运行
-
-### 平台支持
-![Windows](https://img.shields.io/badge/Windows-Supported-0078D6?logo=windows)
-
-| 操作系统    | 版本要求        | 支持状态   | 应用      |
-|---------|-------------|--------|---------|
-| Windows | 11          | ✅ 完全支持 | exe应用程序 |
-
-运行前，请确保系统已安装以下环境：
-
-**Windows:**
-- **openjdk** 21.0.5(2024-10-15 LTS)
-- **OpenJDK Runtime Environment** build 21.0.5+11-LTS
-- **OpenJDK 64-Bit Server VM** build 21.0.5+11-LTS, mixed mode, sharing  
-- **Maven** 3.6或更高版本
-
-### 直接运行
- - 双击Math.exe程序
-
-### 编译运行
-```bash
-# 使用Maven编译
-mvn compile
-
-# 运行程序
-mvn exec:java
-
-# 打包为可执行JAR
-mvn package
-```
-
-## 使用说明
-
-### 首次使用
-1. 启动程序后进入登录界面
-2. 点击"注册"按钮创建新账户
-3. 填写邮箱、验证码
-4. 验证完成后填写用户名、密码并选择年级
-5. 注册成功后返回登录界面登录
-
-### 练习流程
-1. 登录成功后选择年级（系统会根据注册信息自动推荐）以及题目数量（10-30）
-2. 进入答题界面开始练习
-3. 选择答案后点击“下一题”继续
-4. 完成所有题目后自动生成并显示成绩
-
-### 用户设置
-- 在登录后界面可以修改密码
-- 系统会自动保存练习记录
-
-## 数据存储
-
-### 用户数据
-- 位置：`users.json`
-- 格式：JSON格式存储用户信息
-
-### 题目记录
-- 位置：`questions/{邮箱}/` 目录
-- 格式：按时间戳命名的文本文件
-
-## 开发说明
-
-### 扩展题目类型
-要添加新的题目类型，需要：
-1. 在相应的`*Maker.java`类中添加题目生成逻辑
-2. 在`QuestionMaker.java`中更新表达式解析逻辑
-3. 如果需要新的年级，更新`Grade.java`枚举
-
-### 自定义界面
-所有UI组件都使用Swing开发，可以通过修改对应的`*.java`文件来自定义界面样式和布局。
-
-### 分工
-后端：张一帆  
-前端：赵俊杰  
-邮箱注册实现：张一帆，赵俊杰  
-调试：赵俊杰，张一帆 

questions/1617940512@qq.com/2025-10-09-11-42-52.txt

@@ -1,19 +0,0 @@
-1. 78 / 96 - 22
-
-2. 15 - 17 * (49 / 15)
-
-3. 66 + 28 / 8 + (1 / 25)
-
-4. 16 * 2
-
-5. 26 * (98 * 90)
-
-6. 4 + 89 * (70 / 3)
-
-7. 41 + 36 + 55 + 9
-
-8. 79 * 72 - 19 * 32
-
-9. 2 - 2
-
-10. (32 - 82) + 16

questions/1617940512@qq.com/2025-10-09-11-43-02.txt

@@ -1,19 +0,0 @@
-1. 70^2 / 64
-
-2. 11^2 + 31 + 85^2 - 61
-
-3. √95 - 73^2 + 54^2
-
-4. 53 - (√44 / 53 / 5^2) * 10^2
-
-5. 5^2 * 75^2 / √24 - √20 + 74^2
-
-6. √74 / 82
-
-7. 31 * 5 * √42 / 53^2 + √19
-
-8. 48 + 24^2 / 12^2 - 87
-
-9. (37 * 38^2 + √82 / 27) + 32
-
-10. 95 - √72

questions/1617940512@qq.com/2025-10-09-11-43-35.txt

@@ -1,19 +0,0 @@
-1. 47 * sin(70) * 75 - cos(16)
-
-2. sin(65) * 38 - 16 / 68
-
-3. 78 * sin(50) / cos(70) * tan(52)
-
-4. (cos(70) + sin(12) + 85) - cos(46)
-
-5. cos(60) / tan(4)
-
-6. 70 * sin(28) * sin(7)
-
-7. tan(74) - cos(55) - cos(42) + tan(38)
-
-8. tan(62) + 45
-
-9. 52 + sin(33)
-
-10. sin(40) * 29

questions/1617940512@qq.com/2025-10-09-12-06-21.txt

@@ -1,19 +0,0 @@
-1. 5 - 41
-
-2. 12 / (22 / 21 + 5) + 60
-
-3. 88 * (22 * 75)
-
-4. 5 - 23
-
-5. 72 * 61 / 59 + 40
-
-6. 2 * 50
-
-7. (37 * 99) - 92 * 43
-
-8. 85 * 88
-
-9. 38 / 98 - 75 - 71 / 74
-
-10. 63 / (44 - 25)

questions/1617940512@qq.com/2025-10-09-12-06-40.txt

@@ -1,59 +0,0 @@
-1. 6 + 63 - 75 - 63 / 89
-
-2. 38 - (63 * 76) + 41
-
-3. 31 * 90 - 8 + 28 + 19
-
-4. 21 - 94
-
-5. 66 + (49 / 9)
-
-6. 36 * 30 * 74
-
-7. 63 / 1 / 57 - (12 - 60)
-
-8. (91 - 68 + 66) * 7 * 83
-
-9. 68 - 47 / 15 / 84
-
-10. 38 - 47 * 19
-
-11. 4 * 19
-
-12. 48 / 38 - 62
-
-13. 27 - 13
-
-14. 32 * 61 / 25 + 11
-
-15. 10 - 71
-
-16. 92 - (27 + 99 - 57)
-
-17. 9 / (79 - 59)
-
-18. 76 - (68 + 73 + 20)
-
-19. 97 - 1
-
-20. 66 - 43 * 19 / 2 / 2
-
-21. 78 / 35 / 94 + 12 - 16
-
-22. 54 + 96
-
-23. 34 - 5
-
-24. 4 - 39
-
-25. 58 / 17 / 45 * 51
-
-26. 3 + (71 - 43)
-
-27. 21 - (93 - 83)
-
-28. 46 / 10 / 20 + 42
-
-29. 35 + (37 - 90)
-
-30. 83 * 82 - 11

questions/1617940512@qq.com/2025-10-09-12-10-07.txt

@@ -1,59 +0,0 @@
-1. (58 + 75) / 19
-
-2. 99 * 13 / 10
-
-3. 97 + 77
-
-4. (93 + 10) - 26
-
-5. 21 + 77 - 78 / (56 - 28)
-
-6. 97 + 19
-
-7. 97 * (31 + 25 * 33 * 68)
-
-8. 90 / 18 - 80 - 51
-
-9. 53 / 28 - 39 + 21
-
-10. 58 - 94
-
-11. 10 - 85
-
-12. 100 - 42 * 9 - 66 - 49
-
-13. 22 / (19 + 65 / 17)
-
-14. 48 + (5 + 2) - 25
-
-15. 91 * 9 * (26 + 70) / 93
-
-16. 20 + 3 / 42
-
-17. 24 / 39 * 69
-
-18. (88 + 55) + 14 * 42
-
-19. 90 / 16 / 9 * 75
-
-20. 84 * 65 / (84 - 70)
-
-21. 30 * (85 / 83)
-
-22. 89 / 15 - 55 - 60 + 37
-
-23. (12 * 66) / 82
-
-24. (27 + 47) / 85
-
-25. 12 * 80 + 27 * 86 * 80
-
-26. 47 + 88 + (45 * 29)
-
-27. 93 + 7 + 28 + 85 / 92
-
-28. 9 * 4 + (62 / 31)
-
-29. 6 - 26
-
-30. (58 * 70) + 55

questions/1617940512@qq.com/2025-10-09-12-12-17.txt

@@ -1,19 +0,0 @@
-1. 14 * 25 * (59 * 79)
-
-2. 21 / 91 / 4 - (87 * 16)
-
-3. 46 / 20 + 87 * 59
-
-4. 86 / (7 * 59)
-
-5. 85 / 35 * 30
-
-6. 9 - 88
-
-7. 27 + 10
-
-8. 94 - 76 / 59
-
-9. 37 / (5 / 89)
-
-10. 25 * 46 + 28

questions/1617940512@qq.com/2025-10-09-12-12-30.txt

@@ -1,19 +0,0 @@
-1. (39 + 54^2 * 23) / 1 * 50
-
-2. 69^2 - 82
-
-3. √36 + 49
-
-4. √44 + 45 * 95
-
-5. 10 - 76^2 - 70^2
-
-6. √72 * √98 * 16
-
-7. (27^2 / 48) / 10
-
-8. 9 + √40 - 25 / √69 / 13^2
-
-9. 73 * (8^2 / 61 - 96)
-
-10. √34 / (√64 * 79)

questions/1617940512@qq.com/2025-10-09-12-12-44.txt

@@ -1,19 +0,0 @@
-1. 57 / cos(76)
-
-2. sin(5) - sin(22)
-
-3. sin(90) + sin(66) * 79
-
-4. (sin(42) + tan(30)) - cos(68)
-
-5. tan(96) - tan(54) / tan(30)
-
-6. tan(24) / 73
-
-7. 76 + sin(86) - sin(98) * 25
-
-8. 16 / cos(84) * 22
-
-9. cos(77) + sin(21) * 14
-
-10. sin(19) * cos(53) / 28

questions/1617940512@qq.com/2025-10-09-12-55-01.txt

@@ -1,19 +0,0 @@
-1. 40 * 27 + 23 - 30
-
-2. 27 / 53
-
-3. 55 + 18 / 51 + 70 * 20
-
-4. 66 - 81
-
-5. 68 + (87 / 23)
-
-6. 48 / 62
-
-7. (79 + 74 * 6) + 99
-
-8. 66 * 67
-
-9. 20 + 5 - 43 * 28 * 16
-
-10. (46 + 78) + 1

questions/1617940512@qq.com/2025-10-09-13-03-33.txt

@@ -1,19 +0,0 @@
-1. 81 / 75 - 19
-
-2. 95 + 44
-
-3. 6 + 8 / 22 + (57 / 34)
-
-4. 22 + 85 / 59
-
-5. 60 + (30 * 8)
-
-6. 63 - (38 / 14 * 93)
-
-7. 64 / 88 * 54
-
-8. 79 * (34 + 5) - 47
-
-9. 73 - 84 * 29 + 26 - 44
-
-10. 9 * 75 - 38 / 25 * 95

questions/1617940512@qq.com/2025-10-09-13-11-18.txt

@@ -1,59 +0,0 @@
-1. 52 + 30 + 60 - 7 / 65
-
-2. 23 / 47 - 30
-
-3. 36 / 9
-
-4. 95 + 60 - 100 - 96
-
-5. 19 * 7
-
-6. 99 / 90 - 100 * 63 + 21
-
-7. 63 / (85 - 71)
-
-8. 74 * (38 * 43 * 87) / 91
-
-9. 66 * 9
-
-10. (93 / 61) / 62 + 45 + 72
-
-11. 92 * 27 - 23 * 75 / 90
-
-12. 14 / 53 + 93 * 62
-
-13. 54 * 43 / (39 - 87 + 57)
-
-14. 15 * 35 * 2 * 87
-
-15. 1 / 70 + (26 * 63)
-
-16. 74 / (1 / 42 / 83) - 21
-
-17. 79 - 26 - 36 + (85 + 4)
-
-18. 61 + (57 / 14 - 47) * 47
-
-19. 3 + 96
-
-20. 13 / 71 + 82 / (78 + 34)
-
-21. 82 - 18
-
-22. 77 / 93 * 8 * 8
-
-23. 30 + 16 - 32 + 22 + 50
-
-24. 34 * (7 - 14 - 44)
-
-25. 9 - 23 / (37 * 28)
-
-26. 8 / 78
-
-27. 81 + 18 / (34 + 28)
-
-28. 60 + 76 * 10 - 27
-
-29. 51 - (62 / 92 * 12)
-
-30. 53 * 88

questions/1617940512@qq.com/2025-10-09-13-11-46.txt

@@ -1,19 +0,0 @@
-1. √27 / 1^2
-
-2. 68 / √67
-
-3. √52 / 59^2 / √95 + 37
-
-4. 49 * (√15 + 5^2)
-
-5. √61 + 84^2
-
-6. √32 - 39^2 * 63^2 * 92^2 / √38
-
-7. √92 + 24^2 + 91
-
-8. √57 * 82^2 - 18 - 4^2 * √88
-
-9. 20 - 76 + 29 * √88 * 85
-
-10. √95 + 3^2

questions/1617940512@qq.com/2025-10-09-13-12-30.txt

@@ -1,19 +0,0 @@
-1. tan(19) - sin(59) + cos(77)
-
-2. cos(36) / tan(52) + tan(21)
-
-3. (1 - 17 * 45 - cos(30)) + 68
-
-4. 30 + cos(93) - 94
-
-5. 26 * (sin(13) / cos(33)) - sin(28)
-
-6. tan(82) - 7 - 33 * cos(86)
-
-7. sin(99) * 97
-
-8. 41 + tan(8) + tan(96) + 23 / sin(37)
-
-9. 21 + cos(59)
-
-10. tan(56) * 36 * sin(37) + 77

questions/1617940512@qq.com/2025-10-09-14-42-08.txt

@@ -1,19 +0,0 @@
-1. 31 * (35 + 41)
-
-2. 20 + 42 / 41 / (83 + 75)
-
-3. 50 - 89
-
-4. 42 * 55
-
-5. 93 / 14 + 6 / 28
-
-6. (14 / 64) + 94
-
-7. 99 * 38 - 33 / 57 * 84
-
-8. 46 - 23 / 94 - (28 - 45)
-
-9. 49 + 23
-
-10. 78 + (94 / 21 / 65)

questions/1617940512@qq.com/2025-10-09-18-57-50.txt

@@ -1,19 +0,0 @@
-1. ( 18 / 41 ) + 99
-
-2. 90 + 68 - ( 36 / 50 + 47 )
-
-3. 98 - ( 87 + 3 / 44 )
-
-4. 76 * 44 - 23 * 81 / 33
-
-5. 69 * 4 * 73 + 47 - 47
-
-6. 94 + 59
-
-7. 62 - 62 + 22
-
-8. 42 * 38 * 77 + 10
-
-9. 3 - ( 3 / 49 ) / 10
-
-10. 80 + 9 / 13 + 90

questions/1617940512@qq.com/2025-10-10-16-21-16.txt

@@ -1,19 +0,0 @@
-1. 37 - 37
-
-2. 48 - 8 + 15 + 99 + 48
-
-3. 55 * 64 * 67 + 11 + 11
-
-4. 88 * 44
-
-5. 44 - 44
-
-6. ( 71 - 16 ) / 64
-
-7. 27 - 27
-
-8. ( 33 / 51 ) * 83
-
-9. 93 / 58
-
-10. 99 * 52

questions/1617940512@qq.com/2025-10-10-16-21-32.txt

@@ -1,19 +0,0 @@
-1. 77 * ( 87 / 13 + 74 )
-
-2. 95 - 4 * 16
-
-3. 28 / ( 51 + 88 )
-
-4. 56 * 30
-
-5. 67 + ( 53 - 53 )
-
-6. ( 67 / 78 + 92 ) / 24 * 5
-
-7. 10 + 60 / 96
-
-8. 87 + 48 / 85
-
-9. 55 / 79 + 72
-
-10. ( 88 + 48 ) - 48

questions/1617940512@qq.com/2025-10-10-16-28-30.txt

@@ -1,19 +0,0 @@
-1. √42 + √99
-
-2. √85 - 9^2 / 4 * 89 * 49^2
-
-3. 7^2 - 7^2 / (17^2 / √96)
-
-4. √32 / 92 - √37 + 20
-
-5. 75 * √93
-
-6. 29 / (24^2 + 46 / 89)
-
-7. √56 * 17^2 + √80
-
-8. 95^2 - 43 - √77 * 13 * √60
-
-9. 1^2 + 9^2
-
-10. (56^2 - 24) * 71^2

src/META-INF/MANIFEST.MF

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: ui.MathLearningApp
-

src/README.md

@@ -0,0 +1,2 @@
+只修改了model后端部分，ui前端部分未更改。
+

src/model/HighMaker.java

@@ -1,40 +1,38 @@
 package model;
 
-/**
- * 高中题目生成器，生成包含三角函数的数学题目
- */
 public class HighMaker extends Student {
-    private static final String[] BINARY_OPS = {"+", "-", "*", "/"};
+    final static String[] binaryOps = {"+", "-", "*", "/"}; // 操作符
-    private static final String[] TRIG_OPS = {"sin", "cos", "tan"};
+    final static String[] trigOps = {"sin", "cos", "tan"};
-
+    int operandCount;
-    private int operandCount;
+    String[] questionParts; // 操作数
-    private String[] questionParts;
+    boolean[] specialOpFlags; // 特殊操作符索引序列
-    private boolean[] specialOpFlags;
+    int parenStart;
-    private int parenStart;
+    int parenEnd;
-    private int parenEnd;
 
     public HighMaker(String name, String password, String path) {
         super(name, password, path);
     }
 
-    /**
+    // 数据预处理
-     * 数据预处理，生成随机操作数和操作符
-     */
     public void getRandom() {
         this.operandCount = random.nextInt(4) + 2;
         this.questionParts = new String[this.operandCount];
+
+        // 使用基类方法随机决定特殊操作符的数量和位置
         this.specialOpFlags = randomMaker(this.operandCount);
 
+        // 生成题目各部分
         for (int i = 0; i < operandCount; i++) {
             int operand = random.nextInt(100) + 1;
             if (specialOpFlags[i]) {
-                String op = TRIG_OPS[random.nextInt(TRIG_OPS.length)];
+                String op = trigOps[random.nextInt(trigOps.length)];
                 questionParts[i] = op + "(" + operand + ")";
             } else {
                 questionParts[i] = String.valueOf(operand);
             }
         }
 
+        // 使用基类方法生成有效括号
         int[] parenPos = bracketMaker(this.operandCount);
         this.parenStart = parenPos[0];
         this.parenEnd = parenPos[1];
@@ -55,10 +53,11 @@ public class HighMaker extends Student {
             }
 
             if (i < operandCount - 1) {
-                String op = BINARY_OPS[random.nextInt(BINARY_OPS.length)];
+                String op = binaryOps[random.nextInt(binaryOps.length)];
                 question.append(" ").append(op).append(" ");
             }
         }
         return question.toString();
     }
+
 }

src/model/MiddleMaker.java

@@ -1,33 +1,31 @@
 package model;
 
-/**
- * 初中题目生成器，生成包含平方和平方根的数学题目
- */
 public class MiddleMaker extends Student {
-    private static final String[] BINARY_OPS = {"+", "-", "*", "/"};
+    final static String[] binaryOps = {"+", "-", "*", "/"}; // 操作符
-    private static final String[] UNARY_OPS = {"^2", "√"};
+    final static String[] unaryOps = {"^2", "√"};
-
+    int operandCount;
-    private int operandCount;
+    String[] questionParts; // 操作数
-    private String[] questionParts;
+    boolean[] specialOpFlags; // 特殊操作符索引序列
-    private int parenStart;
+    int parenStart;
-    private int parenEnd;
+    int parenEnd;
 
     public MiddleMaker(String name, String password, String path) {
         super(name, password, path);
     }
 
-    /**
+    // 数据预处理
-     * 数据预处理，生成随机操作数和操作符
-     */
     public void getRandom() {
         this.operandCount = random.nextInt(4) + 2;
         this.questionParts = new String[this.operandCount];
-        boolean[] specialOpFlags = randomMaker(this.operandCount);
 
+        // 使用基类方法随机决定特殊操作符的数量和位置
+        this.specialOpFlags = randomMaker(this.operandCount);
+
+        // 生成题目各部分
         for (int i = 0; i < this.operandCount; i++) {
             int operand = random.nextInt(100) + 1;
-            if (specialOpFlags[i]) {
+            if (this.specialOpFlags[i]) {
-                String op = UNARY_OPS[random.nextInt(UNARY_OPS.length)];
+                String op = unaryOps[random.nextInt(unaryOps.length)];
                 if (op.equals("√")) {
                     this.questionParts[i] = op + operand;
                 } else {
@@ -38,6 +36,7 @@ public class MiddleMaker extends Student {
             }
         }
 
+        // 使用基类方法生成有效括号
         int[] parenPos = bracketMaker(this.operandCount);
         this.parenStart = parenPos[0];
         this.parenEnd = parenPos[1];
@@ -57,9 +56,10 @@ public class MiddleMaker extends Student {
                 question.append(")");
             }
             if (i < operandCount - 1) {
-                question.append(" ").append(BINARY_OPS[random.nextInt(BINARY_OPS.length)]).append(" ");
+                question.append(" ").append(binaryOps[random.nextInt(binaryOps.length)]).append(" ");
             }
         }
         return question.toString();
     }
+
 }

src/model/PrimaryMaker.java

@@ -1,217 +1,53 @@
 package model;
 
-import java.util.Stack;
-
-/**
- * 小学题目生成器，确保题目结果非负
- */
 public class PrimaryMaker extends Student {
-    private static final char[] OPERATORS = {'+', '-', '*', '/'};
+    final static char[] operators = {'+', '-', '*', '/'}; // 操作符
-    private static final int MIN_OPERANDS = 2;
+    int operandCount; // 操作数个数
-    private static final int MAX_OPERANDS = 5;
+    int[] operands; // 操作数列表
-    private static final int MAX_OPERAND_VALUE = 100;
+    int parenStart; // 左括号索引
-
+    int parenEnd; // 右括号
-    private int operandCount;
-    private int[] operands;
-    private int parenStart;
-    private int parenEnd;
 
     public PrimaryMaker(String name, String password, String path) {
         super(name, password, path);
     }
 
-    @Override
+    // 数据预处理
-    protected String makeOneQuestion() {
+    public void getRandom() {
-        String question;
+        // 随机决定操作数个数
-        while (true) {
+        this.operandCount = random.nextInt(4) + 2;
-            question = generateSingleQuestion();
+        this.operands = new int[operandCount];
-            if (isQuestionValid(question)) {
-                break;
-            }
-        }
-        return question;
-    }
-
-    private String generateSingleQuestion() {
-        generateRandomParameters();
-        StringBuilder question = new StringBuilder();
-
-        for (int j = 0; j < operandCount; j++) {
-            appendOperandWithParentheses(question, j);
-
-            if (j < operandCount - 1) {
-                appendOperator(question, j);
-            }
-        }
-        return question.toString();
-    }
-
-    private void generateRandomParameters() {
-        operandCount = random.nextInt(MAX_OPERANDS - MIN_OPERANDS + 1) + MIN_OPERANDS;
-        operands = new int[operandCount];
-
         for (int j = 0; j < operandCount; j++) {
-            operands[j] = random.nextInt(MAX_OPERAND_VALUE) + 1;
+            operands[j] = random.nextInt(100) + 1;
-        }
-
-        int[] parenPos = bracketMaker(operandCount);
-        parenStart = parenPos[0];
-        parenEnd = parenPos[1];
-    }
-
-    private void appendOperandWithParentheses(StringBuilder question, int index) {
-        if (index == parenStart) {
-            question.append("( ");
-        }
-        question.append(operands[index]);
-        if (index == parenEnd) {
-            question.append(" )");
-        }
-    }
-
-    private void appendOperator(StringBuilder question, int currentIndex) {
-        char op = OPERATORS[random.nextInt(OPERATORS.length)];
-
-        if (op == '-') {
-            ensureSubtractionIsValid(currentIndex);
-        }
-        if (op == '/') {
-            ensureDivisionIsValid(currentIndex);
-        }
-
-        question.append(" ").append(op).append(" ");
-    }
-
-    private void ensureSubtractionIsValid(int currentIndex) {
-        if (operands[currentIndex] < operands[currentIndex + 1]) {
-            int temp = operands[currentIndex];
-            operands[currentIndex] = operands[currentIndex + 1];
-            operands[currentIndex + 1] = temp;
-        }
-    }
-
-    private void ensureDivisionIsValid(int currentIndex) {
-        if (operands[currentIndex + 1] == 0) {
-            operands[currentIndex + 1] = 1;
         }
-    }
 
-    private boolean isQuestionValid(String expression) {
+        // 使用基类方法生成有效括号
-        try {
+        int[] parenPos = bracketMaker(this.operandCount);
-            evaluateExpression(expression, true);
+        this.parenStart = parenPos[0];
-            return true;
+        this.parenEnd = parenPos[1];
-        } catch (ArithmeticException e) {
-            return false;
-        }
     }
 
-    private double evaluateExpression(String expression, boolean checkNegative)
+    @Override
-            throws ArithmeticException {
+    protected String makeOneQuestion() {
-        Stack<Double> numbers = new Stack<>();
+        getRandom();
-        Stack<Character> ops = new Stack<>();
+        StringBuilder question = new StringBuilder();
 
-        for (int i = 0; i < expression.length(); i++) {
+        for (int j = 0; j < this.operandCount; j++) {
-            char c = expression.charAt(i);
+            if (j == this.parenStart) {
-            if (c == ' ') {
+                question.append("(");
-                continue;
             }
-
+            question.append(operands[j]);
-            if (Character.isDigit(c)) {
+            if (j == this.parenEnd) {
-                i = parseAndPushNumber(expression, i, numbers);
+                question.append(")");
-            } else if (c == '(') {
-                ops.push(c);
-            } else if (c == ')') {
-                processClosingParenthesis(numbers, ops, checkNegative);
-            } else if (isOperator(c)) {
-                processOperator(c, numbers, ops, checkNegative);
             }
-        }
-
-        processRemainingOperators(numbers, ops, checkNegative);
-
-        double finalResult = numbers.pop();
-        validateResult(finalResult, checkNegative);
-        return finalResult;
-    }
-
-    private int parseAndPushNumber(String expression, int startIndex,
-                                   Stack<Double> numbers) {
-        StringBuilder sb = new StringBuilder();
-        int i = startIndex;
-
-        while (i < expression.length()
-                && (Character.isDigit(expression.charAt(i)) || expression.charAt(i) == '.')) {
-            sb.append(expression.charAt(i++));
-        }
-
-        numbers.push(Double.parseDouble(sb.toString()));
-        return i - 1;
-    }
-
-    private void processClosingParenthesis(Stack<Double> numbers, Stack<Character> ops,
-                                           boolean checkNegative) {
-        while (ops.peek() != '(') {
-            double result = applyOp(ops.pop(), numbers.pop(), numbers.pop());
-            validateResult(result, checkNegative);
-            numbers.push(result);
-        }
-        ops.pop();
-    }
 
-    private void processOperator(char currentOp, Stack<Double> numbers,
+            if (j < this.operandCount - 1) {
-                                 Stack<Character> ops, boolean checkNegative) {
+                char op = operators[random.nextInt(operators.length)];
-        while (!ops.isEmpty() && hasPrecedence(currentOp, ops.peek())) {
+                if (op == '/') {
-            double result = applyOp(ops.pop(), numbers.pop(), numbers.pop());
+                    this.operands[j + 1] = this.operands[j + 1] == 0 ? 1 : this.operands[j + 1];
-            validateResult(result, checkNegative);
-            numbers.push(result);
-        }
-        ops.push(currentOp);
-    }
-
-    private void processRemainingOperators(Stack<Double> numbers, Stack<Character> ops,
-                                           boolean checkNegative) {
-        while (!ops.isEmpty()) {
-            double result = applyOp(ops.pop(), numbers.pop(), numbers.pop());
-            validateResult(result, checkNegative);
-            numbers.push(result);
-        }
-    }
-
-    private void validateResult(double result, boolean checkNegative) {
-        if (checkNegative && result < 0) {
-            throw new ArithmeticException("Negative result");
-        }
-    }
-
-    private boolean isOperator(char c) {
-        return c == '+' || c == '-' || c == '*' || c == '/';
-    }
-
-    private boolean hasPrecedence(char op1, char op2) {
-        if (op2 == '(' || op2 == ')') {
-            return false;
-        }
-        return (op1 != '*' && op1 != '/') || (op2 != '+' && op2 != '-');
-    }
-
-    private double applyOp(char op, double b, double a) {
-        switch (op) {
-            case '+':
-                return a + b;
-            case '-':
-                if (a < b) {
-                    throw new ArithmeticException("Negative result in subtraction");
-                }
-                return a - b;
-            case '*':
-                return a * b;
-            case '/':
-                if (b == 0) {
-                    throw new ArithmeticException("Cannot divide by zero");
                 }
-                return a / b;
+                question.append(" ").append(op).append(" ");
-            default:
+            }
-                return 0;
         }
+        return question.toString();
     }
 }

src/model/Question.java

@@ -1,57 +1,64 @@
 package model;
 
 /**
- * 题目类，包含题干、选项和正确答案。
+ * 题目类
+ * 包含题干、选项和正确答案
  */
-public record Question(String expression, String questionText, String[] options, int correctAnswer) {
+public class Question {
+    private final String questionText;
+    private final String[] options;
+    private final int correctAnswer;
+    private final String expression;
+
     /**
-     * 构造题目对象。
+     * 构造题目对象
      *
-     * @param expression    数学表达式
+     * @param expression 数学表达式
-     * @param questionText  题目文本
+     * @param questionText 题目文本
-     * @param options       选项数组(4个选项)
+     * @param options 选项数组(4个选项)
      * @param correctAnswer 正确答案索引(0-3)
      */
-    public Question {
+    public Question(String expression, String questionText, String[] options,
+                    int correctAnswer) {
+        this.expression = expression;
+        this.questionText = questionText;
+        this.options = options;
+        this.correctAnswer = correctAnswer;
     }
 
     /**
-     * 获取题目文本。
+     * 获取题目文本
      *
      * @return 题目文本
      */
-    @Override
+    public String getQuestionText() {
-    public String questionText() {
         return questionText;
     }
 
     /**
-     * 获取选项数组。
+     * 获取选项数组
      *
      * @return 选项数组
      */
-    @Override
+    public String[] getOptions() {
-    public String[] options() {
         return options;
     }
 
     /**
-     * 获取正确答案索引。
+     * 获取正确答案索引
      *
      * @return 正确答案索引
      */
-    @Override
+    public int getCorrectAnswer() {
-    public int correctAnswer() {
         return correctAnswer;
     }
 
     /**
-     * 获取数学表达式。
+     * 获取数学表达式
      *
      * @return 数学表达式
      */
-    @Override
+    public String getExpression() {
-    public String expression() {
         return expression;
     }
 }

src/model/QuestionMaker.java

@@ -14,15 +14,8 @@ import java.util.List;
 import java.util.Random;
 import java.util.Set;
 
-/**
- * 题目生成器，负责生成不同难度的数学题目。
- */
 public class QuestionMaker {
-    private static final int MAX_ATTEMPTS = 100;
+    private static final int max_attempts=100;
-    private static final String QUESTIONS_DIR = "questions";
-    private static final String FILE_SEPARATOR = File.separator;
-    private static final int OPTION_COUNT = 4;
-
     private Student student;
     private final Random random;
 
@@ -30,377 +23,265 @@ public class QuestionMaker {
         this.random = new Random();
     }
 
-    /**
+    public List<Question> makeQuestions(Grade grade,
-     * 生成指定数量和难度的题目。
+                                        int sum, String email) {
-     *
+        startStudent(grade,email);
-     * @param grade 题目难度等级
-     * @param sum 题目数量
-     * @param email 用户邮箱
-     * @return 题目列表
-     */
-    public List<Question> makeQuestions(Grade grade, int sum, String email) {
-        initializeStudent(grade, email);
 
         List<Question> questions = new ArrayList<>();
-        Set<String> existingQuestions = loadQuestions(email);
+        Set<String> exQuestions=loadQuestions(email);
-        Set<String> currentQuestions = new HashSet<>();
+        Set<String> currQuestions=new HashSet<>();
-        int attempt = 0;
+        int attempt=0;
-
+
-        while (questions.size() < sum && attempt < MAX_ATTEMPTS) {
+        while(questions.size()<sum && attempt<max_attempts){
-            String expression = student.makeOneQuestion();
+            String expression=student.makeOneQuestion();
+
+            if(!exQuestions.contains(expression) &&
+                    !currQuestions.contains(expression)) {
+                try {
+                    double result = checkExpression(expression,grade);
+                    Question question = createQuestion(expression, result);
+                    questions.add(question);
+                    exQuestions.add(expression);
+                    currQuestions.add(expression);
+                } catch (Exception _) {
 
-            if (isUniqueExpression(expression, existingQuestions, currentQuestions)) {
+                }
-                tryAddQuestion(expression, grade, questions, existingQuestions,
-                        currentQuestions);
             }
             attempt++;
         }
-
+        saveQuestions(email,new ArrayList<>(currQuestions));
-        saveQuestions(email, new ArrayList<>(currentQuestions));
         return questions;
     }
 
-    private void initializeStudent(Grade grade, String email) {
+    private void startStudent(Grade grade, String email) {
-        String path = QUESTIONS_DIR + FILE_SEPARATOR + email;
+        String path="questions"+File.separator+email;
 
-        switch (grade) {
+        switch(grade){
             case primary:
-                student = new PrimaryMaker("primary", "", path);
+                student=new PrimaryMaker("primary","",path);
                 break;
             case middle:
-                student = new MiddleMaker("middle", "", path);
+                student=new MiddleMaker("middle","",path);
                 break;
             case high:
-                student = new HighMaker("high", "", path);
+                student=new HighMaker("high","",path);
                 break;
             default:
-                throw new IllegalArgumentException("Unknown grade: " + grade);
         }
     }
 
-    private boolean isUniqueExpression(String expression,
+    private double checkExpression(String expression, Grade grade) {
-                                       Set<String> existingQuestions, Set<String> currentQuestions) {
+        String expressions=expression.replace(" ","");
-        return !existingQuestions.contains(expression)
-                && !currentQuestions.contains(expression);
-    }
-
-    private void tryAddQuestion(String expression, Grade grade,
-                                List<Question> questions, Set<String> existingQuestions,
-                                Set<String> currentQuestions) {
-        try {
-            double result = evaluateExpression(expression, grade);
-            Question question = createQuestion(expression, result);
-            questions.add(question);
-            existingQuestions.add(expression);
-            currentQuestions.add(expression);
-        } catch (Exception e) {
-            // Skip invalid expressions
-        }
-    }
-
-    private double evaluateExpression(String expression, Grade grade) {
-        String processedExpression = preprocessExpression(expression, grade);
-        return parseAndEvaluate(processedExpression);
-    }
-
-    private String preprocessExpression(String expression, Grade grade) {
-        String result = expression.replace(" ", "");
 
         if (grade == Grade.middle) {
-            result = preprocessMiddleSchoolExpression(result);
+            // 初中：处理平方和平方根
+            // 先处理括号内的平方：(5)^2 -> (5*5)
+            expressions = expressions.replaceAll("\\((\\d+)\\)\\^2", "($1*$1)");
+            // 处理普通数字的平方：5^2 -> (5*5)
+            expressions = expressions.replaceAll("(\\d+)\\^2", "($1*$1)");
+            // 处理平方根：√16 -> Math.sqrt(16)
+            expressions = expressions.replaceAll("√(\\d+)", "Math.sqrt($1)");
         } else if (grade == Grade.high) {
-            result = preprocessHighSchoolExpression(result);
+            // 高中：处理三角函数
+            expressions = expressions.replaceAll("sin\\((\\d+)\\)", "Math.sin(Math.toRadians($1))");
+            expressions = expressions.replaceAll("cos\\((\\d+)\\)", "Math.cos(Math.toRadians($1))");
+            expressions = expressions.replaceAll("tan\\((\\d+)\\)", "Math.tan(Math.toRadians($1))");
         }
-
+        return evaluation(expressions);
-        return result;
     }
 
-    private String preprocessMiddleSchoolExpression(String expression) {
+    private double evaluation(String expressions) {
-        // Handle squares: (5)^2 -> (5*5) and 5^2 -> (5*5)
+        return new Object(){
-        String result = expression.replaceAll("\\((\\d+)\\)\\^2", "($1*$1)");
+            int pos=-1;
-        result = result.replaceAll("(\\d+)\\^2", "($1*$1)");
+            int ch;
-        // Handle square roots: √16 -> Math.sqrt(16)
+            void nextChar() {
-        result = result.replaceAll("√(\\d+)", "Math.sqrt($1)");
+                ch = (++pos < expressions.length()) ? expressions.charAt(pos) : -1;
-        return result;
-    }
-
-    private String preprocessHighSchoolExpression(String expression) {
-        String result = expression.replaceAll("sin\\((\\d+)\\)",
-                "Math.sin(Math.toRadians($1))");
-        result = result.replaceAll("cos\\((\\d+)\\)",
-                "Math.cos(Math.toRadians($1))");
-        result = result.replaceAll("tan\\((\\d+)\\)",
-                "Math.tan(Math.toRadians($1))");
-        return result;
-    }
-
-    private double parseAndEvaluate(String expression) {
-        return new ExpressionParser(expression).parse();
-    }
-
-    private static class ExpressionParser {
-        private final String expression;
-        private int pos = -1;
-        private int ch;
-
-        ExpressionParser(String expression) {
-            this.expression = expression;
-        }
-
-        double parse() {
-            nextChar();
-            double result = parseExpression();
-            if (pos < expression.length()) {
-                throw new RuntimeException("Unexpected: " + (char) ch);
             }
-            return result;
-        }
-
-        private void nextChar() {
-            ch = (++pos < expression.length()) ? expression.charAt(pos) : -1;
-        }
 
-        private boolean eat(int charToEat) {
+            boolean eat(int charToEat) {
-            while (ch == ' ') {
+                while (ch == ' ') {
-                nextChar();
+                    nextChar();
-            }
-            if (ch == charToEat) {
-                nextChar();
-                return true;
-            }
-            return false;
-        }
-
-        private double parseExpression() {
-            double x = parseTerm();
-            while (true) {
-                if (eat('+')) {
-                    x += parseTerm();
-                } else if (eat('-')) {
-                    x -= parseTerm();
-                } else {
-                    return x;
                 }
-            }
+                if (ch == charToEat) {
-        }
+                    nextChar();
-
+                    return true;
-        private double parseTerm() {
-            double x = parseFactor();
-            while (true) {
-                if (eat('*')) {
-                    x *= parseFactor();
-                } else if (eat('/')) {
-                    x /= parseFactor();
-                } else {
-                    return x;
                 }
+                return false;
             }
-        }
-
-        private double parseFactor() {
-            if (eat('+')) {
-                return parseFactor();
-            }
-            if (eat('-')) {
-                return -parseFactor();
-            }
-
-            int startPos = pos;
-
-            if (eat('(')) {
-                return parseParenthesizedExpression();
-            } else if (isDigit()) {
-                return parseNumber(startPos);
-            } else if (isUpperCaseLetter()) {
-                return parseMathFunction(startPos);
-            } else if (isLowerCaseLetter()) {
-                return parseCustomFunction(startPos);
-            } else {
-                throw new RuntimeException("Unexpected: " + (char) ch);
-            }
-        }
-
-        private boolean isDigit() {
-            return (ch >= '0' && ch <= '9') || ch == '.';
-        }
 
-        private boolean isUpperCaseLetter() {
+            double parse() {
-            return ch >= 'A' && ch <= 'Z';
-        }
-
-        private boolean isLowerCaseLetter() {
-            return ch >= 'a' && ch <= 'z';
-        }
-
-        private double parseParenthesizedExpression() {
-            double x = parseExpression();
-            eat(')');
-            return x;
-        }
-
-        private double parseNumber(int startPos) {
-            while (isDigit()) {
                 nextChar();
+                double x = parseExpression();
+                if (pos < expressions.length()) {
+                    throw new RuntimeException("Unexpected: " + (char) ch);
+                }
+                return x;
             }
-            return Double.parseDouble(expression.substring(startPos, pos));
-        }
 
-        private double parseMathFunction(int startPos) {
+            double parseExpression() {
-            while ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || ch == '.') {
+                double x = parseTerm();
-                nextChar();
+                for (;;) {
+                    if (eat('+')) {
+                        x += parseTerm();
+                    } else if (eat('-')) {
+                        x -= parseTerm();
+                    } else {
+                        return x;
+                    }
+                }
             }
-            String func = expression.substring(startPos, pos);
-            eat('(');
-            double x = parseExpression();
-            eat(')');
-            return applyMathFunction(func, x);
-        }
 
-        private double parseCustomFunction(int startPos) {
+            double parseTerm() {
-            while (ch >= 'a' && ch <= 'z') {
+                double x = parseFactor();
-                nextChar();
+                for (;;) {
+                    if (eat('*')) {
+                        x *= parseFactor();
+                    } else if (eat('/')) {
+                        x /= parseFactor();
+                    } else {
+                        return x;
+                    }
+                }
             }
-            String function = expression.substring(startPos, pos);
-            double x = parseFactor();
-            return applyCustomFunction(function, x);
-        }
 
-        private double applyMathFunction(String func, double value) {
+            double parseFactor() {
-            switch (func) {
+                if (eat('+')) {
-                case "Math.sqrt":
+                    return parseFactor();
-                    return Math.sqrt(value);
+                }
-                case "Math.sin":
+                if (eat('-')) {
-                    return Math.sin(value);
+                    return -parseFactor();
-                case "Math.cos":
+                }
-                    return Math.cos(value);
+
-                case "Math.tan":
+                double x;
-                    return Math.tan(value);
+                int startPos = this.pos;
-                case "Math.toRadians":
+                if (eat('(')) {
-                    return Math.toRadians(value);
+                    x = parseExpression();
-                default:
+                    eat(')');
-                    throw new RuntimeException("Unknown function: " + func);
+                } else if ((ch >= '0' && ch <= '9') || ch == '.') {
-            }
+                    while ((ch >= '0' && ch <= '9') || ch == '.') {
-        }
+                        nextChar();
+                    }
+                    x = Double.parseDouble(expressions.substring(startPos, this.pos));
+                } else if (ch >= 'A' && ch <= 'Z') {
+                    // 处理 Math.xxx 函数
+                    while ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || ch == '.') {
+                        nextChar();
+                    }
+                    String func = expressions.substring(startPos, this.pos);
+                    eat('(');
+                    x = parseExpression();
+                    eat(')');
+
+                    if (func.equals("Math.sqrt")) {
+                        x = Math.sqrt(x);
+                    } else if (func.equals("Math.sin")) {
+                        x = Math.sin(x);
+                    } else if (func.equals("Math.cos")) {
+                        x = Math.cos(x);
+                    } else if (func.equals("Math.tan")) {
+                        x = Math.tan(x);
+                    } else if (func.equals("Math.toRadians")) {
+                        x = Math.toRadians(x);
+                    } else {
+                        throw new RuntimeException("Unknown function: " + func);
+                    }
+                } else if (ch >= 'a' && ch <= 'z') {
+                    while (ch >= 'a' && ch <= 'z') {
+                        nextChar();
+                    }
+                    String function = expressions.substring(startPos, this.pos);
+                    x = parseFactor();
+                    if (function.equals("sqrt")) {
+                        x = Math.sqrt(x);
+                    } else if (function.equals("sin")) {
+                        x = Math.sin(x);
+                    } else if (function.equals("cos")) {
+                        x = Math.cos(x);
+                    } else if (function.equals("tan")) {
+                        x = Math.tan(x);
+                    } else {
+                        throw new RuntimeException("Unknown function: " + function);
+                    }
+                } else {
+                    throw new RuntimeException("Unexpected: " + (char) ch);
+                }
 
-        private double applyCustomFunction(String function, double value) {
+                return x;
-            switch (function) {
-                case "sqrt":
-                    return Math.sqrt(value);
-                case "sin":
-                    return Math.sin(value);
-                case "cos":
-                    return Math.cos(value);
-                case "tan":
-                    return Math.tan(value);
-                default:
-                    throw new RuntimeException("Unknown function: " + function);
             }
-        }
+        }.parse();
     }
 
     private Question createQuestion(String expression, double result) {
-        String text = "计算： " + expression + " = ? ";
+        String text="计算： "+expression+" = ? ";
-        double[] options = generateOptions(result);
+        double[] options=new double[4];
-        int correctIndex = random.nextInt(OPTION_COUNT);
+        int currIndex=random.nextInt(4);
-        options[correctIndex] = result;
-
-        String[] optionStrings = formatOptions(options);
-        return new Question(expression, text, optionStrings, correctIndex);
-    }
 
-    private double[] generateOptions(double correctAnswer) {
+        options[currIndex]=result;
-        double[] options = new double[OPTION_COUNT];
 
-        for (int i = 0; i < OPTION_COUNT; i++) {
+        for(int i=0;i<4;i++) {
-            double offset = random.nextDouble() * 20 - 10;
+            if(i!=currIndex) {
-            if (Math.abs(offset) < 1) {
+                double offset=(random.nextDouble()*20-10);
-                offset = random.nextBoolean() ? 5 : -5;
+                if(Math.abs(offset)<1) {
+                    offset=random.nextBoolean() ? 5 : -5 ;
+                }
+                options[i]=offset+result;
             }
-            options[i] = offset + correctAnswer;
         }
 
-        return options;
+        String[] optionStrings=new String[4];
-    }
+        for(int i=0;i<4;i++) {
-
+            optionStrings[i]=String.format("%c. %.2f",
-    private String[] formatOptions(double[] options) {
-        String[] optionStrings = new String[OPTION_COUNT];
-        for (int i = 0; i < OPTION_COUNT; i++) {
-            optionStrings[i] = String.format("%c. %.2f",
                     (char) ('A' + i), options[i]);
         }
-        return optionStrings;
+
+        return new Question(expression, text, optionStrings, currIndex);
+
     }
 
     private Set<String> loadQuestions(String email) {
-        Set<String> questions = new HashSet<>();
+        Set<String> questions=new HashSet<>();
-        File userDir = getUserDirectory(email);
+        File userDir = new File("questions" + File.separator + email);
 
-        if (!userDir.exists() || !userDir.isDirectory()) {
+        if(!userDir.exists()||!userDir.isDirectory()) {
             return questions;
         }
 
-        File[] files = userDir.listFiles((dir, name) -> name.endsWith(".txt"));
+        File[] files = userDir.listFiles((_, name) -> name.endsWith(".txt"));
-        if (files == null) {
+        if(files==null) {
             return questions;
         }
 
-        for (File file : files) {
+        for(File file:files) {
-            loadQuestionsFromFile(file, questions);
+            try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
-        }
+                String line;
-
+                while ((line = reader.readLine()) != null) {
-        return questions;
+                    line = line.trim();
-    }
+                    if (line.matches("\\d+\\.\\s+.*")) {
-
+                        String question = line.substring(line.indexOf('.') + 1).trim();
-    private void loadQuestionsFromFile(File file, Set<String> questions) {
+                        questions.add(question);
-        try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
+                    }
-            String line;
-            while ((line = reader.readLine()) != null) {
-                String question = extractQuestion(line);
-                if (question != null) {
-                    questions.add(question);
                 }
+            } catch (IOException e) {
+                System.err.println("读取文件失败: " + e.getMessage());
             }
-        } catch (IOException e) {
-            System.err.println("读取文件失败: " + e.getMessage());
-        }
-    }
-
-    private String extractQuestion(String line) {
-        line = line.trim();
-        if (line.matches("\\d+\\.\\s+.*")) {
-            return line.substring(line.indexOf('.') + 1).trim();
         }
-        return null;
+        return questions;
     }
 
     private void saveQuestions(String email, List<String> questions) {
-        File userDir = getUserDirectory(email);
+        File userDir = new File("questions" + File.separator + email);
-        ensureDirectoryExists(userDir);
+        if(!userDir.exists()) {
-
+            if(!userDir.mkdirs()) {
-        String fileName = generateFileName();
-        File file = new File(userDir, fileName);
-
-        writeQuestionsToFile(file, questions);
-    }
-
-    private File getUserDirectory(String email) {
-        return new File(QUESTIONS_DIR + FILE_SEPARATOR + email);
-    }
-
-    private void ensureDirectoryExists(File directory) {
-        if (!directory.exists()) {
-            if (!directory.mkdirs()) {
                 System.err.println("创建目录失败");
+                return;
             }
         }
-    }
 
-    private String generateFileName() {
         LocalDateTime now = LocalDateTime.now();
-        return now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm-ss")) + ".txt";
+        String fileName = now.format(
-    }
+                DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm-ss")) + ".txt";
+        File file = new File(userDir, fileName);
 
-    private void writeQuestionsToFile(File file, List<String> questions) {
         try (PrintWriter writer = new PrintWriter(new FileWriter(file))) {
             for (int i = 0; i < questions.size(); i++) {
                 writer.println((i + 1) + ". " + questions.get(i));
@@ -412,4 +293,4 @@ public class QuestionMaker {
             System.err.println("保存文件失败: " + e.getMessage());
         }
     }
-}
+}

src/model/UserManager.java

@@ -1,72 +1,14 @@
 package model;
 
-import java.io.*;
 import java.util.HashMap;
 import java.util.Map;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
-import java.lang.reflect.Type;
 
 /**
  * 用户管理类
  * 负责用户注册、登录、密码修改等功能
- * 支持用户数据持久化存储
  */
 public class UserManager {
-    private static final String DATA_FILE = "users.json"; // 数据文件路径
+    private static final Map<String, UserInfo> users = new HashMap<>();
-    private final Map<String, UserInfo> users = new HashMap<>();
-    private final Map<String, String> usernameToEmail = new HashMap<>();
-    private final Gson gson;
-
-    /**
-     * 构造函数，初始化时加载用户数据
-     */
-    public UserManager() {
-        gson = new GsonBuilder().setPrettyPrinting().create();
-        loadUsersFromFile();
-    }
-
-    /**
-     * 从文件加载用户数据
-     */
-    private void loadUsersFromFile() {
-        File file = new File(DATA_FILE);
-        if (!file.exists()) {
-            System.out.println("用户数据文件不存在，将创建新文件");
-            return;
-        }
-
-        try (Reader reader = new FileReader(file)) {
-            Type type = new TypeToken<Map<String, UserInfo>>(){}.getType();
-            Map<String, UserInfo> loadedUsers = gson.fromJson(reader, type);
-
-            if (loadedUsers != null) {
-                users.putAll(loadedUsers);
-                // 重建用户名到邮箱的映射
-                for (UserInfo userInfo : users.values()) {
-                    usernameToEmail.put(userInfo.getUsername(), userInfo.getEmail());
-                }
-                System.out.println("成功加载 " + users.size() + " 个用户数据");
-            }
-        } catch (IOException e) {
-            System.err.println("加载用户数据失败: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 保存用户数据到文件
-     */
-    private void saveUsersToFile() {
-        try (Writer writer = new FileWriter(DATA_FILE)) {
-            gson.toJson(users, writer);
-            System.out.println("用户数据已保存");
-        } catch (IOException e) {
-            System.err.println("保存用户数据失败: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
 
     /**
      * 用户注册
@@ -74,21 +16,18 @@ public class UserManager {
      * @param email 用户邮箱
      * @param password 密码
      * @param grade 年级类型
-     * @param username 用户名
      * @return 注册是否成功
      */
-    public boolean register(String email, String password, Grade grade, String username) {
+    public boolean register(String email, String password, Grade grade) {
-        if (users.containsKey(email) || usernameToEmail.containsKey(username)) {
+        if (users.containsKey(email)) {
             return false;
         }
-        users.put(email, new UserInfo(email, password, grade, username));
+        users.put(email, new UserInfo(password, grade));
-        usernameToEmail.put(username, email);
-        saveUsersToFile(); // 注册成功后立即保存
         return true;
     }
 
     /**
-     * 用户登录（返回 Grade 类型）
+     * 用户登录
      *
      * @param email 用户邮箱
      * @param password 密码
@@ -102,46 +41,6 @@ public class UserManager {
         return user.getGrade();
     }
 
-    /**
-     * 用户登录（返回 UserInfo 对象）
-     *
-     * @param email 用户邮箱
-     * @param password 密码
-     * @return 用户信息对象,登录失败返回null
-     */
-    public UserInfo loginWithUserInfo(String email, String password) {
-        UserInfo user = users.get(email);
-        if (user == null || !user.getPassword().equals(password)) {
-            return null;
-        }
-        return user;
-    }
-
-    /**
-     * 使用邮箱或用户名登录
-     *
-     * @param emailOrUsername 用户邮箱或用户名
-     * @param password 密码
-     * @return 用户信息对象,登录失败返回null
-     */
-    public UserInfo loginWithEmailOrUsername(String emailOrUsername, String password) {
-        // 先尝试作为邮箱登录
-        UserInfo user = users.get(emailOrUsername);
-
-        // 如果邮箱不存在，尝试作为用户名查找
-        if (user == null && usernameToEmail.containsKey(emailOrUsername)) {
-            String email = usernameToEmail.get(emailOrUsername);
-            user = users.get(email);
-        }
-
-        // 验证密码
-        if (user == null || !user.getPassword().equals(password)) {
-            return null;
-        }
-
-        return user;
-    }
-
     /**
      * 检查用户是否存在
      *
@@ -152,16 +51,6 @@ public class UserManager {
         return users.containsKey(email);
     }
 
-    /**
-     * 检查用户名是否存在
-     *
-     * @param username 用户名
-     * @return 用户名是否存在
-     */
-    public boolean usernameExists(String username) {
-        return usernameToEmail.containsKey(username);
-    }
-
     /**
      * 修改密码
      *
@@ -170,57 +59,33 @@ public class UserManager {
      * @param newPassword 新密码
      * @return 修改是否成功
      */
-    public boolean changePassword(String email, String oldPassword, String newPassword) {
+    public boolean changePassword(String email, String oldPassword,
+                                  String newPassword) {
         UserInfo user = users.get(email);
         if (user == null || !user.getPassword().equals(oldPassword)) {
             return false;
         }
         user.setPassword(newPassword);
-        saveUsersToFile(); // 修改密码后立即保存
         return true;
     }
 
     /**
-     * 获取用户信息
+     * 内部类：用户信息
-     *
-     * @param email 用户邮箱
-     * @return 用户信息对象，不存在返回null
-     */
-    public UserInfo getUserInfo(String email) {
-        return users.get(email);
-    }
-
-    /**
-     * 公共内部类：用户信息
      */
-    public static class UserInfo {
+    private static class UserInfo {
-        private final String email;
         private String password;
-        private final Grade grade;
+        private final Grade gradeType;
-        private final String username;
 
         /**
          * 构造用户信息
          *
-         * @param email 邮箱
          * @param password 密码
-         * @param grade 年级类型
+         * @param gradeType 年级类型
-         * @param username 用户名
          */
-        public UserInfo(String email, String password, Grade grade, String username) {
+        public UserInfo(String password, Grade gradeType) {
-            this.email = email;
+            //this.email = email;
             this.password = password;
-            this.grade = grade;
+            this.gradeType = gradeType;
-            this.username = username;
-        }
-
-        /**
-         * 获取邮箱
-         *
-         * @return 邮箱
-         */
-        public String getEmail() {
-            return email;
         }
 
         /**
@@ -247,16 +112,7 @@ public class UserManager {
          * @return 年级类型
          */
         public Grade getGrade() {
-            return grade;
+            return gradeType;
-        }
-
-        /**
-         * 获取用户名
-         *
-         * @return 用户名
-         */
-        public String getUsername() {
-            return username;
         }
     }
-}
+}

src/ui/ChangePasswordDialog.java

@@ -23,7 +23,7 @@ import java.util.regex.Pattern;
 public class ChangePasswordDialog extends JDialog {
     private static final long serialVersionUID = 1L;
     private static final Pattern PASSWORD_PATTERN =
-            Pattern.compile("^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)[a-zA-Z0-9]{6,10}$");
+            Pattern.compile("^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d).{6,10}$");
 
     private final JPasswordField oldPasswordField;
     private final JPasswordField newPassword1Field;
@@ -43,9 +43,9 @@ public class ChangePasswordDialog extends JDialog {
         this.email = email;
         this.userManager = new UserManager();
 
-    setSize(600, 360);
+        setSize(400, 300);
-    setLocationRelativeTo(parent);
+        setLocationRelativeTo(parent);
-    setResizable(true);
+        setResizable(false);
 
         JPanel panel = new JPanel(new GridBagLayout());
         panel.setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 20));
@@ -54,11 +54,7 @@ public class ChangePasswordDialog extends JDialog {
         gbc.fill = GridBagConstraints.HORIZONTAL;
 
         JLabel infoLabel = new JLabel("<html>新密码要求:<br>" +
-                "1. 长度 6-10位<br>" +
+                "长度6-10位,必须包含大小写字母和数字</html>");
-                "2. 必须包含大写字母<br>" +
-                "3. 必须包含小写字母<br>" +
-                "4. 必须包含数字<br>" +
-                "5. 不能包含特殊字符</html>");
         infoLabel.setFont(new Font("微软雅黑", Font.PLAIN, 11));
         gbc.gridx = 0;
         gbc.gridy = 0;
@@ -69,31 +65,25 @@ public class ChangePasswordDialog extends JDialog {
         gbc.gridy = 1;
         panel.add(new JLabel("原密码:"), gbc);
 
-    oldPasswordField = new JPasswordField(20);
+        oldPasswordField = new JPasswordField(15);
-    gbc.gridx = 1;
+        gbc.gridx = 1;
-    gbc.weightx = 1.0;
+        panel.add(oldPasswordField, gbc);
-    panel.add(oldPasswordField, gbc);
-    gbc.weightx = 0.0;
 
         gbc.gridx = 0;
         gbc.gridy = 2;
         panel.add(new JLabel("新密码:"), gbc);
 
-    newPassword1Field = new JPasswordField(20);
+        newPassword1Field = new JPasswordField(15);
-    gbc.gridx = 1;
+        gbc.gridx = 1;
-    gbc.weightx = 1.0;
+        panel.add(newPassword1Field, gbc);
-    panel.add(newPassword1Field, gbc);
-    gbc.weightx = 0.0;
 
         gbc.gridx = 0;
         gbc.gridy = 3;
         panel.add(new JLabel("确认新密码:"), gbc);
 
-    newPassword2Field = new JPasswordField(20);
+        newPassword2Field = new JPasswordField(15);
-    gbc.gridx = 1;
+        gbc.gridx = 1;
-    gbc.weightx = 1.0;
+        panel.add(newPassword2Field, gbc);
-    panel.add(newPassword2Field, gbc);
-    gbc.weightx = 0.0;
 
         confirmButton = new JButton("确认修改");
         confirmButton.setPreferredSize(new Dimension(120, 30));
@@ -130,7 +120,7 @@ public class ChangePasswordDialog extends JDialog {
 
         if (!PASSWORD_PATTERN.matcher(newPassword1).matches()) {
             showError("新密码不符合要求:\n" +
-                    "长度6-10位, 必须包含大小写字母和数字, 且不能包含特殊字符");
+                    "长度6-10位,必须包含大小写字母和数字");
             return;
         }
 

src/ui/GradeSelectionFrame.java

@@ -1,7 +1,6 @@
 package ui;
 
 import model.Grade;
-import model.UserManager;
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
@@ -21,85 +20,52 @@ import java.awt.Insets;
 
 /**
  * 年级选择和题目数量输入界面
- * 用户可以选择年级、设置题目数量、用户设置或退出登录
+ * 用户可以选择年级、设置题目数量、修改密码或退出登录
  */
 public class GradeSelectionFrame extends JFrame {
     private static final long serialVersionUID = 1L;
 
     private final String email;
-    private final String username;
     private Grade currentGrade;
     private final JLabel gradeLabel;
     private final JComboBox<String> gradeComboBox;
     private final JSpinner questionSpinner;
     private final JButton startButton;
-    private final JButton userSettingsButton;
+    private final JButton changePasswordButton;
     private final JButton logoutButton;
 
     /**
-     * 构造年级选择界面（使用邮箱和年级）
+     * 构造年级选择界面
      *
      * @param email 用户邮箱
      * @param initialGrade 初始年级
      */
     public GradeSelectionFrame(String email, Grade initialGrade) {
-        this(email, initialGrade, email); // 默认显示邮箱作为用户名
-    }
-
-    /**
-     * 构造年级选择界面（使用 UserInfo 对象）
-     *
-     * @param userInfo 用户信息对象
-     */
-    public GradeSelectionFrame(UserManager.UserInfo userInfo) {
-        this(userInfo.getEmail(), userInfo.getGrade(), userInfo.getUsername());
-    }
-
-    /**
-     * 构造年级选择界面（完整构造函数）
-     *
-     * @param email 用户邮箱
-     * @param initialGrade 初始年级
-     * @param username 用户名
-     */
-    private GradeSelectionFrame(String email, Grade initialGrade, String username) {
         this.email = email;
-        this.username = username;
         this.currentGrade = initialGrade;
 
         setTitle("数学学习软件 - 选择年级");
-        setSize(700, 450);
+        setSize(450, 350);
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         setLocationRelativeTo(null);
-        setResizable(true);
+        setResizable(false);
 
         JPanel mainPanel = new JPanel(new BorderLayout(10, 10));
         mainPanel.setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 20));
 
-        // --- Top Panel ---
         JPanel topPanel = new JPanel(new BorderLayout());
-
+        JLabel welcomeLabel = new JLabel("欢迎, " + email, JLabel.CENTER);
-        // 欢迎信息（显示用户名）
-        JLabel welcomeLabel = new JLabel("欢迎, " + username, JLabel.LEFT);
         welcomeLabel.setFont(new Font("微软雅黑", Font.BOLD, 16));
-        topPanel.add(welcomeLabel, BorderLayout.WEST);
+        topPanel.add(welcomeLabel, BorderLayout.NORTH);
-
-        // 用户设置按钮（右上角）
-        userSettingsButton = new JButton("用户设置");
-        JPanel topRightPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT, 0, 0));
-        topRightPanel.add(userSettingsButton);
-        topPanel.add(topRightPanel, BorderLayout.EAST);
 
-        // 当前年级显示
         gradeLabel = new JLabel("当前年级: " + getGradeName(currentGrade),
                 JLabel.CENTER);
         gradeLabel.setFont(new Font("微软雅黑", Font.PLAIN, 14));
         gradeLabel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
-        topPanel.add(gradeLabel, BorderLayout.SOUTH);
+        topPanel.add(gradeLabel, BorderLayout.CENTER);
 
         mainPanel.add(topPanel, BorderLayout.NORTH);
 
-        // --- Center Panel ---
         JPanel centerPanel = new JPanel(new GridBagLayout());
         GridBagConstraints gbc = new GridBagConstraints();
         gbc.insets = new Insets(10, 5, 10, 5);
@@ -113,9 +79,7 @@ public class GradeSelectionFrame extends JFrame {
         gradeComboBox = new JComboBox<>(grades);
         gradeComboBox.setSelectedItem(getGradeName(currentGrade));
         gbc.gridx = 1;
-        gbc.weightx = 1.0;
         centerPanel.add(gradeComboBox, gbc);
-        gbc.weightx = 0.0;
 
         gbc.gridx = 0;
         gbc.gridy = 1;
@@ -123,15 +87,8 @@ public class GradeSelectionFrame extends JFrame {
 
         SpinnerNumberModel spinnerModel = new SpinnerNumberModel(10, 10, 30, 1);
         questionSpinner = new JSpinner(spinnerModel);
-
-        // 禁用 JSpinner 的文本输入功能，只允许通过按钮调节
-        JSpinner.DefaultEditor editor = (JSpinner.DefaultEditor) questionSpinner.getEditor();
-        editor.getTextField().setEditable(false);
-
         gbc.gridx = 1;
-        gbc.weightx = 1.0;
         centerPanel.add(questionSpinner, gbc);
-        gbc.weightx = 0.0;
 
         startButton = new JButton("开始答题");
         startButton.setPreferredSize(new Dimension(200, 40));
@@ -144,18 +101,18 @@ public class GradeSelectionFrame extends JFrame {
 
         mainPanel.add(centerPanel, BorderLayout.CENTER);
 
-        // --- Bottom Panel ---
         JPanel bottomPanel = new JPanel(new FlowLayout(FlowLayout.CENTER, 10, 0));
+        changePasswordButton = new JButton("修改密码");
         logoutButton = new JButton("退出登录");
+        bottomPanel.add(changePasswordButton);
         bottomPanel.add(logoutButton);
 
         mainPanel.add(bottomPanel, BorderLayout.SOUTH);
 
         add(mainPanel);
 
-        // --- Action Listeners ---
         startButton.addActionListener(e -> startQuiz());
-        userSettingsButton.addActionListener(e -> openUserSettings());
+        changePasswordButton.addActionListener(e -> changePassword());
         logoutButton.addActionListener(e -> logout());
         gradeComboBox.addActionListener(e -> updateGrade());
     }
@@ -190,10 +147,10 @@ public class GradeSelectionFrame extends JFrame {
     }
 
     /**
-     * 打开用户设置对话框
+     * 修改密码
      */
-    private void openUserSettings() {
+    private void changePassword() {
-        UserSettingsDialog dialog = new UserSettingsDialog(this, email, username);
+        ChangePasswordDialog dialog = new ChangePasswordDialog(this, email);
         dialog.setVisible(true);
     }
 

src/ui/LoginFrame.java

@@ -1,5 +1,6 @@
 package ui;
 
+import model.Grade;
 import model.UserManager;
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
@@ -17,41 +18,29 @@ import java.awt.GridBagLayout;
 import java.awt.Insets;
 
 /**
- * 登录框界面类，处理用户登录和注册功能。
+ * 登录和注册界面
- *
+ * 提供用户登录和注册入口
- * <p>该类提供了一个图形界面，允许用户通过邮箱或用户名和密码登录系统，
- * 或者跳转到注册界面创建新账户。此类使用{@link UserManager}处理具体的用户验证逻辑。
- *
- * @author 结对项目组
  */
 public class LoginFrame extends JFrame {
     private static final long serialVersionUID = 1L;
 
-    /** 邮箱/用户名输入框 */
+    private final JTextField emailField;
-    private final JTextField accountField;
-    /** 密码输入框 */
     private final JPasswordField passwordField;
-    /** 登录按钮 */
     private final JButton loginButton;
-    /** 注册按钮 */
     private final JButton registerButton;
-    /** 用户管理器，处理登录验证 */
     private final UserManager userManager;
 
     /**
-     * 创建并初始化登录界面。
+     * 构造登录界面
-     *
-     * <p>设置界面布局，包括账号输入框、密码输入框、登录按钮和注册按钮。
-     * 初始化{@link UserManager}用于处理用户验证。
      */
     public LoginFrame() {
         this.userManager = new UserManager();
 
         setTitle("数学学习软件 - 登录");
-        setSize(600, 450);
+        setSize(400, 300);
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         setLocationRelativeTo(null);
-        setResizable(true);
+        setResizable(false);
 
         JPanel mainPanel = new JPanel(new GridBagLayout());
         mainPanel.setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 20));
@@ -59,7 +48,6 @@ public class LoginFrame extends JFrame {
         gbc.insets = new Insets(5, 5, 5, 5);
         gbc.fill = GridBagConstraints.HORIZONTAL;
 
-        // 标题
         JLabel titleLabel = new JLabel("小初高数学学习系统", JLabel.CENTER);
         titleLabel.setFont(new Font("微软雅黑", Font.BOLD, 20));
         gbc.gridx = 0;
@@ -67,36 +55,22 @@ public class LoginFrame extends JFrame {
         gbc.gridwidth = 2;
         mainPanel.add(titleLabel, gbc);
 
-        // 提示信息
-        JLabel hintLabel = new JLabel("支持邮箱或用户名登录", JLabel.CENTER);
-        hintLabel.setFont(new Font("微软雅黑", Font.PLAIN, 11));
-        hintLabel.setForeground(java.awt.Color.GRAY);
-        gbc.gridy = 1;
-        mainPanel.add(hintLabel, gbc);
-
-        // 账号输入
         gbc.gridwidth = 1;
-        gbc.gridy = 2;
+        gbc.gridy = 1;
-        mainPanel.add(new JLabel("账号:"), gbc);
+        mainPanel.add(new JLabel("邮箱:"), gbc);
 
-        accountField = new JTextField(25);
+        emailField = new JTextField(20);
         gbc.gridx = 1;
-        gbc.weightx = 1.0;
+        mainPanel.add(emailField, gbc);
-        mainPanel.add(accountField, gbc);
-        gbc.weightx = 0.0;
 
-        // 密码输入
         gbc.gridx = 0;
-        gbc.gridy = 3;
+        gbc.gridy = 2;
         mainPanel.add(new JLabel("密码:"), gbc);
 
-        passwordField = new JPasswordField(25);
+        passwordField = new JPasswordField(20);
         gbc.gridx = 1;
-        gbc.weightx = 1.0;
         mainPanel.add(passwordField, gbc);
-        gbc.weightx = 0.0;
 
-        // 按钮面板
         JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.CENTER, 10, 0));
         loginButton = new JButton("登录");
         registerButton = new JButton("注册");
@@ -108,13 +82,12 @@ public class LoginFrame extends JFrame {
         buttonPanel.add(registerButton);
 
         gbc.gridx = 0;
-        gbc.gridy = 4;
+        gbc.gridy = 3;
         gbc.gridwidth = 2;
         mainPanel.add(buttonPanel, gbc);
 
         add(mainPanel);
 
-        // 事件监听
         loginButton.addActionListener(e -> handleLogin());
         registerButton.addActionListener(e -> handleRegister());
 
@@ -122,40 +95,33 @@ public class LoginFrame extends JFrame {
     }
 
     /**
-     * 处理用户登录请求。
+     * 处理用户登录
-     *
-     * <p>验证用户输入的账号（邮箱或用户名）和密码，如果验证成功则打开年级选择界面，
-     * 否则显示错误消息。
      */
     private void handleLogin() {
-        String account = accountField.getText().trim();
+        String email = emailField.getText().trim();
         String password = new String(passwordField.getPassword());
 
-        if (account.isEmpty() || password.isEmpty()) {
+        if (email.isEmpty() || password.isEmpty()) {
             JOptionPane.showMessageDialog(this,
-                    "账号和密码不能为空",
+                    "邮箱和密码不能为空",
                     "错误",
                     JOptionPane.ERROR_MESSAGE);
             return;
         }
 
-        // 使用新的登录方法，支持邮箱或用户名
+        Grade grade = userManager.login(email, password);
-        UserManager.UserInfo userInfo = userManager.loginWithEmailOrUsername(account, password);
+        if (grade != null) {
-
+            openGradeSelection(email, grade);
-        if (userInfo != null) {
-            openGradeSelection(userInfo);
         } else {
             JOptionPane.showMessageDialog(this,
-                    "账号或密码错误",
+                    "邮箱或密码错误",
                     "登录失败",
                     JOptionPane.ERROR_MESSAGE);
         }
     }
 
     /**
-     * 显示注册对话框。
+     * 打开注册对话框
-     *
-     * <p>创建并显示{@link RegisterDialog}，允许新用户注册账号。
      */
     private void handleRegister() {
         RegisterDialog dialog = new RegisterDialog(this, userManager);
@@ -163,15 +129,13 @@ public class LoginFrame extends JFrame {
     }
 
     /**
-     * 打开年级选择界面。
+     * 打开年级选择界面
-     *
-     * <p>用户登录成功后，创建并显示{@link GradeSelectionFrame}，
-     * 同时关闭当前登录窗口。
      *
-     * @param userInfo 包含用户所有信息的对象
+     * @param email 用户邮箱
+     * @param initialGrade 初始年级
      */
-    private void openGradeSelection(UserManager.UserInfo userInfo) {
+    private void openGradeSelection(String email, Grade initialGrade) {
-        GradeSelectionFrame gradeFrame = new GradeSelectionFrame(userInfo);
+        GradeSelectionFrame gradeFrame = new GradeSelectionFrame(email, initialGrade);
         gradeFrame.setVisible(true);
         this.dispose();
     }

src/ui/MathLearningApp.java

@@ -5,7 +5,7 @@ import javax.swing.SwingUtilities;
 /**
  * 数学学习软件主入口
  *
- * @author 结对项目
+ * @author 结对项目组
  * @version 1.0
  */
 public class MathLearningApp {

src/ui/PasswordSetupDialog.java

@@ -10,7 +10,6 @@ import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPasswordField;
-import javax.swing.JTextField;
 import java.awt.Dimension;
 import java.awt.Frame;
 import java.awt.Font;
@@ -28,9 +27,8 @@ public class PasswordSetupDialog extends JDialog {
     @Serial
     private static final long serialVersionUID = 1L;
     private static final Pattern PASSWORD_PATTERN =
-            Pattern.compile("^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)[a-zA-Z0-9]{6,10}$");
+            Pattern.compile("^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d).{6,10}$");
 
-    private final JTextField usernameField;
     private final JPasswordField password1Field;
     private final JPasswordField password2Field;
     private final JComboBox<String> gradeComboBox;
@@ -47,14 +45,14 @@ public class PasswordSetupDialog extends JDialog {
      * @param email 用户邮箱
      */
     public PasswordSetupDialog(Frame parent, UserManager userManager, String email) {
-        super(parent, "设置密码和用户名", true);
+        super(parent, "设置密码", true);
         this.userManager = userManager;
         this.email = email;
         this.registrationComplete = false;
 
-    setSize(600, 420);
+        setSize(400, 300);
-    setLocationRelativeTo(parent);
+        setLocationRelativeTo(parent);
-    setResizable(true);
+        setResizable(false);
 
         JPanel panel = new JPanel(new GridBagLayout());
         panel.setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 20));
@@ -63,11 +61,10 @@ public class PasswordSetupDialog extends JDialog {
         gbc.fill = GridBagConstraints.HORIZONTAL;
 
         JLabel infoLabel = new JLabel("<html>密码要求:<br>" +
-                "1. 长度 6-10位<br>" +
+                "1. 长度6-10位<br>" +
                 "2. 必须包含大写字母<br>" +
                 "3. 必须包含小写字母<br>" +
-                "4. 必须包含数字<br>" +
+                "4. 必须包含数字</html>");
-                "5. 不能包含其他特殊字符</html>");
         infoLabel.setFont(new Font("微软雅黑", Font.PLAIN, 11));
         gbc.gridx = 0;
         gbc.gridy = 0;
@@ -78,47 +75,31 @@ public class PasswordSetupDialog extends JDialog {
         gbc.gridy = 1;
         panel.add(new JLabel("输入密码:"), gbc);
 
-    password1Field = new JPasswordField(20);
+        password1Field = new JPasswordField(15);
         gbc.gridx = 1;
-    gbc.weightx = 1.0;
+        panel.add(password1Field, gbc);
-    panel.add(password1Field, gbc);
-    gbc.weightx = 0.0;
 
         gbc.gridx = 0;
         gbc.gridy = 2;
         panel.add(new JLabel("确认密码:"), gbc);
 
-    password2Field = new JPasswordField(20);
+        password2Field = new JPasswordField(15);
         gbc.gridx = 1;
-    gbc.weightx = 1.0;
+        panel.add(password2Field, gbc);
-    panel.add(password2Field, gbc);
-    gbc.weightx = 0.0;
 
         gbc.gridx = 0;
         gbc.gridy = 3;
-        panel.add(new JLabel("设置用户名:"), gbc);
-
-        usernameField = new JTextField(20);
-        gbc.gridx = 1;
-        gbc.weightx = 1.0;
-        panel.add(usernameField, gbc);
-        gbc.weightx = 0.0;
-
-        gbc.gridx = 0;
-        gbc.gridy = 4;
         panel.add(new JLabel("选择年级:"), gbc);
 
         String[] grades = {"小学", "初中", "高中"};
         gradeComboBox = new JComboBox<>(grades);
         gbc.gridx = 1;
-        gbc.weightx = 1.0;
         panel.add(gradeComboBox, gbc);
-        gbc.weightx = 0.0;
 
         confirmButton = new JButton("确认注册");
         confirmButton.setPreferredSize(new Dimension(120, 30));
         gbc.gridx = 0;
-        gbc.gridy = 5;
+        gbc.gridy = 4;
         gbc.gridwidth = 2;
         gbc.anchor = GridBagConstraints.CENTER;
         panel.add(confirmButton, gbc);
@@ -135,15 +116,9 @@ public class PasswordSetupDialog extends JDialog {
     private void handleConfirm() {
         String password1 = new String(password1Field.getPassword());
         String password2 = new String(password2Field.getPassword());
-        String username = usernameField.getText().trim();
-
-        if (username.isEmpty() || password1.isEmpty() || password2.isEmpty()) {
-            showError("用户名和密码不能为空");
-            return;
-        }
 
-        if (userManager.usernameExists(username)) {
+        if (password1.isEmpty() || password2.isEmpty()) {
-            showError("该用户名已被使用，请更换一个");
+            showError("密码不能为空");
             return;
         }
 
@@ -154,22 +129,22 @@ public class PasswordSetupDialog extends JDialog {
 
         if (!PASSWORD_PATTERN.matcher(password1).matches()) {
             showError("密码不符合要求:\n" +
-                    "长度6-10位, 必须包含大小写字母和数字, 且不能包含特殊字符");
+                    "长度6-10位,必须包含大小写字母和数字");
             return;
         }
 
         Grade gradeType = getSelectedGradeType();
-        boolean success = userManager.register(email, password1, gradeType, username);
+        boolean success = userManager.register(email, password1, gradeType);
 
         if (success) {
             JOptionPane.showMessageDialog(this,
-                    "注册成功！请返回登录。",
+                    "注册成功!",
                     "成功",
                     JOptionPane.INFORMATION_MESSAGE);
             registrationComplete = true;
             dispose();
         } else {
-            showError("注册失败，该邮箱可能已被注册");
+            showError("注册失败,请重试");
         }
     }
 

src/ui/QuizFrame.java

@@ -40,7 +40,6 @@ public class QuizFrame extends JFrame {
     private JLabel progressLabel;
     private JRadioButton[] optionButtons;
     private JButton submitButton;
-    private ButtonGroup optionGroup;
 
     /**
      * 构造答题界面
@@ -55,7 +54,7 @@ public class QuizFrame extends JFrame {
         this.currentIndex = 0;
         this.correctCount = 0;
 
-            QuestionMaker generator = new QuestionMaker();
+        QuestionMaker generator = new QuestionMaker();
         this.questions = generator.makeQuestions(gradeType, questionCount, email);
 
         if (questions.isEmpty()) {
@@ -68,10 +67,10 @@ public class QuizFrame extends JFrame {
         }
 
         setTitle("数学学习软件 - 答题");
-    setSize(900, 600);
+        setSize(600, 450);
-    setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-    setLocationRelativeTo(null);
+        setLocationRelativeTo(null);
-    setResizable(true);
+        setResizable(false);
 
         JPanel mainPanel = new JPanel(new BorderLayout(10, 10));
         mainPanel.setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 20));
@@ -84,35 +83,24 @@ public class QuizFrame extends JFrame {
         GridBagConstraints gbc = new GridBagConstraints();
         gbc.insets = new Insets(10, 10, 10, 10);
         gbc.fill = GridBagConstraints.HORIZONTAL;
-
-        // 新增：答案格式提示
-        JLabel answerFormatLabel = new JLabel("注意：所有计算结果的答案均保留两位小数。", JLabel.CENTER);
-        answerFormatLabel.setFont(new Font("微软雅黑", Font.ITALIC, 12));
         gbc.gridx = 0;
         gbc.gridy = 0;
         gbc.gridwidth = 2;
-        centerPanel.add(answerFormatLabel, gbc);
-
-        gbc.gridx = 0;
-        gbc.gridy = 1;
-        gbc.gridwidth = 2;
 
         questionLabel = new JLabel();
-    questionLabel.setFont(new Font("Cambria Math", Font.PLAIN, 18));
+        questionLabel.setFont(new Font("微软雅黑", Font.PLAIN, 16));
-    questionLabel.setBorder(BorderFactory.createEmptyBorder(10, 10, 20, 10));
+        questionLabel.setBorder(BorderFactory.createEmptyBorder(10, 10, 20, 10));
         centerPanel.add(questionLabel, gbc);
 
-        optionGroup = new ButtonGroup();
+        ButtonGroup optionGroup = new ButtonGroup();
         optionButtons = new JRadioButton[4];
 
         for (int i = 0; i < 4; i++) {
             optionButtons[i] = new JRadioButton();
-            optionButtons[i].setFont(new Font("Cambria Math", Font.PLAIN, 14));
+            optionButtons[i].setFont(new Font("微软雅黑", Font.PLAIN, 14));
             optionGroup.add(optionButtons[i]);
-            gbc.gridy = i + 2;
+            gbc.gridy = i + 1;
-            gbc.gridwidth = 2;
             centerPanel.add(optionButtons[i], gbc);
-            gbc.gridwidth = 1;
         }
 
         mainPanel.add(centerPanel, BorderLayout.CENTER);
@@ -145,13 +133,12 @@ public class QuizFrame extends JFrame {
         progressLabel.setText(String.format("第 %d/%d 题",
                 currentIndex + 1, questions.size()));
         questionLabel.setText("<html><body style='width: 500px'>" +
-                question.questionText() + "</body></html>");
+                question.getQuestionText() + "</body></html>");
-
-        optionGroup.clearSelection();
 
-        String[] options = question.options();
+        String[] options = question.getOptions();
         for (int i = 0; i < 4; i++) {
             optionButtons[i].setText(options[i]);
+            optionButtons[i].setSelected(false);
         }
 
         submitButton.setEnabled(true);
@@ -178,7 +165,7 @@ public class QuizFrame extends JFrame {
         }
 
         Question question = questions.get(currentIndex);
-        if (selectedIndex == question.correctAnswer()) {
+        if (selectedIndex == question.getCorrectAnswer()) {
             correctCount++;
         }
 

src/ui/RegisterDialog.java

@@ -8,21 +8,11 @@ import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
-import javax.swing.SwingWorker;
 import java.awt.Frame;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
-import java.util.Properties;
 import java.util.regex.Pattern;
-import javax.mail.Authenticator;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.PasswordAuthentication;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
 
 /**
  * 用户注册对话框
@@ -31,13 +21,7 @@ import javax.mail.internet.MimeMessage;
 public class RegisterDialog extends JDialog {
     private static final long serialVersionUID = 1L;
     private static final Pattern EMAIL_PATTERN =
-            Pattern.compile("^[A-Za-z0-9+_.-]+@qq\\.com$");
+            Pattern.compile("^[A-Za-z0-9+_.-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}$");
-
-    // 邮件配置 - 请根据实际情况修改
-    private static final String SMTP_HOST = "smtp.qq.com";  // SMTP服务器
-    private static final String SMTP_PORT = "587";
-    private static final String FROM_EMAIL = "3551664030@qq.com";  // 发件人邮箱
-    private static final String EMAIL_PASSWORD = "wvazqphcxhuqdbfa";  // 授权码
 
     private final JTextField emailField;
     private final JTextField codeField;
@@ -56,7 +40,7 @@ public class RegisterDialog extends JDialog {
         super(parent, "用户注册", true);
         this.userManager = userManager;
 
-        setSize(600, 300);
+        setSize(400, 250);
         setLocationRelativeTo(parent);
         setResizable(false);
 
@@ -70,7 +54,7 @@ public class RegisterDialog extends JDialog {
         gbc.gridy = 0;
         panel.add(new JLabel("邮箱:"), gbc);
 
-        emailField = new JTextField(25);
+        emailField = new JTextField(20);
         gbc.gridx = 1;
         gbc.gridwidth = 2;
         panel.add(emailField, gbc);
@@ -84,7 +68,7 @@ public class RegisterDialog extends JDialog {
         gbc.gridy = 1;
         panel.add(new JLabel("验证码:"), gbc);
 
-        codeField = new JTextField(25);
+        codeField = new JTextField(20);
         codeField.setEnabled(false);
         gbc.gridx = 1;
         gbc.gridwidth = 2;
@@ -109,12 +93,12 @@ public class RegisterDialog extends JDialog {
         String email = emailField.getText().trim();
 
         if (email.isEmpty()) {
-            showError("邮箱不能为空");
+            showError("请输入邮箱地址");
             return;
         }
 
         if (!EMAIL_PATTERN.matcher(email).matches()) {
-            showError("请输入有效的QQ邮箱(以@qq.com结尾)");
+            showError("邮箱格式不正确");
             return;
         }
 
@@ -124,97 +108,15 @@ public class RegisterDialog extends JDialog {
         }
 
         generatedCode = generateCode();
+        JOptionPane.showMessageDialog(this,
+                "验证码已发送: " + generatedCode + "\n(实际应用中会发送到邮箱)",
+                "验证码",
+                JOptionPane.INFORMATION_MESSAGE);
 
-        // 禁用按钮，防止重复点击
+        emailField.setEnabled(false);
         sendCodeButton.setEnabled(false);
-        sendCodeButton.setText("发送中...");
+        codeField.setEnabled(true);
-
+        verifyButton.setEnabled(true);
-        // 使用SwingWorker在后台线程发送邮件，避免阻塞UI
-        new SwingWorker<Boolean, Void>() {
-            @Override
-            protected Boolean doInBackground() {
-                return sendEmail(email, generatedCode);
-            }
-
-            @Override
-            protected void done() {
-                try {
-                    boolean success = get();
-                    if (success) {
-                        JOptionPane.showMessageDialog(
-                                RegisterDialog.this,
-                                "验证码已发送到您的邮箱，请查收！",
-                                "发送成功",
-                                JOptionPane.INFORMATION_MESSAGE);
-
-                        emailField.setEnabled(false);
-                        codeField.setEnabled(true);
-                        verifyButton.setEnabled(true);
-                        sendCodeButton.setText("已发送");
-                    } else {
-                        showError("验证码发送失败，请检查邮箱地址或稍后重试");
-                        sendCodeButton.setEnabled(true);
-                        sendCodeButton.setText("发送验证码");
-                    }
-                } catch (Exception e) {
-                    showError("验证码发送失败: " + e.getMessage());
-                    sendCodeButton.setEnabled(true);
-                    sendCodeButton.setText("发送验证码");
-                }
-            }
-        }.execute();
-    }
-
-    /**
-     * 发送邮件
-     *
-     * @param toEmail 收件人邮箱
-     * @param code 验证码
-     * @return 是否发送成功
-     */
-    private boolean sendEmail(String toEmail, String code) {
-        try {
-            // 配置邮件服务器属性
-            Properties props = new Properties();
-            props.put("mail.smtp.host", SMTP_HOST);
-            props.put("mail.smtp.port", SMTP_PORT);
-            props.put("mail.smtp.auth", "true");
-            props.put("mail.smtp.starttls.enable", "true");  // 启用TLS
-
-            // 创建会话
-            Session session = Session.getInstance(props, new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication(FROM_EMAIL, EMAIL_PASSWORD);
-                }
-            });
-
-            // 创建邮件消息
-            Message message = new MimeMessage(session);
-            message.setFrom(new InternetAddress(FROM_EMAIL));
-            message.setRecipients(Message.RecipientType.TO, InternetAddress.parse(toEmail));
-            message.setSubject("注册验证码");
-
-            // 邮件内容
-            String content = String.format(
-                    "<html><body>" +
-                            "<h2>欢迎注册</h2>" +
-                            "<p>您的验证码是：<strong style='font-size: 24px; color: #007bff;'>%s</strong></p>" +
-                            "<p>验证码有效期为10分钟，请及时使用。</p>" +
-                            "<p>如果这不是您的操作，请忽略此邮件。</p>" +
-                            "</body></html>",
-                    code
-            );
-            message.setContent(content, "text/html; charset=utf-8");
-
-            // 发送邮件
-            Transport.send(message);
-            return true;
-
-        } catch (MessagingException e) {
-            e.printStackTrace();
-            return false;
-        }
     }
 
     /**

src/ui/ResultFrame.java

@@ -40,10 +40,10 @@ public class ResultFrame extends JFrame {
         this.gradeType = gradeType;
 
         setTitle("数学学习软件 - 答题结果");
-    setSize(600, 420);
+        setSize(400, 300);
-    setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-    setLocationRelativeTo(null);
+        setLocationRelativeTo(null);
-    setResizable(true);
+        setResizable(false);
 
         JPanel mainPanel = new JPanel(new BorderLayout(10, 10));
         mainPanel.setBorder(BorderFactory.createEmptyBorder(30, 30, 30, 30));

src/ui/UserSettingsDialog.java

@@ -1,86 +0,0 @@
-package ui;
-
-import javax.swing.*;
-import java.awt.*;
-
-/**
- * 用户设置对话框
- * 显示用户信息并提供修改密码的入口
- */
-public class UserSettingsDialog extends JDialog {
-    private static final long serialVersionUID = 1L;
-
-    private final String email;
-    private final String username;
-    private final Frame parentFrame;
-
-    /**
-     * 构造用户设置对话框
-     *
-     * @param parent   父窗口
-     * @param email    用户邮箱
-     * @param username 用户名
-     */
-    public UserSettingsDialog(Frame parent, String email, String username) {
-        super(parent, "用户设置", true);
-        this.parentFrame = parent;
-        this.email = email;
-        this.username = username;
-
-        setSize(400, 250);
-        setLocationRelativeTo(parent);
-        setResizable(false);
-
-        JPanel panel = new JPanel(new GridBagLayout());
-        panel.setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 20));
-        GridBagConstraints gbc = new GridBagConstraints();
-        gbc.insets = new Insets(10, 5, 10, 5);
-        gbc.anchor = GridBagConstraints.WEST;
-
-        // 显示用户名
-        gbc.gridx = 0;
-        gbc.gridy = 0;
-        panel.add(new JLabel("用户名:"), gbc);
-
-        gbc.gridx = 1;
-        JLabel usernameLabel = new JLabel(username);
-        usernameLabel.setFont(new Font("微软雅黑", Font.BOLD, 14));
-        panel.add(usernameLabel, gbc);
-
-        // 显示邮箱
-        gbc.gridx = 0;
-        gbc.gridy = 1;
-        panel.add(new JLabel("邮箱:"), gbc);
-
-        gbc.gridx = 1;
-        JLabel emailLabel = new JLabel(email);
-        emailLabel.setFont(new Font("微软雅黑", Font.PLAIN, 14));
-        panel.add(emailLabel, gbc);
-
-        // 修改密码按钮
-        JButton changePasswordButton = new JButton("修改密码");
-        changePasswordButton.setPreferredSize(new Dimension(120, 30));
-        gbc.gridx = 0;
-        gbc.gridy = 2;
-        gbc.gridwidth = 2;
-        gbc.anchor = GridBagConstraints.CENTER;
-        gbc.insets = new Insets(20, 5, 10, 5);
-        panel.add(changePasswordButton, gbc);
-
-        add(panel);
-
-        // 按钮点击事件
-        changePasswordButton.addActionListener(e -> openChangePasswordDialog());
-    }
-
-    /**
-     * 打开修改密码对话框
-     */
-    private void openChangePasswordDialog() {
-        // 关闭当前对话框
-        this.dispose();
-        // 打开修改密码对话框
-        ChangePasswordDialog dialog = new ChangePasswordDialog(parentFrame, email);
-        dialog.setVisible(true);
-    }
-}

users.json

@@ -1,8 +0,0 @@
-{
-  "1617940512@qq.com": {
-    "email": "1617940512@qq.com",
-    "password": "Qwerty1",
-    "grade": "primary",
-    "username": "zhang"
-  }
-}