Commit 3bfe9e4e authored by 华润's avatar 华润

giao

parent bea980ff
...@@ -19,7 +19,12 @@ ...@@ -19,7 +19,12 @@
<select /> <select />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="4acbf346-4d79-4465-9b1e-e87a13e70092" name="Default Changelist" comment="删除没用的文件" /> <list default="true" id="4acbf346-4d79-4465-9b1e-e87a13e70092" name="Default Changelist" comment="删除没用的文件">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/renren-fast.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/renren-fast.jar.original" afterDir="false" />
</list>
<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" />
...@@ -39,11 +44,14 @@ ...@@ -39,11 +44,14 @@
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="MavenImportPreferences">
<option name="x" value="74" /> <option name="generalSettings">
<option name="y" value="65" /> <MavenGeneralSettings>
<option name="width" value="1400" /> <option name="localRepository" value="D:\maven\repository" />
<option name="height" value="820" /> <option name="mavenHome" value="$PROJECT_DIR$/../../apache-maven-3.6.0" />
<option name="userSettingsFile" value="D:\apache-maven-3.6.0\conf\settings.xml" />
</MavenGeneralSettings>
</option>
</component> </component>
<component name="ProjectId" id="1qHABDu8I0frYlqn3jUJGcGezUT" /> <component name="ProjectId" id="1qHABDu8I0frYlqn3jUJGcGezUT" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
...@@ -64,6 +72,7 @@ ...@@ -64,6 +72,7 @@
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <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_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="MavenSettings" />
</component> </component>
<component name="ReactorSettings"> <component name="ReactorSettings">
<option name="notificationShown" value="true" /> <option name="notificationShown" value="true" />
...@@ -99,7 +108,11 @@ ...@@ -99,7 +108,11 @@
<workItem from="1574230363703" duration="589000" /> <workItem from="1574230363703" duration="589000" />
<workItem from="1581049581020" duration="1241000" /> <workItem from="1581049581020" duration="1241000" />
<workItem from="1581051212548" duration="88000" /> <workItem from="1581051212548" duration="88000" />
<workItem from="1616726005267" duration="677000" /> <workItem from="1616726005267" duration="2449000" />
<workItem from="1616748310471" duration="526000" />
<workItem from="1617173944628" duration="252000" />
<workItem from="1617174300951" duration="377000" />
<workItem from="1617176711578" duration="62000" />
</task> </task>
<task id="LOCAL-00001" summary="删除没用的文件"> <task id="LOCAL-00001" summary="删除没用的文件">
<created>1616726371362</created> <created>1616726371362</created>
...@@ -115,7 +128,14 @@ ...@@ -115,7 +128,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1616726604107</updated> <updated>1616726604107</updated>
</task> </task>
<option name="localTasksCounter" value="3" /> <task id="LOCAL-00003" summary="删除没用的文件">
<created>1616726884707</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1616726884707</updated>
</task>
<option name="localTasksCounter" value="4" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -149,6 +169,11 @@ ...@@ -149,6 +169,11 @@
</State> </State>
</value> </value>
</entry> </entry>
<entry key="MAIN">
<value>
<State />
</value>
</entry>
</map> </map>
</option> </option>
<option name="OPEN_GENERIC_TABS"> <option name="OPEN_GENERIC_TABS">
...@@ -156,68 +181,73 @@ ...@@ -156,68 +181,73 @@
<entry key="1" value="TOOL_WINDOW" /> <entry key="1" value="TOOL_WINDOW" />
</map> </map>
</option> </option>
<option name="oldMeFiltersMigrated" value="true" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="删除没用的文件" /> <MESSAGE value="删除没用的文件" />
<option name="LAST_COMMIT_MESSAGE" value="删除没用的文件" /> <option name="LAST_COMMIT_MESSAGE" value="删除没用的文件" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="740" y="260" key="FileChooserDialogImpl" timestamp="1616726187314"> <state x="740" y="260" key="FileChooserDialogImpl" timestamp="1617174677049">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="740" y="260" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1617174677049" />
<state width="1877" height="190" key="GridCell.Tab.0.bottom" timestamp="1617176772750">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="740" y="260" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1616726187314" /> <state width="1877" height="190" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1617176772750" />
<state width="1877" height="348" key="GridCell.Tab.0.bottom" timestamp="1616726509917"> <state width="1877" height="190" key="GridCell.Tab.0.center" timestamp="1617176772750">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="348" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1616726509917" /> <state width="1877" height="190" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1617176772750" />
<state width="1877" height="348" key="GridCell.Tab.0.center" timestamp="1616726509917"> <state width="1877" height="190" key="GridCell.Tab.0.left" timestamp="1617176772750">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="348" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1616726509917" /> <state width="1877" height="190" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1617176772750" />
<state width="1877" height="348" key="GridCell.Tab.0.left" timestamp="1616726509917"> <state width="1877" height="190" key="GridCell.Tab.0.right" timestamp="1617176772750">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="348" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1616726509917" /> <state width="1877" height="190" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1617176772750" />
<state width="1877" height="348" key="GridCell.Tab.0.right" timestamp="1616726509917"> <state width="1877" height="190" key="GridCell.Tab.1.bottom" timestamp="1617176772750">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="348" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1616726509917" /> <state width="1877" height="190" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1617176772750" />
<state width="1877" height="348" key="GridCell.Tab.1.bottom" timestamp="1616726509917"> <state width="1877" height="190" key="GridCell.Tab.1.center" timestamp="1617176772750">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="348" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1616726509917" /> <state width="1877" height="190" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1617176772750" />
<state width="1877" height="348" key="GridCell.Tab.1.center" timestamp="1616726509917"> <state width="1877" height="190" key="GridCell.Tab.1.left" timestamp="1617176772750">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="348" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1616726509917" /> <state width="1877" height="190" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1617176772750" />
<state width="1877" height="348" key="GridCell.Tab.1.left" timestamp="1616726509917"> <state width="1877" height="190" key="GridCell.Tab.1.right" timestamp="1617176772750">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="348" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1616726509917" /> <state width="1877" height="190" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1617176772750" />
<state width="1877" height="348" key="GridCell.Tab.1.right" timestamp="1616726509917"> <state width="1877" height="190" key="GridCell.Tab.2.bottom" timestamp="1617176772750">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="348" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1616726509917" /> <state width="1877" height="190" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1617176772750" />
<state width="1877" height="348" key="GridCell.Tab.2.bottom" timestamp="1616726509917"> <state width="1877" height="190" key="GridCell.Tab.2.center" timestamp="1617176772750">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="348" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1616726509917" /> <state width="1877" height="190" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1617176772750" />
<state width="1877" height="348" key="GridCell.Tab.2.center" timestamp="1616726509917"> <state width="1877" height="190" key="GridCell.Tab.2.left" timestamp="1617176772750">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="348" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1616726509917" /> <state width="1877" height="190" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1617176772750" />
<state width="1877" height="348" key="GridCell.Tab.2.left" timestamp="1616726509917"> <state width="1877" height="190" key="GridCell.Tab.2.right" timestamp="1617176772750">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="348" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1616726509917" /> <state width="1877" height="190" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1617176772750" />
<state width="1877" height="348" key="GridCell.Tab.2.right" timestamp="1616726509917"> <state x="461" y="164" key="SettingsEditor" timestamp="1617176764131">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="348" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1616726509917" /> <state x="461" y="164" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1617176764131" />
<state x="552" y="252" key="Vcs.Push.Dialog.v2" timestamp="1616726607051"> <state x="552" y="252" key="Vcs.Push.Dialog.v2" timestamp="1616726887732">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="552" y="252" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1616726607051" /> <state x="552" y="252" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1616726887732" />
<state x="632" y="306" key="git4idea.merge.GitPullDialog" timestamp="1616726647994"> <state x="632" y="306" key="git4idea.merge.GitPullDialog" timestamp="1616726647994">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
......
D:\renren-fast\src\test\java\io\renren\JwtTest.java D:\gzkj\renren-fast\src\test\java\io\renren\RedisTest.java
D:\renren-fast\src\test\java\io\renren\RedisTest.java D:\gzkj\renren-fast\src\test\java\io\renren\DynamicDataSourceTest.java
D:\renren-fast\src\test\java\io\renren\DynamicDataSourceTest.java D:\gzkj\renren-fast\src\test\java\io\renren\service\DataSourceTestService.java
D:\renren-fast\src\test\java\io\renren\service\DataSourceTestService.java D:\gzkj\renren-fast\src\test\java\io\renren\JwtTest.java
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment