|
|
|
|
@ -4,28 +4,7 @@
|
|
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
|
<list default="true" id="3b1bb474-3d43-47ea-b452-37db5e702367" name="更改" comment="1">
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/.idea/.gitignore" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/.idea/.name" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/data/users.json" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/main/java/mathlearning/ui/ChangePasswordFrame.java" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/main/java/mathlearning/ui/ProfileFrame.java" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/main/java/mathlearning/ui/SelTestFrame.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/mathlearning/model/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/mathlearning/model/User.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/mathlearning/service/MultipleChoiceGenerator/MultipleChoiceGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/mathlearning/service/MultipleChoiceGenerator/MultipleChoiceGenerator.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/mathlearning/service/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/mathlearning/service/UserService.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/mathlearning/ui/ChangeCodeFrame.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/mathlearning/ui/ChangeCodeFrame.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/mathlearning/ui/LoginFrame.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/mathlearning/ui/LoginFrame.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/mathlearning/ui/MainFrame.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/mathlearning/ui/MainFrame.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/mathlearning/ui/RegisterFrame.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/mathlearning/ui/RegisterFrame.java" afterDir="false" />
|
|
|
|
|
</list>
|
|
|
|
|
<list default="true" id="3b1bb474-3d43-47ea-b452-37db5e702367" name="更改" comment="1" />
|
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
|
|
|
@ -48,9 +27,10 @@
|
|
|
|
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
|
|
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
|
|
|
|
|
"RunOnceActivity.git.unshallow": "true",
|
|
|
|
|
"git-widget-placeholder": "正在合并 liuxinrui__branch",
|
|
|
|
|
"git-widget-placeholder": "liuxinrui__branch",
|
|
|
|
|
"kotlin-language-version-configured": "true",
|
|
|
|
|
"last_opened_file_path": "D:/filee/软导/java/结对/project/MathLearningApp/git"
|
|
|
|
|
"last_opened_file_path": "D:/filee/软导/java/结对/project/MathLearningApp/git",
|
|
|
|
|
"应用程序.App.executor": "Run"
|
|
|
|
|
}
|
|
|
|
|
}]]></component>
|
|
|
|
|
<component name="RunManager">
|
|
|
|
|
@ -74,6 +54,23 @@
|
|
|
|
|
<option name="presentableId" value="Default" />
|
|
|
|
|
<updated>1760184458384</updated>
|
|
|
|
|
</task>
|
|
|
|
|
<task id="LOCAL-00001" summary="1">
|
|
|
|
|
<option name="closed" value="true" />
|
|
|
|
|
<created>1760186790252</created>
|
|
|
|
|
<option name="number" value="00001" />
|
|
|
|
|
<option name="presentableId" value="LOCAL-00001" />
|
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
|
<updated>1760186790252</updated>
|
|
|
|
|
</task>
|
|
|
|
|
<task id="LOCAL-00002" summary="1">
|
|
|
|
|
<option name="closed" value="true" />
|
|
|
|
|
<created>1760186802794</created>
|
|
|
|
|
<option name="number" value="00002" />
|
|
|
|
|
<option name="presentableId" value="LOCAL-00002" />
|
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
|
<updated>1760186802794</updated>
|
|
|
|
|
</task>
|
|
|
|
|
<option name="localTasksCounter" value="3" />
|
|
|
|
|
<servers />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="Vcs.Log.Tabs.Properties">
|
|
|
|
|
|