|
|
@@ -2,18 +2,12 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="980ddd15-b0f5-453d-b57f-9e0d36b01ada" name="Default" comment="">
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker-dev.yml" />
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker-prod.yml" />
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker-test.yml" />
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker.yml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/application-docker-prod.yml" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker-dev.yml" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker-prod.yml" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker-test.yml" afterPath="" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker.yml" afterPath="" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/applications/school/school-server/src/main/resources/config/application-docker-prod.yml" afterPath="$PROJECT_DIR$/applications/school/school-server/src/main/resources/config/application-docker-prod.yml" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/application.yml" afterPath="$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/application.yml" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/config/application-docker-prod.yml" afterPath="$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/config/application-docker-prod.yml" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/config/application-docker-prod.yml" afterPath="$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/config/application-docker-prod.yml" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/config/application-docker-prod.yml" afterPath="$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/config/application-docker-prod.yml" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/application.yml" afterPath="$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/application.yml" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/config/application-docker-prod.yml" afterPath="$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/config/application-docker-prod.yml" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/out/" />
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
@@ -61,101 +55,64 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
- <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/application.yml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="874">
|
|
|
- <caret line="55" column="103" lean-forward="true" selection-start-line="55" selection-start-column="88" selection-end-line="55" selection-end-column="103" />
|
|
|
- <folding />
|
|
|
+ <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="FIRST">
|
|
|
+ <first_editor relative-caret-position="114">
|
|
|
+ <caret line="6" column="49" lean-forward="true" selection-start-line="6" selection-start-column="49" selection-end-line="6" selection-end-column="49" />
|
|
|
+ <folding />
|
|
|
+ </first_editor>
|
|
|
+ <second_editor />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/application.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/application.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-1140">
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="application-dev.yml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/config/application-dev.yml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="0">
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <state relative-caret-position="1403">
|
|
|
+ <caret line="135" column="25" lean-forward="false" selection-start-line="135" selection-start-column="25" selection-end-line="135" selection-end-column="25" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="application-docker-prod.yml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="0">
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="20" selection-end-column="14" />
|
|
|
+ <state relative-caret-position="114">
|
|
|
+ <caret line="6" column="126" lean-forward="false" selection-start-line="6" selection-start-column="126" selection-end-line="6" selection-end-column="126" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/application.yml">
|
|
|
+ <file leaf-file-name="Dockerfile" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/docker/Dockerfile">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="258">
|
|
|
- <caret line="37" column="23" lean-forward="false" selection-start-line="37" selection-start-column="23" selection-end-line="37" selection-end-column="23" />
|
|
|
+ <state relative-caret-position="38">
|
|
|
+ <caret line="2" column="17" lean-forward="false" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="17" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="application-dev.yml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/config/application-dev.yml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="0">
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="application-docker.yml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/config/application-docker.yml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="0">
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="9" selection-end-column="24" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="application-docker-prod.yml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
+ <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">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="0">
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="20" selection-end-column="14" />
|
|
|
+ <state relative-caret-position="475">
|
|
|
+ <caret line="25" column="9" lean-forward="true" selection-start-line="25" selection-start-column="9" selection-end-line="25" selection-end-column="9" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="application-docker-prod.yml" pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/school/school-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="353">
|
|
|
- <caret line="20" column="14" lean-forward="false" selection-start-line="20" selection-start-column="14" selection-end-line="20" selection-end-column="14" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="application-docker-prod.yml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="171">
|
|
|
- <caret line="9" column="25" lean-forward="false" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
|
|
|
+ <state relative-caret-position="38">
|
|
|
+ <caret line="2" column="38" lean-forward="false" selection-start-line="2" selection-start-column="38" selection-end-line="2" selection-end-column="38" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
@@ -204,7 +161,6 @@
|
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
- <option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/java/com/usoftchina/smartschool/file/service/impl/FileInfoServiceImpl.java" />
|
|
|
<option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/java/com/usoftchina/smartschool/file/util/FileTypeUtils.java" />
|
|
|
<option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/java/com/usoftchina/smartschool/file/po/FileInfo.java" />
|
|
|
<option value="$PROJECT_DIR$/applications/wechat/wechat-api/pom.xml" />
|
|
|
@@ -255,6 +211,7 @@
|
|
|
<option value="$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/config/application-docker-prod.yml" />
|
|
|
<option value="$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/application.yml" />
|
|
|
<option value="$PROJECT_DIR$/applications/school/school-server/src/main/resources/config/application-docker-prod.yml" />
|
|
|
+ <option value="$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/application-docker-prod.yml" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -512,22 +469,90 @@
|
|
|
<item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="base-servers" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="sms" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="eureka-server" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="base-servers" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="sms" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="eureka-server" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="base-servers" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="sms" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="eureka-server" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="base-servers" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="eureka-server" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="docker" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="base-servers" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="eureka-server" 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="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="base-servers" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="eureka-server" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="config" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="base-servers" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="gateway-server" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="base-servers" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="gateway-server" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="base-servers" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="gateway-server" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="base-servers" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="gateway-server" 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="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="base-servers" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="gateway-server" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="config" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
@@ -739,7 +764,7 @@
|
|
|
<workItem from="1547624296253" duration="4914000" />
|
|
|
<workItem from="1547630177539" duration="12661000" />
|
|
|
<workItem from="1547685937807" duration="1100000" />
|
|
|
- <workItem from="1547688698570" duration="2557000" />
|
|
|
+ <workItem from="1547688698570" duration="4335000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="删除编译文件">
|
|
|
<created>1547633261163</created>
|
|
|
@@ -797,15 +822,21 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1547688741338</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="9" />
|
|
|
+ <task id="LOCAL-00009" summary="prod配置文件修改">
|
|
|
+ <created>1547692966833</created>
|
|
|
+ <option name="number" value="00009" />
|
|
|
+ <option name="presentableId" value="LOCAL-00009" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1547692966833</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="10" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="21457000" />
|
|
|
+ <option name="totallyTimeSpent" value="23235000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
|
|
|
- <editor active="true" />
|
|
|
<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.3294893" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
|
|
|
@@ -816,9 +847,9 @@
|
|
|
<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="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="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.50082374" sideWeight="0.5" order="13" 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.50247115" 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.2473525" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2473525" 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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.38879737" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
|
@@ -919,20 +950,14 @@
|
|
|
<MESSAGE value="docker file配置文件" />
|
|
|
<MESSAGE value="初始化" />
|
|
|
<MESSAGE value="README文档" />
|
|
|
- <option name="LAST_COMMIT_MESSAGE" value="README文档" />
|
|
|
+ <MESSAGE value="prod配置文件修改" />
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="prod配置文件修改" />
|
|
|
</component>
|
|
|
<component name="XDebuggerManager">
|
|
|
<breakpoint-manager />
|
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/docker/Dockerfile">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="38">
|
|
|
- <caret line="2" column="10" lean-forward="false" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="209">
|
|
|
@@ -957,13 +982,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/docker/Dockerfile">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="95">
|
|
|
- <caret line="5" column="16" lean-forward="false" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/base-servers/gateway-server/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="209">
|
|
|
@@ -1020,17 +1038,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <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="106">
|
|
|
- <caret line="102" column="56" lean-forward="false" selection-start-line="102" selection-start-column="56" selection-end-line="102" selection-end-column="56" />
|
|
|
- <folding />
|
|
|
- </first_editor>
|
|
|
- <second_editor />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/applications/school/school-server/src/main/resources/application.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="115">
|
|
|
@@ -1199,14 +1206,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker.yml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="0">
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker-dev.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
|
|
@@ -1223,30 +1222,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/application.yml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="475">
|
|
|
- <caret line="25" column="9" lean-forward="true" selection-start-line="25" selection-start-column="9" selection-end-line="25" selection-end-column="9" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/application.yml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="384">
|
|
|
- <caret line="135" column="25" lean-forward="false" selection-start-line="135" selection-start-column="25" selection-end-line="135" selection-end-column="25" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="114">
|
|
|
- <caret line="6" column="126" lean-forward="false" selection-start-line="6" selection-start-column="126" selection-end-line="6" selection-end-column="126" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/config/application-dev.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
|
|
@@ -1266,7 +1241,7 @@
|
|
|
<entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/application.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="874">
|
|
|
- <caret line="55" column="103" lean-forward="true" selection-start-line="55" selection-start-column="88" selection-end-line="55" selection-end-column="103" />
|
|
|
+ <caret line="55" column="103" lean-forward="false" selection-start-line="55" selection-start-column="88" selection-end-line="55" selection-end-column="103" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
@@ -1329,12 +1304,71 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/applications/school/school-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="353">
|
|
|
+ <state relative-caret-position="370">
|
|
|
<caret line="20" column="14" lean-forward="false" selection-start-line="20" selection-start-column="14" selection-end-line="20" selection-end-column="14" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <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="114">
|
|
|
+ <caret line="6" column="49" lean-forward="true" selection-start-line="6" selection-start-column="49" selection-end-line="6" selection-end-column="49" />
|
|
|
+ <folding />
|
|
|
+ </first_editor>
|
|
|
+ <second_editor />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/application.yml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="1403">
|
|
|
+ <caret line="135" column="25" lean-forward="false" selection-start-line="135" selection-start-column="25" selection-end-line="135" selection-end-column="25" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="114">
|
|
|
+ <caret line="6" column="126" lean-forward="false" selection-start-line="6" selection-start-column="126" selection-end-line="6" selection-end-column="126" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/docker/Dockerfile">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="38">
|
|
|
+ <caret line="2" column="17" lean-forward="false" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="17" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/application.yml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="475">
|
|
|
+ <caret line="25" column="9" lean-forward="true" selection-start-line="25" selection-start-column="9" selection-end-line="25" selection-end-column="9" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker.yml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="0">
|
|
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="38">
|
|
|
+ <caret line="2" column="38" lean-forward="false" selection-start-line="2" selection-start-column="38" selection-end-line="2" selection-end-column="38" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
</component>
|
|
|
<component name="masterDetails">
|
|
|
<states>
|