合并远程 Qian 分支更新，解决.idea/workspace.xml 文件冲突

.idea/workspace.xml

@@ -1,59 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
+This XML file does not appear to have any style information associated with it. The document tree is shown below.
 <project version="4">
   <component name="AutoImportSettings">
     <option name="autoReloadType" value="ALL"/>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="a7505764-040b-48e2-b2fc-8c5b579e595f" name="Default" comment="1.环境搭建完成&#10;2.相关的工具类编写完成&#10;3.配置文件管理类编写完成">
+    <list default="true" id="a7505764-040b-48e2-b2fc-8c5b579e595f" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false"/>
+      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.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/cn/edu/hust/domain/SessionAggrStat.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/edu/hust/domain/SessionAggrStat.java" afterDir="false"/>
+      <change beforePath="$PROJECT_DIR$/src/main/java/cn/edu/hust/domain/SessionDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/edu/hust/domain/SessionDetail.java" afterDir="false"/>
+      <change beforePath="$PROJECT_DIR$/src/main/java/cn/edu/hust/domain/SessionRandomExtract.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/edu/hust/domain/SessionRandomExtract.java" afterDir="false"/>
+      <change beforePath="$PROJECT_DIR$/src/main/java/cn/edu/hust/domain/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/edu/hust/domain/Task.java" afterDir="false"/>
+      <change beforePath="$PROJECT_DIR$/src/main/java/cn/edu/hust/domain/Top10Category.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/edu/hust/domain/Top10Category.java" afterDir="false"/>
+      <change beforePath="$PROJECT_DIR$/src/main/java/cn/edu/hust/domain/Top10CategorySession.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/edu/hust/domain/Top10CategorySession.java" afterDir="false"/>
     </list>
     <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="CodeInsightWorkspaceSettings">
-    <option name="optimizeImportsOnTheFly" value="true" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="UserVisitAnalyze.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-377">
-              <caret line="972" column="29" lean-forward="false" selection-start-line="972" selection-start-column="29" selection-end-line="972" selection-end-column="29" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="MockData.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/cn/edu/hust/mockData/MockData.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1482">
-              <caret line="93" column="50" lean-forward="false" selection-start-line="93" selection-start-column="50" selection-end-line="93" selection-end-column="50" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="FIRST">
-              <first_editor relative-caret-position="703">
-                <caret line="448" column="0" lean-forward="false" selection-start-line="448" selection-start-column="0" selection-end-line="448" selection-end-column="0" />
-                <folding />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
@@ -142,8 +108,12 @@
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
-  <component name="MarkdownSettingsMigration">
+  <component name="MavenImportPreferences">
-    <option name="stateVersion" value="1" />
+    <option name="generalSettings">
+      <MavenGeneralSettings>
+        <option name="pluginUpdatePolicy" value="UPDATE"/>
+      </MavenGeneralSettings>
+    </option>
   </component>
   <component name="MavenRunner">
     <option name="jreName" value="#JAVA_INTERNAL"/>
@@ -154,7 +124,7 @@
     <option name="width" value="1440"/>
     <option name="height" value="873"/>
   </component>
-  <component name="ProjectId" id="2qIGAjeCDkRtAhv84xlx4MKRgUe" />
+  <component name="ProjectId" id="2qO7KjwHuykNsd7iKBmSmBKHPRX"/>
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
       <profile-state>
@@ -280,6 +250,20 @@
     <option name="hideEmptyMiddlePackages" value="true"/>
     <option name="showLibraryContents" value="true"/>
   </component>
+  <component name="PropertiesComponent">
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true"/>
+    <property name="SearchEverywhereHistoryKey" value="wor FILE file:///Users/youyujie/Documents/UserActionAnalyzePlatform/.idea/libraries/Maven__org_apache_curator_curator_framework_2_4_0.xml"/>
+    <property name="WebServerToolWindowFactoryState" value="false"/>
+    <property name="aspect.path.notification.shown" value="true"/>
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../rj/javac"/>
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path"/>
+    <property name="nodejs_npm_path_reset_for_default_project" value="true"/>
+    <property name="nodejs_package_manager_path" value="npm"/>
+    <property name="project.structure.last.edited" value="Modules"/>
+    <property name="project.structure.proportion" value="0.15"/>
+    <property name="project.structure.side.proportion" value="0.2"/>
+    <property name="settings.editor.selected.configurable" value="MavenSettings"/>
+  </component>
   <component name="RecentsManager">
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
       <recent name="cn.edu.hust.dao"/>
@@ -290,7 +274,7 @@
       <recent name="$PROJECT_DIR$/src/main/java/cn/edu/hust/until"/>
     </key>
   </component>
-  <component name="RunManager" selected="JUnit.ParamUtilsTest.test2">
+  <component name="RunManager" selected="Application.UserVisitAnalyze">
     <configuration default="true" type="Applet" factoryName="Applet">
       <option name="HTML_USED" value="false"/>
       <option name="WIDTH" value="400"/>
@@ -420,21 +404,15 @@
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.ParamUtilsTest.test2" />
+        <item itemvalue="Application.UserVisitAnalyze"/>
         <item itemvalue="JUnit.SessionRandomExtractDaoTest.testBatchInsert"/>
         <item itemvalue="JUnit.SessionDetailTest.testInsert"/>
         <item itemvalue="JUnit.SessionAggrDao.test"/>
+        <item itemvalue="JUnit.ParamUtilsTest.test2"/>
       </list>
     </recent_temporary>
   </component>
-  <component name="SharedIndexes">
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true"/>
-    <attachedChunks>
-      <set>
-        <option value="jdk-13.0.14-azul-13.0.14-4caba194b151-0dc6e15b" />
-      </set>
-    </attachedChunks>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
     <configuration/>
   </component>
@@ -454,211 +432,25 @@
       <workItem from="1529845795654" duration="7752000"/>
       <workItem from="1529887211212" duration="6851000"/>
       <workItem from="1529994772485" duration="146000"/>
-      <workItem from="1734342536419" duration="3626000" />
+      <workItem from="1734521707999" duration="1182000"/>
-      <workItem from="1734346716326" duration="2420000" />
+      <workItem from="1734523500859" duration="531000"/>
-      <workItem from="1734349398416" duration="1738000" />
+      <workItem from="1734524054816" duration="200000"/>
-      <workItem from="1734352550638" duration="1153000" />
-      <workItem from="1734354068325" duration="860000" />
-      <workItem from="1734354940766" duration="9337000" />
-      <workItem from="1734364968190" duration="929000" />
-      <workItem from="1734365941294" duration="2674000" />
-      <workItem from="1734368738786" duration="983000" />
-      <workItem from="1734369961357" duration="171000" />
-      <workItem from="1734370148794" duration="42000" />
-      <workItem from="1734370421400" duration="115000" />
-      <workItem from="1734370647014" duration="90000" />
     </task>
-    <task id="LOCAL-00001" summary="1.环境搭建完成&#10;2.相关的工具类编写完成&#10;3.配置文件管理类编写完成">
+    <task id="LOCAL-00001" summary="1.环境搭建完成 2.相关的工具类编写完成 3.配置文件管理类编写完成">
       <created>1529592741848</created>
       <option name="number" value="00001"/>
       <option name="presentableId" value="LOCAL-00001"/>
       <option name="project" value="LOCAL"/>
       <updated>1529592741849</updated>
     </task>
-    <task id="LOCAL-00002" summary="1.环境搭建完成&#10;2.相关的工具类编写完成&#10;3.配置文件管理类编写完成">
+    <task id="LOCAL-00002" summary="1.环境搭建完成 2.相关的工具类编写完成 3.配置文件管理类编写完成">
       <created>1529593229553</created>
       <option name="number" value="00002"/>
       <option name="presentableId" value="LOCAL-00002"/>
       <option name="project" value="LOCAL"/>
       <updated>1529593229553</updated>
     </task>
-    <task id="LOCAL-00003" summary="1.环境搭建完成&#10;2.相关的工具类编写完成111&#10;3.配置文件管理类编写完成">
+    <option name="localTasksCounter" value="3"/>
-      <option name="closed" value="true" />
-      <created>1734351693404</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1734351693404</updated>
-    </task>
-    <task id="LOCAL-00004" summary="1.环境搭建完成&#10;2.相关的工具类编写完成111&#10;3.配置文件管理类编写完成111">
-      <option name="closed" value="true" />
-      <created>1734352975106</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1734352975106</updated>
-    </task>
-    <task id="LOCAL-00005" summary="1.环境搭建完成&#10;2.相关的工具类编写完成111&#10;3.配置文件管理类编写完成111">
-      <option name="closed" value="true" />
-      <created>1734353193141</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1734353193141</updated>
-    </task>
-    <task id="LOCAL-00006" summary="1.环境搭建完成&#10;2.相关的工具类编写完成111&#10;3.配置文件管理类编写完成1111">
-      <option name="closed" value="true" />
-      <created>1734353269426</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1734353269426</updated>
-    </task>
-    <task id="LOCAL-00007" summary="1.环境搭建完成&#10;2.相关的工具类编写完成&#10;3.配置文件管理类编写完成">
-      <option name="closed" value="true" />
-      <created>1734354775314</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1734354775314</updated>
-    </task>
-    <task id="LOCAL-00008" summary="1.环境搭建完成&#10;2.相关的工具类编写完成11&#10;3.配置文件管理类编写完成11">
-      <option name="closed" value="true" />
-      <created>1734354900465</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1734354900465</updated>
-    </task>
-    <task id="LOCAL-00009" summary="1.环境搭建完成&#10;2.相关的工具类编写完成11&#10;3.配置文件管理类编写完成11">
-      <option name="closed" value="true" />
-      <created>1734354969705</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1734354969705</updated>
-    </task>
-    <task id="LOCAL-00010" summary="1.环境搭建完成11&#10;2.相关的工具类编写完成11&#10;3.配置文件管理类编写完成11">
-      <option name="closed" value="true" />
-      <created>1734357525655</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1734357525655</updated>
-    </task>
-    <task id="LOCAL-00011" summary="1.环境搭建完成1&#10;2.相关的工具类编写完成1&#10;3.配置文件管理类编写完成1">
-      <option name="closed" value="true" />
-      <created>1734358371283</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1734358371283</updated>
-    </task>
-    <task id="LOCAL-00012" summary="1.环境搭建完成11&#10;2.相关的工具类编写完成1&#10;3.配置文件管理类编写完成1">
-      <option name="closed" value="true" />
-      <created>1734360173676</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1734360173676</updated>
-    </task>
-    <task id="LOCAL-00013" summary="1.环境搭建完成11&#10;2.相关的工具类编写完成11&#10;3.配置文件管理类编写完成11">
-      <option name="closed" value="true" />
-      <created>1734362412393</created>
-      <option name="number" value="00013" />
-      <option name="presentableId" value="LOCAL-00013" />
-      <option name="project" value="LOCAL" />
-      <updated>1734362412393</updated>
-    </task>
-    <task id="LOCAL-00014" summary="1.环境搭建完成&#10;2.相关的工具类编写完成&#10;3.配置文件管理类编写完成">
-      <option name="closed" value="true" />
-      <created>1734363163041</created>
-      <option name="number" value="00014" />
-      <option name="presentableId" value="LOCAL-00014" />
-      <option name="project" value="LOCAL" />
-      <updated>1734363163041</updated>
-    </task>
-    <task id="LOCAL-00015" summary="1.环境搭建完成&#10;2.相关的工具类编写完成&#10;3.配置文件管理类编写完成11">
-      <option name="closed" value="true" />
-      <created>1734363388179</created>
-      <option name="number" value="00015" />
-      <option name="presentableId" value="LOCAL-00015" />
-      <option name="project" value="LOCAL" />
-      <updated>1734363388179</updated>
-    </task>
-    <task id="LOCAL-00016" summary="1.环境搭建完成11&#10;2.相关的工具类编写完成11&#10;3.配置文件管理类编写完成11">
-      <option name="closed" value="true" />
-      <created>1734365844392</created>
-      <option name="number" value="00016" />
-      <option name="presentableId" value="LOCAL-00016" />
-      <option name="project" value="LOCAL" />
-      <updated>1734365844392</updated>
-    </task>
-    <task id="LOCAL-00017" summary="1.环境搭建完成&#10;2.相关的工具类编写完成&#10;3.配置文件管理类编写完成">
-      <option name="closed" value="true" />
-      <created>1734368636062</created>
-      <option name="number" value="00017" />
-      <option name="presentableId" value="LOCAL-00017" />
-      <option name="project" value="LOCAL" />
-      <updated>1734368636062</updated>
-    </task>
-    <task id="LOCAL-00018" summary="1.环境搭建完成&#10;2.相关的工具类编写完成&#10;3.配置文件管理类编写完成1">
-      <option name="closed" value="true" />
-      <created>1734369061766</created>
-      <option name="number" value="00018" />
-      <option name="presentableId" value="LOCAL-00018" />
-      <option name="project" value="LOCAL" />
-      <updated>1734369061766</updated>
-    </task>
-    <task id="LOCAL-00019" summary="1.环境搭建完成&#10;2.相关的工具类编写完成&#10;3.配置文件管理类编写完成1">
-      <option name="closed" value="true" />
-      <created>1734369482371</created>
-      <option name="number" value="00019" />
-      <option name="presentableId" value="LOCAL-00019" />
-      <option name="project" value="LOCAL" />
-      <updated>1734369482371</updated>
-    </task>
-    <task id="LOCAL-00020" summary="1.环境搭建完成&#10;2.相关的工具类编写完成11&#10;3.配置文件管理类编写完成1">
-      <option name="closed" value="true" />
-      <created>1734370121454</created>
-      <option name="number" value="00020" />
-      <option name="presentableId" value="LOCAL-00020" />
-      <option name="project" value="LOCAL" />
-      <updated>1734370121454</updated>
-    </task>
-    <task id="LOCAL-00021" summary="1.环境搭建完成&#10;2.相关的工具类编写完成&#10;3.配置文件管理类编写完成">
-      <option name="closed" value="true" />
-      <created>1734370179773</created>
-      <option name="number" value="00021" />
-      <option name="presentableId" value="LOCAL-00021" />
-      <option name="project" value="LOCAL" />
-      <updated>1734370179773</updated>
-    </task>
-    <task id="LOCAL-00022" summary="1.环境搭建完成&#10;2.相关的工具类编写完成&#10;3.配置文件管理类编写完成">
-      <option name="closed" value="true" />
-      <created>1734370518519</created>
-      <option name="number" value="00022" />
-      <option name="presentableId" value="LOCAL-00022" />
-      <option name="project" value="LOCAL" />
-      <updated>1734370518519</updated>
-    </task>
-    <task id="LOCAL-00023" summary="1.环境搭建完成&#10;2.相关的工具类编写完成&#10;3.配置文件管理类编写完成">
-      <option name="closed" value="true" />
-      <created>1734370728253</created>
-      <option name="number" value="00023" />
-      <option name="presentableId" value="LOCAL-00023" />
-      <option name="project" value="LOCAL" />
-      <updated>1734370728253</updated>
-    </task>
-    <task id="LOCAL-00024" summary="1.环境搭建完成&#10;2.相关的工具类编写完成&#10;3.配置文件管理类编写完成">
-      <option name="closed" value="true" />
-      <created>1734521347549</created>
-      <option name="number" value="00024" />
-      <option name="presentableId" value="LOCAL-00024" />
-      <option name="project" value="LOCAL" />
-      <updated>1734521347549</updated>
-    </task>
-    <option name="localTasksCounter" value="25" />
     <servers/>
   </component>
   <component name="TestHistory">
@@ -702,7 +494,7 @@
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs"/>
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs"/>
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette " active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs"/>
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs"/>
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs"/>
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs"/>
@@ -746,7 +538,7 @@
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs"/>
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs"/>
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs"/>
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette " active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs"/>
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs"/>
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs"/>
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs"/>
@@ -773,20 +565,11 @@
         </entry>
       </map>
     </option>
+    <option name="oldMeFiltersMigrated" value="true"/>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="1.环境搭建完成&#10;2.相关的工具类编写完成111&#10;3.配置文件管理类编写完成" />
+    <MESSAGE value="1.环境搭建完成 2.相关的工具类编写完成 3.配置文件管理类编写完成"/>
-    <MESSAGE value="1.环境搭建完成&#10;2.相关的工具类编写完成111&#10;3.配置文件管理类编写完成111" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.环境搭建完成 2.相关的工具类编写完成 3.配置文件管理类编写完成"/>
-    <MESSAGE value="1.环境搭建完成&#10;2.相关的工具类编写完成111&#10;3.配置文件管理类编写完成1111" />
-    <MESSAGE value="1.环境搭建完成&#10;2.相关的工具类编写完成11&#10;3.配置文件管理类编写完成11" />
-    <MESSAGE value="1.环境搭建完成1&#10;2.相关的工具类编写完成1&#10;3.配置文件管理类编写完成1" />
-    <MESSAGE value="1.环境搭建完成11&#10;2.相关的工具类编写完成1&#10;3.配置文件管理类编写完成1" />
-    <MESSAGE value="1.环境搭建完成&#10;2.相关的工具类编写完成&#10;3.配置文件管理类编写完成11" />
-    <MESSAGE value="1.环境搭建完成11&#10;2.相关的工具类编写完成11&#10;3.配置文件管理类编写完成11" />
-    <MESSAGE value="1.环境搭建完成&#10;2.相关的工具类编写完成&#10;3.配置文件管理类编写完成1" />
-    <MESSAGE value="1.环境搭建完成&#10;2.相关的工具类编写完成11&#10;3.配置文件管理类编写完成1" />
-    <MESSAGE value="1.环境搭建完成&#10;2.相关的工具类编写完成&#10;3.配置文件管理类编写完成" />
-    <option name="LAST_COMMIT_MESSAGE" value="1.环境搭建完成&#10;2.相关的工具类编写完成&#10;3.配置文件管理类编写完成" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/main/java/cn/edu/hust/conf/ConfigurationManager.java">