|
|
@@ -2,13 +2,7 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="980ddd15-b0f5-453d-b57f-9e0d36b01ada" name="Default" comment="">
|
|
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/eureka-server/target/classes/application.yml" afterPath="" />
|
|
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/eureka-server/target/classes/banner.txt" afterPath="" />
|
|
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/eureka-server/target/classes/com/usoftchina/smartschool/eureka/EurekaApplication.class" afterPath="" />
|
|
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/eureka-server/target/classes/com/usoftchina/smartschool/eureka/config/WebSecurityConfig.class" afterPath="" />
|
|
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/eureka-server/target/classes/logback-spring.xml" afterPath="" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/out/" />
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
@@ -126,7 +120,7 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
|
|
|
+ <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/README.md">
|
|
|
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
<state split_layout="SECOND">
|
|
|
@@ -139,21 +133,21 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/pom.xml">
|
|
|
+ <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/.gitignore">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="209">
|
|
|
- <caret line="11" column="30" lean-forward="false" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="30" />
|
|
|
+ <state relative-caret-position="76">
|
|
|
+ <caret line="4" column="22" lean-forward="false" selection-start-line="4" selection-start-column="16" selection-end-line="4" selection-end-column="22" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/application.yml">
|
|
|
+ <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="342">
|
|
|
- <caret line="18" column="9" lean-forward="false" selection-start-line="18" selection-start-column="9" selection-end-line="18" selection-end-column="9" />
|
|
|
+ <state relative-caret-position="209">
|
|
|
+ <caret line="11" column="30" lean-forward="false" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="30" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
@@ -871,7 +865,7 @@
|
|
|
<updated>1547624293267</updated>
|
|
|
<workItem from="1547624296253" duration="4914000" />
|
|
|
<workItem from="1547630177539" duration="12661000" />
|
|
|
- <workItem from="1547685937807" duration="857000" />
|
|
|
+ <workItem from="1547685937807" duration="1100000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="删除编译文件">
|
|
|
<created>1547633261163</created>
|
|
|
@@ -915,11 +909,18 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1547646691913</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="7" />
|
|
|
+ <task id="LOCAL-00007" summary="README文档">
|
|
|
+ <created>1547686828687</created>
|
|
|
+ <option name="number" value="00007" />
|
|
|
+ <option name="presentableId" value="LOCAL-00007" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1547686828687</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="8" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="18432000" />
|
|
|
+ <option name="totallyTimeSpent" value="18675000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
|
|
|
@@ -933,9 +934,9 @@
|
|
|
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.57990116" sideWeight="0.81240547" order="11" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42339373" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47116968" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5930807" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.46952224" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Designer" 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="3" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.08850227" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2549168" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25340393" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
|
@@ -1000,20 +1001,14 @@
|
|
|
<MESSAGE value="git忽略配置文件" />
|
|
|
<MESSAGE value="docker file配置文件" />
|
|
|
<MESSAGE value="初始化" />
|
|
|
- <option name="LAST_COMMIT_MESSAGE" value="初始化" />
|
|
|
+ <MESSAGE value="README文档" />
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="README文档" />
|
|
|
</component>
|
|
|
<component name="XDebuggerManager">
|
|
|
<breakpoint-manager />
|
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/java/com/usoftchina/smartschool/file/controller/FileController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="151">
|
|
|
- <caret line="48" column="14" lean-forward="false" selection-start-line="48" selection-start-column="14" selection-end-line="48" selection-end-column="14" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/java/com/usoftchina/smartschool/eureka/config/WebSecurityConfig.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="62">
|
|
|
@@ -1404,6 +1399,14 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/.gitignore">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="76">
|
|
|
+ <caret line="4" column="22" lean-forward="false" selection-start-line="4" selection-start-column="16" selection-end-line="4" selection-end-column="22" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
</component>
|
|
|
<component name="masterDetails">
|
|
|
<states>
|