|
@@ -4,7 +4,9 @@
|
|
|
<bookmark url="file://$PROJECT_DIR$/src/main/java/com/duowan/texiu/data/migration/script/BatchUploadStaticResourceWorker.java" line="64" mnemonic="1" />
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="7f86fa79-2437-4921-b8e2-a447fb3bb97d" name="Default Changelist" comment="" />
|
|
|
+ <list default="true" id="7f86fa79-2437-4921-b8e2-a447fb3bb97d" name="Default Changelist" comment="">
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
+ </list>
|
|
|
<ignored path="$PROJECT_DIR$/out/" />
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
@@ -22,7 +24,7 @@
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/duowan/texiu/data/migration/script/BatchUploadStaticResourceWorker.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="1615">
|
|
|
- <caret line="188" column="37" lean-forward="true" selection-start-line="188" selection-start-column="37" selection-end-line="188" selection-end-column="37" />
|
|
|
+ <caret line="188" column="37" selection-start-line="188" selection-start-column="37" selection-end-line="188" selection-end-column="37" />
|
|
|
<folding>
|
|
|
<element signature="imports" expanded="true" />
|
|
|
<element signature="method#handleTemplateUrl#0;class#BatchUploadStaticResourceWorker#0" />
|
|
@@ -40,11 +42,11 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/duowan/texiu/data/migration/script/base/BaseTaskWorker.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="517">
|
|
|
- <caret line="88" column="35" lean-forward="true" selection-start-line="88" selection-start-column="35" selection-end-line="88" selection-end-column="35" />
|
|
|
+ <caret line="88" column="35" selection-start-line="88" selection-start-column="35" selection-end-line="88" selection-end-column="35" />
|
|
|
<folding>
|
|
|
<element signature="imports" expanded="true" />
|
|
|
</folding>
|
|
@@ -52,11 +54,20 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/pom.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="629">
|
|
|
+ <caret line="37" selection-start-line="37" selection-end-line="37" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/db-config/hiyd_cms.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="476">
|
|
|
- <caret line="28" column="36" lean-forward="true" selection-start-line="28" selection-start-column="36" selection-end-line="28" selection-end-column="36" />
|
|
|
+ <caret line="28" column="36" selection-start-line="28" selection-start-column="36" selection-end-line="28" selection-end-column="36" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -77,7 +88,7 @@
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/duowan/texiu/data/migration/tools/UploadApiResult.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="687">
|
|
|
- <caret line="68" column="38" lean-forward="true" selection-start-line="68" selection-start-column="38" selection-end-line="68" selection-end-column="38" />
|
|
|
+ <caret line="68" column="38" selection-start-line="68" selection-start-column="38" selection-end-line="68" selection-end-column="38" />
|
|
|
<folding>
|
|
|
<element signature="imports" expanded="true" />
|
|
|
<element signature="e#415#416#0" expanded="true" />
|
|
@@ -137,15 +148,6 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/duowan/texiu/data/migration/tools/Constants.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="187">
|
|
|
- <caret line="11" column="47" selection-start-line="11" selection-start-column="38" selection-end-line="11" selection-end-column="47" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
</leaf>
|
|
|
</component>
|
|
|
<component name="FileTemplateManagerImpl">
|
|
@@ -191,6 +193,7 @@
|
|
|
</component>
|
|
|
<component name="Git.Settings">
|
|
|
<option name="ROOT_SYNC" value="DONT_SYNC" />
|
|
|
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
</component>
|
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
@@ -278,11 +281,19 @@
|
|
|
<select />
|
|
|
</treeState>
|
|
|
</component>
|
|
|
+ <component name="ProjectConfigurationFiles">
|
|
|
+ <option name="files">
|
|
|
+ <list>
|
|
|
+ <option value="$PROJECT_DIR$/.idea/vcs.xml" />
|
|
|
+ </list>
|
|
|
+ </option>
|
|
|
+ </component>
|
|
|
<component name="ProjectFrameBounds" extendedState="6">
|
|
|
<option name="x" value="528" />
|
|
|
<option name="width" value="1400" />
|
|
|
<option name="height" value="1000" />
|
|
|
</component>
|
|
|
+ <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
|
<component name="ProjectView">
|
|
|
<navigator proportions="" version="1">
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
@@ -295,102 +306,6 @@
|
|
|
<item name="texiu-data-migration" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="texiu-data-migration" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
- <path>
|
|
|
- <item name="texiu-data-migration" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="texiu-data-migration" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="texiu-data-migration" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="texiu-data-migration" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="texiu-data-migration" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="texiu-data-migration" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="texiu-data-migration" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="texiu-data-migration" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="com" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="texiu-data-migration" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="texiu-data-migration" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="com" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="duowan" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="texiu-data-migration" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="texiu-data-migration" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="com" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="duowan" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="texiu" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="texiu-data-migration" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="texiu-data-migration" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="com" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="duowan" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="texiu" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="data" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="texiu-data-migration" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="texiu-data-migration" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="com" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="duowan" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="texiu" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="data" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="migration" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="texiu-data-migration" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="texiu-data-migration" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="com" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="duowan" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="texiu" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="data" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="migration" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="script" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="texiu-data-migration" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="texiu-data-migration" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="resources" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="texiu-data-migration" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="texiu-data-migration" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="resources" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="db-config" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</subPane>
|
|
@@ -400,9 +315,10 @@
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
|
|
+ <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
<property name="aspect.path.notification.shown" value="true" />
|
|
|
- <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/config/admin" />
|
|
|
+ <property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
|
<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" />
|
|
@@ -554,12 +470,12 @@
|
|
|
<workItem from="1574304000638" duration="8728000" />
|
|
|
<workItem from="1574388336553" duration="2689000" />
|
|
|
<workItem from="1574414855646" duration="10203000" />
|
|
|
- <workItem from="1574662095360" duration="53958000" />
|
|
|
+ <workItem from="1574662095360" duration="56153000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="362615000" />
|
|
|
+ <option name="totallyTimeSpent" value="364810000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -574,14 +490,14 @@
|
|
|
<window_info id="Favorites" order="6" side_tool="true" />
|
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
|
<window_info anchor="bottom" id="Find" order="1" weight="0.32900432" />
|
|
|
- <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49946696" weight="0.482684" />
|
|
|
+ <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49946696" weight="0.48212352" />
|
|
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.3538961" />
|
|
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
|
<window_info anchor="bottom" id="FindBugs-IDEA" order="7" weight="0.32900432" />
|
|
|
<window_info anchor="bottom" id="Spring" order="8" />
|
|
|
- <window_info anchor="bottom" id="Terminal" order="9" weight="0.32900432" />
|
|
|
+ <window_info anchor="bottom" id="Terminal" order="9" weight="0.32936078" />
|
|
|
<window_info anchor="bottom" id="Docker" order="10" show_stripe_button="false" />
|
|
|
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50053304" side_tool="true" weight="0.39718616" />
|
|
|
<window_info anchor="bottom" id="Messages" order="12" weight="0.32900432" />
|
|
@@ -1297,13 +1213,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/pom.xml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="682">
|
|
|
- <caret line="112" selection-start-line="112" selection-end-line="112" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/db-config/hiyd_home.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="654">
|
|
@@ -1379,14 +1288,14 @@
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/db-config/hiyd_cms.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="476">
|
|
|
- <caret line="28" column="36" lean-forward="true" selection-start-line="28" selection-start-column="36" selection-end-line="28" selection-end-column="36" />
|
|
|
+ <caret line="28" column="36" selection-start-line="28" selection-start-column="36" selection-end-line="28" selection-end-column="36" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/duowan/texiu/data/migration/tools/UploadApiResult.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="687">
|
|
|
- <caret line="68" column="38" lean-forward="true" selection-start-line="68" selection-start-column="38" selection-end-line="68" selection-end-column="38" />
|
|
|
+ <caret line="68" column="38" selection-start-line="68" selection-start-column="38" selection-end-line="68" selection-end-column="38" />
|
|
|
<folding>
|
|
|
<element signature="imports" expanded="true" />
|
|
|
<element signature="e#415#416#0" expanded="true" />
|
|
@@ -1415,7 +1324,7 @@
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/duowan/texiu/data/migration/script/BatchUploadStaticResourceWorker.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="1615">
|
|
|
- <caret line="188" column="37" lean-forward="true" selection-start-line="188" selection-start-column="37" selection-end-line="188" selection-end-column="37" />
|
|
|
+ <caret line="188" column="37" selection-start-line="188" selection-start-column="37" selection-end-line="188" selection-end-column="37" />
|
|
|
<folding>
|
|
|
<element signature="imports" expanded="true" />
|
|
|
<element signature="method#handleTemplateUrl#0;class#BatchUploadStaticResourceWorker#0" />
|
|
@@ -1426,13 +1335,20 @@
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/duowan/texiu/data/migration/script/base/BaseTaskWorker.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="517">
|
|
|
- <caret line="88" column="35" lean-forward="true" selection-start-line="88" selection-start-column="35" selection-end-line="88" selection-end-column="35" />
|
|
|
+ <caret line="88" column="35" selection-start-line="88" selection-start-column="35" selection-end-line="88" selection-end-column="35" />
|
|
|
<folding>
|
|
|
<element signature="imports" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/pom.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="629">
|
|
|
+ <caret line="37" selection-start-line="37" selection-end-line="37" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
</component>
|
|
|
<component name="masterDetails">
|
|
|
<states>
|