Merge branch 'refs/heads/develop'

# Conflicts:
#	out/production/TestPaperGenerationSystem/Application.class
main
Teptao 5 months ago
commit 705ddabff8

@ -0,0 +1,8 @@
<component name="ArtifactManager">
<artifact type="jar" name="TestPaperGenerationSystem:jar">
<output-path>$PROJECT_DIR$/out/artifacts/TestPaperGenerationSystem_jar</output-path>
<root id="archive" name="TestPaperGenerationSystem.jar">
<element id="module-output" name="TestPaperGenerationSystem" />
</root>
</artifact>
</component>

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="PROJECT" charset="UTF-8" />
</component>
</project>

@ -0,0 +1,4 @@
<changelist name="在进行签出之前于_2025_9_26_下午4_05_取消提交了更改_[更改]" date="1758873913309" recycled="true" deleted="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行签出之前于_2025_9_26_下午4_05_取消提交了更改_[更改]/shelved.patch" />
<option name="DESCRIPTION" value="在进行签出之前于 2025/9/26 下午4:05 取消提交了更改 [更改]" />
</changelist>

@ -0,0 +1,4 @@
<changelist name="在进行合并之前于_2025_9_26_下午4_07_取消提交了更改_[更改]" date="1758874031187" recycled="true" deleted="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行合并之前于_2025_9_26_下午4_07_取消提交了更改_[更改]/shelved.patch" />
<option name="DESCRIPTION" value="在进行合并之前于 2025/9/26 下午4:07 取消提交了更改 [更改]" />
</changelist>

@ -0,0 +1,17 @@
Index: .idea/encodings.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
--- /dev/null (date 1758874024088)
+++ b/.idea/encodings.xml (date 1758874024088)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Encoding">
+ <file url="PROJECT" charset="UTF-8" />
+ </component>
+</project>
\ No newline at end of file

@ -1,48 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ArtifactsWorkspaceSettings">
<artifacts-to-build>
<artifact name="TestPaperGenerationSystem:jar" />
</artifacts-to-build>
</component>
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="5b2e6f5d-b529-4f9a-97f7-f4b1b04083cf" name="更改" comment="">
<change afterPath="$PROJECT_DIR$/.idea/libraries/TestPaperGenerationSystem.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/TestPaperGenerationSystem1.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/TestPaperGenerationSystem2.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TestPaperGenerationSystem.zip" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TestPaperGenerationSystem/TestPaperGenerationSystem.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TestPaperGenerationSystem/account/account.txt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TestPaperGenerationSystem/data/张三1/2025-09-26-15-21-27.txt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TestPaperGenerationSystem/data/李四2/2025-09-26-15-22-00.txt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TestPaperGenerationSystem/data/李四2/2025-09-26-15-22-06.txt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TestPaperGenerationSystem/个人项目使用大模型后人工修改代码一览表.docx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TestPaperGenerationSystem/双击启动.bat" afterDir="false" />
<change afterPath="$PROJECT_DIR$/TestPaperGenerationSystem/运行说明.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/artifacts/TestPaperGenerationSystem_jar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/_2025_9_26_1_37____.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/_2025_9_26_1_37____1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/在进行签出之前于_2025_9_26_下午1_37_取消提交了更改_[更改]/shelved.patch" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/在进行签出之前于_2025_9_26_下午1_37_取消提交了更改_[更改]1/shelved.patch" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/在进行签出之前于_2025_9_26_下午2_39_取消提交了更改_[更改]/TestPaperGenerationSystem.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/在进行签出之前于_2025_9_26_下午2_39_取消提交了更改_[更改]/shelved.patch" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/在进行签出之前于_2025_9_26_下午2_39_取消提交了更改_[更改]1/TestPaperGenerationSystem.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/在进行签出之前于_2025_9_26_下午2_39_取消提交了更改_[更改]1/shelved.patch" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/qodana.yaml" beforeDir="false" />
</list>
<list default="true" id="5b2e6f5d-b529-4f9a-97f7-f4b1b04083cf" name="更改" comment="debug" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="main" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="ProjectColorInfo"><![CDATA[{
"customColor": "",
"associatedIndex": 5
}]]></component>
<component name="ProjectColorInfo">{
&quot;customColor&quot;: &quot;&quot;,
&quot;associatedIndex&quot;: 5
}</component>
<component name="ProjectId" id="33ECTxlodz1qr6hL1vXUlbhRgej" />
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
@ -51,13 +39,16 @@
"keyToString": {
"RunOnceActivity.ShowReadmeOnStart": "true",
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
"git-widget-placeholder": "main",
"git-widget-placeholder": "develop",
"kotlin-language-version-configured": "true",
"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",
"project.structure.last.edited": "工件",
"project.structure.proportion": "0.15",
"project.structure.side.proportion": "0.2",
"vue.rearranger.settings.migration": "true",
"应用程序.Application.executor": "Run"
}
@ -79,10 +70,41 @@
<option name="presentableId" value="Default" />
<updated>1758872857147</updated>
<workItem from="1758872858117" duration="494000" />
<workItem from="1758874321038" duration="267000" />
</task>
<task id="LOCAL-00001" summary="更新jar">
<option name="closed" value="true" />
<created>1758874003630</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1758874003630</updated>
</task>
<task id="LOCAL-00002" summary="debug">
<option name="closed" value="true" />
<created>1758874414433</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1758874414433</updated>
</task>
<task id="LOCAL-00003" summary="debug">
<option name="closed" value="true" />
<created>1758874568861</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1758874568861</updated>
</task>
<option name="localTasksCounter" value="4" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="更新jar" />
<MESSAGE value="debug" />
<option name="LAST_COMMIT_MESSAGE" value="debug" />
</component>
</project>

Binary file not shown.

Binary file not shown.

@ -0,0 +1,10 @@
张三1,123,小学
张三2,123,小学
张三3,123,小学
李四1,123,初中
李四2,123,初中
李四3,123,初中
王五1,123,高中
王五2,123,高中
王五3,123,高中
abc1,123,高中

@ -0,0 +1,21 @@
1. 9 + 58 * 4 / 2 * 5 = ?
2. 76 / (38 + 4) - 6 = ?
3. 87 * 10 + 89 = ?
4. 67 - 27 = ?
5. 4 / 4 = ?
6. 10 - 5 + 57 + 61 - 98 = ?
7. 75 - 17 * 9 = ?
8. 33 - 19 - 3 = ?
9. 17 * (10 + 12) / 182 - 1 = ?
10. 67 - 54 + 77 / 30 + 31 = ?
11. (100 + 40) - 85 = ?

@ -0,0 +1,39 @@
1. sqrt(9) + 31 = ?
2. 41 + 76 + (66^2) + 48 = ?
3. sqrt(36) / 9 + 37 = ?
4. 26 - (14^2) / 1 * 17 * 94 = ?
5. 6 - 1 * 83 * sqrt(16) - 85 = ?
6. (18^2) + 16 / 8 = ?
7. 60 - 22 + 42 - 9 * sqrt(4) = ?
8. 64 - 38 / 2 * sqrt(81) / 7 = ?
9. (10 - 35) * 67 * 84 + (70^2) = ?
10. 34 + (48^2) = ?
11. 5 / sqrt(36) = ?
12. 40 / sqrt(81) = ?
13. 98 + 64 + sqrt(81) * 59 + 16 = ?
14. sqrt(36) / (7 + 89) = ?
15. 62 - 94 * sqrt(81) = ?
16. 160 / 40 / 119 / 7 - sqrt(25) = ?
17. 90 / sqrt(25) = ?
18. (81 + 2) / sqrt(9) = ?
19. (21^2) + 15 = ?
20. 2 / sqrt(25) * 40 + 44 = ?

@ -0,0 +1,57 @@
1. (87 - 60) + 14 * (23^2) = ?
2. (82^2) * 89 + 42 * 17 * 26 = ?
3. (63 + (61^2) - 78 = ?
4. 24 - (99^2) = ?
5. (15^2) / 3 = ?
6. (72^2) * 98 * 82 + 82 = ?
7. sqrt(36) / 9 = ?
8. 99 + sqrt(64) / 2 * 8 + 57 = ?
9. 56 - (81^2) / 8 / 8 = ?
10. sqrt(25) + 88 / 8 = ?
11. 20 - (82 - 28) / sqrt(81) = ?
12. 46 - 11 * (44^2) = ?
13. 36 * sqrt(49) = ?
14. (100^2) / 10 / 1 = ?
15. 55 / (16^2) / 8 * 75 = ?
16. sqrt(4) - (28 + 70) + 55 - 77 = ?
17. 62 * 68 * 40 / 4 * (8^2) = ?
18. sqrt(49) * (14 + 89) = ?
19. sqrt(36) - 46 * 26 + 49 = ?
20. 4 / (4 - sqrt(49) = ?
21. 36 - 76 + 71 - 69 + (39^2) = ?
22. 93 - 85 / sqrt(16) = ?
23. (61^2) * 14 = ?
24. 39 * sqrt(64) = ?
25. 22 * (87^2) + 28 / (7 + 73) = ?
26. 3 - 81 - 67 - sqrt(64) = ?
27. (18^2) / 1 - 7 = ?
28. 16 + (62^2) = ?
29. 12 / (12^2) / 2 = ?

@ -0,0 +1,14 @@
@echo off
:: 1. 将控制台环境设置为 UTF-8确保中文输入输出正确
chcp 65001 > nul
:: 2. 告诉 Java 虚拟机(JVM) 使用 UTF-8 编码
set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
:: 3. 运行你的 JAR 包
echo loading...
java -jar TestPaperGenerationSystem.jar
:: 4. 清理环境变量并暂停,以便查看程序输出
set JAVA_TOOL_OPTIONS=
pause

@ -0,0 +1,12 @@
jdk版本22及以上
保证jar同目录存在account文件夹文件夹里存在account.txt文件
cmd中输入chcp 65001切换编码为UTF-8
powershell中输入[Console]::InputEncoding = [Console]::OutputEncoding = [System.Text.Encoding]::UTF8
!!不切换编码会导致显示乱码和无法登录!!
最后输入java -jar TestPaperGenerationSystem.jar启动或者直接双击bat文件

@ -0,0 +1,19 @@
1. 42 - 2 / 4 / 2 + 7 = ?
2. 74 / 1 * 3 = ?
3. 13 + 3 / 8 / 2 * 1 = ?
4. 23 / 23 - 1 / 1 + 58 = ?
5. 97 * 6 * (4 - 127) * 9 = ?
6. 14 - 9 = ?
7. 47 + 52 + 83 + 82 + 96 = ?
8. 2 * (3 - 5) + 48 - 41 = ?
9. 60 / 10 = ?
10. 2 - 1 = ?

@ -0,0 +1,19 @@
1. 43 / 43 = ?
2. 10 + 38 + 55 * (4 + 89) = ?
3. 1 / 1 / 1 - 1 - 0 = ?
4. 47 / 47 / 1 + 33 = ?
5. 46 * 5 * 4 = ?
6. 82 * (4 - 149) = ?
7. 64 - 22 * 5 + 7 = ?
8. 37 - 23 = ?
9. 70 + 34 - 98 = ?
10. 19 - 10 = ?

@ -0,0 +1,19 @@
1. 67 - 24 + 53 = ?
2. 47 * 9 * 1 / (1 + 5) = ?
3. 90 / 3 - 24 = ?
4. 60 + 2 + 28 - 11 - 40 = ?
5. (58 - 57) + 96 + 31 = ?
6. (26 - 15) - 2 / 1 - 7 = ?
7. 50 + (71 + 32) = ?
8. 79 * 5 / 1 * 6 = ?
9. 4 * 5 + 96 = ?
10. 43 * 8 - 141 = ?

@ -0,0 +1,19 @@
1. 55 - 48 / 32 / tan(45) * sqrt(4) = ?
2. 63 + cos(90) * 93 + sqrt(64) * 15 = ?
3. sqrt(4) * tan(45) - 36 = ?
4. tan(45) - 2 + sqrt(49) = ?
5. 94 * sin(60) / 6 + 7 * sqrt(64) = ?
6. sin(0) * 64 * sqrt(49) = ?
7. tan(30) - 4) - (85^2) / 5 = ?
8. tan(60) - (52^2) - 94 = ?
9. tan(0) * 92 + 60 / (5^2) = ?
10. sin(90) * (29^2) = ?
Loading…
Cancel
Save