第二次提交

This commit is contained in:
luoyu 2026-03-11 10:14:38 +08:00
parent b22e51ea23
commit b0771e6244
2 changed files with 49 additions and 99 deletions

2
.idea/vcs.xml generated
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="" vcs="svn" /> <mapping directory="" vcs="Git" />
</component> </component>
</project> </project>

146
.idea/workspace.xml generated
View File

@ -8,43 +8,10 @@
<bookmark url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.15.RELEASE/spring-context-5.2.15.RELEASE-sources.jar!/org/springframework/context/support/AbstractApplicationContext.java" description="finishBeanFactoryInitialization(beanFactory);" line="550" /> <bookmark url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.15.RELEASE/spring-context-5.2.15.RELEASE-sources.jar!/org/springframework/context/support/AbstractApplicationContext.java" description="finishBeanFactoryInitialization(beanFactory);" line="550" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="b3e725af-0256-48a6-b1a8-8f78b0b53388" name="Default Changelist" comment="pref:增加新题型12的答题情况统计报告和错题本"> <list default="true" id="b3e725af-0256-48a6-b1a8-8f78b0b53388" name="Default Changelist" comment="pref:增加新题型12的答题情况统计报告和错题本" />
<change beforePath="$PROJECT_DIR$/bin" beforeDir="true" /> <list id="6876ad38-e68c-4e9f-b59b-940d7f876213" name="decreptedList" comment="decreptedList" />
<change beforePath="$PROJECT_DIR$/src/com/spoken/api/common/BaseSvr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/spoken/api/common/BaseSvr.java" afterDir="false" /> <list id="e842b21b-3db5-405a-96f7-62cad669d0c0" name="不提交的文件" comment="" />
<change beforePath="$PROJECT_DIR$/src/com/spoken/api/entity/Lesson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/spoken/api/entity/Lesson.java" afterDir="false" /> <list id="01e11f59-30ce-499a-90f2-3b07357d8ff0" name="转校" comment="转校" />
<change beforePath="$PROJECT_DIR$/src/com/spoken/api/service/UserInfoSvr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/spoken/api/service/UserInfoSvr.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/spoken/api/service/audioclassroom/CsLessonBookDetailSvr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/spoken/api/service/audioclassroom/CsLessonBookDetailSvr.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/spoken/api/service/base/BindInfoSvr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/spoken/api/service/base/BindInfoSvr.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/spoken/api/service/batch/GoodsAuthSvr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/spoken/api/service/batch/GoodsAuthSvr.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/spoken/api/service/query/GoodsQuerySvr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/spoken/api/service/query/GoodsQuerySvr.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/spoken/api/service/query/PreviousAssignQuerySvr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/spoken/api/service/query/PreviousAssignQuerySvr.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/config/database_word.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/config/database_word.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/sqlmap/Lesson.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/sqlmap/Lesson.xml" afterDir="false" />
</list>
<list id="6876ad38-e68c-4e9f-b59b-940d7f876213" name="decreptedList" comment="decreptedList">
<change beforePath="$PROJECT_DIR$/src/com/spoken/api/service/base/LessonPartSvr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/spoken/api/service/base/LessonPartSvr.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/spoken/api/service/base/LessonRoleSvr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/spoken/api/service/base/LessonRoleSvr.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/spoken/api/service/base/SentenceSvr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/spoken/api/service/base/SentenceSvr.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/spoken/api/service/base/WordsSvr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/spoken/api/service/base/WordsSvr.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/spoken/api/service/batch/LessonBatchSvr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/spoken/api/service/batch/LessonBatchSvr.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/spoken/api/service/batch/SentenceBatchSvr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/spoken/api/service/batch/SentenceBatchSvr.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/spoken/api/service/batch/WordBatchSvr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/spoken/api/service/batch/WordBatchSvr.java" afterDir="false" />
</list>
<list id="e842b21b-3db5-405a-96f7-62cad669d0c0" name="不提交的文件" comment="">
<change afterPath="$PROJECT_DIR$/api.env.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/config/database.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/config/database.properties" afterDir="false" />
</list>
<list id="01e11f59-30ce-499a-90f2-3b07357d8ff0" name="转校" comment="转校">
<change afterPath="$PROJECT_DIR$/src/com/spoken/api/service/func/TransferSchoolNewSvr.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/spoken/api/service/func/TransferSchoolSvr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/spoken/api/service/func/TransferSchoolSvr.java" afterDir="false" />
</list>
<file path="$PROJECT_DIR$/src/com/spoken/api/service/func/TransferSchoolSvr.java" ignored="false" />
<file path="$PROJECT_DIR$/src/com/spoken/api/service/batch/SentenceBatchSvr.java" ignored="false" />
<file path="$PROJECT_DIR$/api.env.properties" ignored="false" />
<file path="$PROJECT_DIR$/src/config/database.properties" ignored="false" />
<file path="$PROJECT_DIR$/src/com/spoken/api/service/base/WordsSvr.java" ignored="false" />
<file path="$PROJECT_DIR$/src/com/spoken/api/service/batch/WordBatchSvr.java" ignored="false" />
<file path="$PROJECT_DIR$/src/com/spoken/api/service/base/SentenceSvr.java" ignored="false" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -249,49 +216,49 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent">{ <component name="PropertiesComponent"><![CDATA[{
&quot;keyToString&quot;: { "keyToString": {
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder0&quot;: &quot;0&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder0": "0",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder1&quot;: &quot;1&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder1": "1",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder2&quot;: &quot;2&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder2": "2",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder3&quot;: &quot;3&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder3": "3",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder4&quot;: &quot;4&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder4": "4",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder5&quot;: &quot;5&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder5": "5",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth0&quot;: &quot;199&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth0": "199",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth1&quot;: &quot;199&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth1": "199",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth2&quot;: &quot;198&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth2": "198",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth3&quot;: &quot;198&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth3": "198",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth4&quot;: &quot;198&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth4": "198",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth5&quot;: &quot;197&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth5": "197",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder0&quot;: &quot;0&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder0": "0",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder1&quot;: &quot;1&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder1": "1",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder2&quot;: &quot;2&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder2": "2",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder3&quot;: &quot;3&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder3": "3",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder4&quot;: &quot;4&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder4": "4",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder5&quot;: &quot;5&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder5": "5",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth0&quot;: &quot;198&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth0": "198",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth1&quot;: &quot;198&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth1": "198",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth2&quot;: &quot;198&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth2": "198",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth3&quot;: &quot;198&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth3": "198",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth4&quot;: &quot;199&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth4": "199",
&quot;FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth5&quot;: &quot;198&quot;, "FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth5": "198",
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;, "RunOnceActivity.OpenProjectViewOnStart": "true",
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;, "RunOnceActivity.ShowReadmeOnStart": "true",
&quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;, "WebServerToolWindowFactoryState": "false",
&quot;last_opened_file_path&quot;: &quot;F:/ceteng/pcserver/serverConf&quot;, "last_opened_file_path": "F:/ceteng20260310/spokenServer",
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;, "node.js.detected.package.eslint": "true",
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;, "node.js.detected.package.tslint": "true",
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;, "node.js.selected.package.eslint": "(autodetect)",
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;, "node.js.selected.package.tslint": "(autodetect)",
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;, "nodejs_package_manager_path": "npm",
&quot;project.structure.last.edited&quot;: &quot;Modules&quot;, "project.structure.last.edited": "Modules",
&quot;project.structure.proportion&quot;: &quot;0.15&quot;, "project.structure.proportion": "0.15",
&quot;project.structure.side.proportion&quot;: &quot;0.2&quot;, "project.structure.side.proportion": "0.2",
&quot;recentSelected&quot;: &quot;[{\&quot;type\&quot;:\&quot;folder\&quot;,\&quot;name\&quot;:\&quot;bin/com/spoken/api/service\&quot;,\&quot;time\&quot;:1765448060436},{\&quot;type\&quot;:\&quot;folder\&quot;,\&quot;name\&quot;:\&quot;bin/com/spoken/api/dao\&quot;,\&quot;time\&quot;:1765447875800}]&quot;, "recentSelected": "[{\"type\":\"folder\",\"name\":\"bin/com/spoken/api/service\",\"time\":1765448060436},{\"type\":\"folder\",\"name\":\"bin/com/spoken/api/dao\",\"time\":1765447875800}]",
&quot;settings.editor.selected.configurable&quot;: &quot;vcs.Subversion&quot;, "settings.editor.selected.configurable": "project.propVCSSupport.Mappings",
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot; "vue.rearranger.settings.migration": "true"
} }
}</component> }]]></component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="F:\ceteng\pcserver\serverConf" /> <recent name="F:\ceteng\pcserver\serverConf" />
@ -405,28 +372,9 @@
<component name="SvnConfiguration" cleanupOnStartRun="true"> <component name="SvnConfiguration" cleanupOnStartRun="true">
<configuration>C:\Users\Jason\AppData\Roaming\Subversion</configuration> <configuration>C:\Users\Jason\AppData\Roaming\Subversion</configuration>
<supportedVersion>125</supportedVersion> <supportedVersion>125</supportedVersion>
<option name="runUnderTerminal" value="true" />
<option name="mySSHConnectionTimeout" value="999999000" /> <option name="mySSHConnectionTimeout" value="999999000" />
<option name="mySSHReadTimeout" value="999999000" /> <option name="mySSHReadTimeout" value="999999000" />
</component> </component>
<component name="SvnFileUrlMappingImpl">
<option name="myMappingRoots">
<list>
<SvnCopyRootSimple>
<option name="myVcsRoot" value="F:\ceteng\pcserver" />
<option name="myCopyRoot" value="F:\ceteng\pcserver" />
</SvnCopyRootSimple>
</list>
</option>
<option name="myMoreRealMappingRoots">
<list>
<SvnCopyRootSimple>
<option name="myVcsRoot" value="F:\ceteng\pcserver" />
<option name="myCopyRoot" value="F:\ceteng\pcserver" />
</SvnCopyRootSimple>
</list>
</option>
</component>
<component name="TaskManager"> <component name="TaskManager">
<task active="true" id="Default" summary="Default task"> <task active="true" id="Default" summary="Default task">
<changelist id="b3e725af-0256-48a6-b1a8-8f78b0b53388" name="Default Changelist" comment="" /> <changelist id="b3e725af-0256-48a6-b1a8-8f78b0b53388" name="Default Changelist" comment="" />
@ -1673,6 +1621,8 @@
<workItem from="1772763024975" duration="8936000" /> <workItem from="1772763024975" duration="8936000" />
<workItem from="1773032630155" duration="2416000" /> <workItem from="1773032630155" duration="2416000" />
<workItem from="1773106114085" duration="6402000" /> <workItem from="1773106114085" duration="6402000" />
<workItem from="1773193776073" duration="435000" />
<workItem from="1773194661618" duration="347000" />
</task> </task>
<task id="LOCAL-00202" summary="feat:增加获取作文比赛相关信息的接口"> <task id="LOCAL-00202" summary="feat:增加获取作文比赛相关信息的接口">
<created>1749709483285</created> <created>1749709483285</created>