|
|
@@ -1,8 +1,9 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="980ddd15-b0f5-453d-b57f-9e0d36b01ada" name="Default" comment="README文档">
|
|
|
+ <list default="true" id="980ddd15-b0f5-453d-b57f-9e0d36b01ada" name="Default" comment="">
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/out/" />
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
@@ -51,103 +52,20 @@
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
<file leaf-file-name="Dockerfile" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/docker/Dockerfile">
|
|
|
+ <entry file="file://$PROJECT_DIR$/applications/school/school-server/src/main/docker/Dockerfile">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="38">
|
|
|
- <caret line="2" column="18" lean-forward="false" selection-start-line="2" selection-start-column="18" selection-end-line="2" selection-end-column="18" />
|
|
|
+ <caret line="2" column="10" lean-forward="false" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/pom.xml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="209">
|
|
|
- <caret line="11" column="27" lean-forward="false" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="27" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="Dockerfile" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/docker/Dockerfile">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="95">
|
|
|
- <caret line="5" column="34" lean-forward="false" selection-start-line="5" selection-start-column="34" selection-end-line="5" selection-end-column="34" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="bootstrap.json" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/frontend/pc-web/bootstrap.json">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="0">
|
|
|
- <caret line="0" column="19086" lean-forward="false" selection-start-line="0" selection-start-column="19086" selection-end-line="0" selection-end-column="19086" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
|
|
|
+ <file leaf-file-name="pom.xml" 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="456">
|
|
|
- <caret line="24" column="22" lean-forward="false" selection-start-line="24" selection-start-column="22" selection-end-line="24" selection-end-column="22" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <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="57">
|
|
|
- <caret line="3" column="13" lean-forward="false" selection-start-line="3" selection-start-column="2" selection-end-line="3" selection-end-column="13" />
|
|
|
- <folding />
|
|
|
- </first_editor>
|
|
|
- <second_editor />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/.gitignore">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="361">
|
|
|
- <caret line="19" column="5" lean-forward="false" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="workspace.xml" pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="158">
|
|
|
- <caret line="111" column="20" lean-forward="true" selection-start-line="111" selection-start-column="20" selection-end-line="111" selection-end-column="20" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="compiler.xml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/.idea/compiler.xml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="380">
|
|
|
- <caret line="20" column="39" lean-forward="false" selection-start-line="20" selection-start-column="39" selection-end-line="20" selection-end-column="39" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="vcs.xml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/.idea/vcs.xml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="57">
|
|
|
- <caret line="3" column="51" lean-forward="false" selection-start-line="3" selection-start-column="51" selection-end-line="3" selection-end-column="51" />
|
|
|
+ <state relative-caret-position="1010">
|
|
|
+ <caret line="423" column="43" lean-forward="true" selection-start-line="423" selection-start-column="43" selection-end-line="423" selection-end-column="43" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
@@ -176,7 +94,9 @@
|
|
|
<find>docker-maven-plugin</find>
|
|
|
<find>com.usoftchina.saas.file.po.FileInfo</find>
|
|
|
<find>school-dto</find>
|
|
|
+ <find>10.10.100.200:5000</find>
|
|
|
<find>saas</find>
|
|
|
+ <find>docker.registry.name</find>
|
|
|
</findStrings>
|
|
|
<replaceStrings>
|
|
|
<replace>smartschool</replace>
|
|
|
@@ -211,7 +131,6 @@
|
|
|
<option value="$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/SchoolApplication.java" />
|
|
|
<option value="$PROJECT_DIR$/applications/school/school-server/src/main/docker/Dockerfile" />
|
|
|
<option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/java/com/usoftchina/smartschool/file/controller/FileController.java" />
|
|
|
- <option value="$PROJECT_DIR$/pom.xml" />
|
|
|
<option value="$PROJECT_DIR$/applications/school/pom.xml" />
|
|
|
<option value="$PROJECT_DIR$/applications/school/school-server/pom.xml" />
|
|
|
<option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/mapper/FileInfoMapper.xml" />
|
|
|
@@ -245,6 +164,7 @@
|
|
|
<option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/docker/Dockerfile" />
|
|
|
<option value="$PROJECT_DIR$/README.md" />
|
|
|
<option value="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
+ <option value="$PROJECT_DIR$/pom.xml" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -314,11 +234,6 @@
|
|
|
<item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
- <path>
|
|
|
- <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name=".idea" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
<path>
|
|
|
<item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
@@ -541,6 +456,27 @@
|
|
|
<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="file" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="file-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="file" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="file-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" />
|
|
|
@@ -590,6 +526,62 @@
|
|
|
<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="frontend" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="frontend" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="pc-web" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="frontend" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="pc-web" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="build" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="frontend" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="pc-web" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="build" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="temp" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="frontend" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="pc-web" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="build" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="temp" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="development" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="frontend" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="pc-web" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="build" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="temp" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="development" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="saas-operation" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="frontend" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="pc-web" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="build" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="temp" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="development" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="saas-operation" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="sass" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</subPane>
|
|
|
@@ -667,22 +659,9 @@
|
|
|
<module name="school-server" />
|
|
|
<envs />
|
|
|
</configuration>
|
|
|
- <configuration name="WebsocketApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
|
|
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
|
|
|
- <pattern>
|
|
|
- <option name="PATTERN" value="com.usoftchina.smartschool.websocket.*" />
|
|
|
- <option name="ENABLED" value="true" />
|
|
|
- </pattern>
|
|
|
- </extension>
|
|
|
- <option name="MAIN_CLASS_NAME" value="com.usoftchina.smartschool.websocket.WebsocketApplication" />
|
|
|
- <option name="VM_PARAMETERS" />
|
|
|
- <option name="PROGRAM_PARAMETERS" />
|
|
|
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
|
|
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
|
|
- <option name="ALTERNATIVE_JRE_PATH" />
|
|
|
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
|
|
|
- <option name="ENV_VARIABLES" />
|
|
|
- <option name="PASS_PARENT_ENVS" value="true" />
|
|
|
+ <configuration name="WebsocketApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
|
|
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
|
|
+ <option name="SPRING_BOOT_MAIN_CLASS" value="com.usoftchina.smartschool.websocket.WebsocketApplication" />
|
|
|
<module name="websocket-server" />
|
|
|
<envs />
|
|
|
</configuration>
|
|
|
@@ -778,13 +757,14 @@
|
|
|
<properties />
|
|
|
<listeners />
|
|
|
</configuration>
|
|
|
- <list size="6">
|
|
|
+ <list size="7">
|
|
|
<item index="0" class="java.lang.String" itemvalue="Spring Boot.EurekaApplication" />
|
|
|
<item index="1" class="java.lang.String" itemvalue="Spring Boot.GatewayApplication" />
|
|
|
<item index="2" class="java.lang.String" itemvalue="Spring Boot.FileApplication" />
|
|
|
<item index="3" class="java.lang.String" itemvalue="Spring Boot.SchoolApplication" />
|
|
|
<item index="4" class="java.lang.String" itemvalue="Spring Boot.WechatApplication" />
|
|
|
<item index="5" class="java.lang.String" itemvalue="Application.WebsocketApplication" />
|
|
|
+ <item index="6" class="java.lang.String" itemvalue="Spring Boot.WebsocketApplication" />
|
|
|
</list>
|
|
|
<recent_temporary>
|
|
|
<list size="3">
|
|
|
@@ -807,7 +787,7 @@
|
|
|
<workItem from="1547624296253" duration="4914000" />
|
|
|
<workItem from="1547630177539" duration="12661000" />
|
|
|
<workItem from="1547685937807" duration="1100000" />
|
|
|
- <workItem from="1547688698570" duration="35000" />
|
|
|
+ <workItem from="1547688698570" duration="985000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="删除编译文件">
|
|
|
<created>1547633261163</created>
|
|
|
@@ -858,11 +838,18 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1547686828687</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="8" />
|
|
|
+ <task id="LOCAL-00008" summary="README文档">
|
|
|
+ <created>1547688741338</created>
|
|
|
+ <option name="number" value="00008" />
|
|
|
+ <option name="presentableId" value="LOCAL-00008" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1547688741338</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="9" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="18935000" />
|
|
|
+ <option name="totallyTimeSpent" value="19885000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
|
|
|
@@ -877,11 +864,12 @@
|
|
|
<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="true" show_stripe_button="true" weight="0.37726524" 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.50082374" 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.25869894" 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="false" show_stripe_button="true" weight="0.23373677" 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" />
|
|
|
<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" />
|
|
|
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="UI 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="4" side_tool="false" content_ui="tabs" />
|
|
|
@@ -899,9 +887,43 @@
|
|
|
<window_info id="Run Dashboard" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29983526" sideWeight="0.8774584" order="10" side_tool="false" content_ui="combo" />
|
|
|
<window_info id="Inspection" 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="7" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45688352" sideWeight="0.509589" order="9" side_tool="true" 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" />
|
|
|
<window_info id="Theme Preview" 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" />
|
|
|
</layout>
|
|
|
+ <layout-to-restore>
|
|
|
+ <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="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Message" 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="2" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.57990116" sideWeight="0.18759455" order="14" side_tool="true" content_ui="tabs" />
|
|
|
+ <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.30484116" sideWeight="0.49041095" order="4" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Capture Tool" 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="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="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
|
|
+ <window_info id="Inspection Results" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32454696" sideWeight="0.5" order="0" 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" />
|
|
|
+ <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="UI 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="4" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5897858" sideWeight="0.5" order="5" 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" />
|
|
|
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.44481054" sideWeight="0.48789713" order="1" 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="8" 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="8" side_tool="true" 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="6" 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="6" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Run Dashboard" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29983526" sideWeight="0.8774584" order="10" side_tool="false" content_ui="combo" />
|
|
|
+ <window_info id="Inspection" 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="7" 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="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="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45688352" sideWeight="0.509589" order="9" side_tool="true" 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.14662273" sideWeight="0.5" order="13" 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.23373677" 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="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" />
|
|
|
+ <window_info id="Favorites" 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="true" content_ui="tabs" />
|
|
|
+ <window_info id="Theme Preview" 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" />
|
|
|
+ </layout-to-restore>
|
|
|
</component>
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
|
<option name="version" value="1" />
|
|
|
@@ -952,385 +974,405 @@
|
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-netflix-eureka-client/2.0.1.RELEASE/spring-cloud-netflix-eureka-client-2.0.1.RELEASE.jar!/org/springframework/cloud/netflix/eureka/EnableEurekaClient.class">
|
|
|
+ <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-api/websocket-api.iml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="190">
|
|
|
- <caret line="18" column="18" lean-forward="false" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="18" />
|
|
|
+ <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>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/mapper/FileInfoMapper.xml">
|
|
|
+ <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="50">
|
|
|
- <caret line="110" column="15" lean-forward="false" selection-start-line="110" selection-start-column="15" selection-end-line="110" selection-end-column="15" />
|
|
|
+ <state relative-caret-position="209">
|
|
|
+ <caret line="11" column="29" lean-forward="false" selection-start-line="11" selection-start-column="29" selection-end-line="11" selection-end-column="29" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/auth/pub.key">
|
|
|
+ <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/java/com/usoftchina/smartschool/websocket/WebsocketApplication.java">
|
|
|
<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="255">
|
|
|
+ <caret line="23" column="0" lean-forward="false" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/java/com/usoftchina/smartschool/eureka/EurekaApplication.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/applications/school/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="95">
|
|
|
- <caret line="7" column="16" lean-forward="true" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
|
|
|
+ <state relative-caret-position="13">
|
|
|
+ <caret line="7" column="17" lean-forward="false" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/java/com/usoftchina/smartschool/gateway/GatewayApplication.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/applications/school/school-dto/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="114">
|
|
|
- <caret line="9" column="18" lean-forward="true" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
|
|
|
+ <state relative-caret-position="103">
|
|
|
+ <caret line="11" column="16" lean-forward="false" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/application.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/applications/school/school-api/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-171">
|
|
|
- <caret line="36" column="23" lean-forward="false" selection-start-line="36" selection-start-column="23" selection-end-line="36" selection-end-column="23" />
|
|
|
+ <state relative-caret-position="209">
|
|
|
+ <caret line="11" column="26" lean-forward="false" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/config/application-dev.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/application.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="228">
|
|
|
- <caret line="12" column="99" lean-forward="false" selection-start-line="12" selection-start-column="99" selection-end-line="12" selection-end-column="99" />
|
|
|
+ <state relative-caret-position="38">
|
|
|
+ <caret line="2" column="19" lean-forward="false" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="19" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/java/com/usoftchina/smartschool/file/FileApplication.java">
|
|
|
+ <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="106">
|
|
|
- <caret line="15" column="18" lean-forward="false" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" />
|
|
|
+ <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/school/school-server/src/main/resources/config/application-dev.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="209">
|
|
|
- <caret line="11" column="99" lean-forward="false" selection-start-line="11" selection-start-column="99" selection-end-line="11" selection-end-column="99" />
|
|
|
+ <caret line="11" column="29" lean-forward="false" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="29" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/school/school-server/src/main/resources/application.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="152">
|
|
|
- <caret line="62" column="12" lean-forward="false" selection-start-line="62" selection-start-column="12" selection-end-line="62" selection-end-column="12" />
|
|
|
+ <caret line="11" column="22" lean-forward="false" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/websocket/websocket.iml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="0">
|
|
|
+ <state relative-caret-position="-57">
|
|
|
<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$/applications/wechat/wechat-server/src/main/resources/config/application-dev.yml">
|
|
|
+ <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="209">
|
|
|
- <caret line="11" column="99" lean-forward="false" selection-start-line="11" selection-start-column="99" selection-end-line="11" selection-end-column="99" />
|
|
|
+ <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" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/application.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/docker/Dockerfile">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="38">
|
|
|
- <caret line="2" column="16" lean-forward="false" selection-start-line="2" selection-start-column="16" selection-end-line="2" selection-end-column="16" />
|
|
|
+ <caret line="2" column="13" lean-forward="false" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/logback-spring.xml">
|
|
|
+ <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="143">
|
|
|
- <caret line="73" column="39" lean-forward="false" selection-start-line="73" selection-start-column="39" selection-end-line="73" selection-end-column="39" />
|
|
|
+ <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$/applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/WechatApplication.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="285">
|
|
|
- <caret line="15" column="19" lean-forward="false" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
|
|
|
+ <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>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/applications.iml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/docker/Dockerfile">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="266">
|
|
|
- <caret line="14" column="9" lean-forward="false" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
|
|
|
+ <state relative-caret-position="95">
|
|
|
+ <caret line="5" column="34" lean-forward="false" selection-start-line="5" selection-start-column="34" selection-end-line="5" selection-end-column="34" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-api/pom.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/bootstrap.json">
|
|
|
<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" />
|
|
|
+ <caret line="0" column="19086" lean-forward="false" selection-start-line="0" selection-start-column="19086" selection-end-line="0" selection-end-column="19086" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/websocket-server.iml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="209">
|
|
|
- <caret line="202" column="9" lean-forward="false" selection-start-line="202" selection-start-column="9" selection-end-line="202" selection-end-column="9" />
|
|
|
+ <state relative-caret-position="443">
|
|
|
+ <caret line="111" column="20" lean-forward="true" selection-start-line="111" selection-start-column="20" selection-end-line="111" selection-end-column="20" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/school/school-server/pom.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/docker/Dockerfile">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="247">
|
|
|
- <caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="84" selection-end-column="12" />
|
|
|
+ <state relative-caret-position="38">
|
|
|
+ <caret line="2" column="18" lean-forward="false" selection-start-line="2" selection-start-column="18" selection-end-line="2" selection-end-column="18" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/pom.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="1596">
|
|
|
- <caret line="84" column="12" lean-forward="false" selection-start-line="84" selection-start-column="12" selection-end-line="84" selection-end-column="12" />
|
|
|
+ <state relative-caret-position="171">
|
|
|
+ <caret line="9" column="38" lean-forward="true" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/SchoolApplication.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/.gitignore">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="247">
|
|
|
- <caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="17" selection-end-column="61" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="115">
|
|
|
+ <caret line="30" column="9" lean-forward="false" selection-start-line="30" selection-start-column="9" selection-end-line="30" selection-end-column="9" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/auth/pub.key">
|
|
|
- <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" />
|
|
|
+ <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/websocket/websocket-server/src/main/resources/logback-spring.xml">
|
|
|
+ <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="380">
|
|
|
- <caret line="26" column="123" lean-forward="false" selection-start-line="26" selection-start-column="123" selection-end-line="26" selection-end-column="123" />
|
|
|
+ <state relative-caret-position="115">
|
|
|
+ <caret line="72" column="39" lean-forward="false" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/websocket/pom.xml">
|
|
|
+ <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="209">
|
|
|
- <caret line="11" column="25" lean-forward="false" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="25" />
|
|
|
+ <state relative-caret-position="106">
|
|
|
+ <caret line="16" column="14" lean-forward="false" selection-start-line="16" selection-start-column="14" selection-end-line="16" selection-end-column="14" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/pom.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/.idea/compiler.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="380">
|
|
|
- <caret line="20" column="10" lean-forward="false" selection-start-line="20" selection-start-column="10" selection-end-line="20" selection-end-column="10" />
|
|
|
+ <caret line="20" column="39" lean-forward="false" selection-start-line="20" selection-start-column="39" selection-end-line="20" selection-end-column="39" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-api/websocket-api.iml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/applications/school/school-server/src/main/resources/config/application-docker-test.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="111">
|
|
|
+ <caret line="6" column="88" lean-forward="false" selection-start-line="6" selection-start-column="88" selection-end-line="6" selection-end-column="88" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/config/application-dev.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/.idea/vcs.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="209">
|
|
|
- <caret line="11" column="29" lean-forward="false" selection-start-line="11" selection-start-column="29" selection-end-line="11" selection-end-column="29" />
|
|
|
+ <state relative-caret-position="57">
|
|
|
+ <caret line="3" column="51" lean-forward="false" selection-start-line="3" selection-start-column="51" selection-end-line="3" selection-end-column="51" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/java/com/usoftchina/smartschool/websocket/WebsocketApplication.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/applications/school/school-server/src/main/resources/config/application-docker.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="255">
|
|
|
- <caret line="23" column="0" lean-forward="false" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
|
|
|
+ <state relative-caret-position="114">
|
|
|
+ <caret line="6" column="88" lean-forward="false" selection-start-line="6" selection-start-column="88" selection-end-line="6" selection-end-column="88" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/school/pom.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="13">
|
|
|
- <caret line="7" column="17" lean-forward="false" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
|
|
|
+ <state relative-caret-position="106">
|
|
|
+ <caret line="16" column="14" lean-forward="false" selection-start-line="16" selection-start-column="14" selection-end-line="16" selection-end-column="14" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/school/school-dto/pom.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/config/application-docker-test.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="103">
|
|
|
- <caret line="11" column="16" lean-forward="false" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
|
|
|
+ <state relative-caret-position="111">
|
|
|
+ <caret line="6" column="88" lean-forward="false" selection-start-line="6" selection-start-column="88" selection-end-line="6" selection-end-column="88" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/school/school-api/pom.xml">
|
|
|
+ <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="209">
|
|
|
- <caret line="11" column="26" lean-forward="false" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
|
|
|
+ <state relative-caret-position="114">
|
|
|
+ <caret line="6" column="88" lean-forward="false" selection-start-line="6" selection-start-column="88" selection-end-line="6" selection-end-column="88" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/school/school-server/src/main/docker/Dockerfile">
|
|
|
+ <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-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="10" lean-forward="false" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
|
|
|
+ <state relative-caret-position="90">
|
|
|
+ <caret line="16" column="14" lean-forward="false" selection-start-line="16" selection-start-column="14" selection-end-line="16" selection-end-column="14" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/application.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/config/application-docker-test.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="38">
|
|
|
- <caret line="2" column="19" lean-forward="false" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="19" />
|
|
|
+ <state relative-caret-position="98">
|
|
|
+ <caret line="6" column="88" lean-forward="false" selection-start-line="6" selection-start-column="88" selection-end-line="6" selection-end-column="88" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/docker/Dockerfile">
|
|
|
+ <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/config/application-docker.yml">
|
|
|
<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 relative-caret-position="114">
|
|
|
+ <caret line="6" column="88" lean-forward="false" selection-start-line="6" selection-start-column="88" selection-end-line="6" selection-end-column="88" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/pom.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/config/application-docker-dev.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="209">
|
|
|
- <caret line="11" column="29" lean-forward="false" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="29" />
|
|
|
+ <state relative-caret-position="98">
|
|
|
+ <caret line="6" column="88" lean-forward="false" selection-start-line="6" selection-start-column="88" selection-end-line="6" selection-end-column="88" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/pom.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/config/application-docker-test.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="152">
|
|
|
- <caret line="11" column="22" lean-forward="false" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
|
|
|
+ <state relative-caret-position="98">
|
|
|
+ <caret line="6" column="88" lean-forward="false" selection-start-line="6" selection-start-column="88" selection-end-line="6" selection-end-column="88" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/pom.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/config/application-docker.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-57">
|
|
|
- <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="114">
|
|
|
+ <caret line="6" column="88" lean-forward="false" selection-start-line="6" selection-start-column="88" selection-end-line="6" selection-end-column="88" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/config/application-docker.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/java/com/usoftchina/smartschool/gateway/config/AuthFilter.java">
|
|
|
<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="90">
|
|
|
+ <caret line="23" column="22" lean-forward="false" selection-start-line="23" selection-start-column="22" selection-end-line="23" selection-end-column="22" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/application.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/config/application-docker-dev.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="2850">
|
|
|
- <caret line="150" column="99" lean-forward="false" selection-start-line="150" selection-start-column="99" selection-end-line="150" selection-end-column="99" />
|
|
|
+ <state relative-caret-position="114">
|
|
|
+ <caret line="6" column="88" lean-forward="false" selection-start-line="6" selection-start-column="88" selection-end-line="6" selection-end-column="88" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/application.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="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="228">
|
|
|
+ <caret line="12" column="14" lean-forward="false" selection-start-line="12" selection-start-column="14" selection-end-line="12" selection-end-column="14" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/docker/Dockerfile">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/config/application-docker-test.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="38">
|
|
|
- <caret line="2" column="13" lean-forward="false" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
|
|
|
+ <state relative-caret-position="114">
|
|
|
+ <caret line="6" column="88" lean-forward="false" selection-start-line="6" selection-start-column="88" selection-end-line="6" selection-end-column="88" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/docker/Dockerfile">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/config/application-docker.yml">
|
|
|
<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 relative-caret-position="114">
|
|
|
+ <caret line="6" column="88" lean-forward="false" selection-start-line="6" selection-start-column="88" selection-end-line="6" selection-end-column="88" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/pom.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/logback-spring.xml">
|
|
|
<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="334">
|
|
|
+ <caret line="123" column="37" lean-forward="false" selection-start-line="123" selection-start-column="37" selection-end-line="123" selection-end-column="37" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/pom.xml">
|
|
|
+ <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="209">
|
|
|
- <caret line="11" column="27" lean-forward="false" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="27" />
|
|
|
+ <state relative-caret-position="493">
|
|
|
+ <caret line="150" column="99" lean-forward="false" selection-start-line="150" selection-start-column="99" selection-end-line="150" selection-end-column="99" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/docker/Dockerfile">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="95">
|
|
|
- <caret line="5" column="34" lean-forward="false" selection-start-line="5" selection-start-column="34" selection-end-line="5" selection-end-column="34" />
|
|
|
+ <state relative-caret-position="304">
|
|
|
+ <caret line="16" column="14" lean-forward="false" selection-start-line="16" selection-start-column="14" selection-end-line="16" selection-end-column="14" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/frontend/pc-web/bootstrap.json">
|
|
|
+ <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">
|
|
|
- <caret line="0" column="19086" lean-forward="false" selection-start-line="0" selection-start-column="19086" selection-end-line="0" selection-end-column="19086" />
|
|
|
+ <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$/pom.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/build/temp/development/saas-operation/sass/saas-operation-all.scss.tmp">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="456">
|
|
|
- <caret line="24" column="22" lean-forward="false" selection-start-line="24" selection-start-column="22" selection-end-line="24" selection-end-column="22" />
|
|
|
+ <state relative-caret-position="21793">
|
|
|
+ <caret line="1147" column="9" lean-forward="false" selection-start-line="1147" selection-start-column="9" selection-end-line="1147" selection-end-column="9" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/.gitignore">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/app.json">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="361">
|
|
|
- <caret line="19" column="5" lean-forward="false" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
|
|
|
+ <state relative-caret-position="-4104">
|
|
|
+ <caret line="6" column="29" lean-forward="true" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/docker/Dockerfile">
|
|
|
+ <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="38">
|
|
|
- <caret line="2" column="18" lean-forward="false" selection-start-line="2" selection-start-column="18" selection-end-line="2" selection-end-column="18" />
|
|
|
+ <state relative-caret-position="-1320">
|
|
|
+ <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$/README.md">
|
|
|
- <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
- <state split_layout="FIRST">
|
|
|
- <first_editor relative-caret-position="57">
|
|
|
- <caret line="3" column="13" lean-forward="false" selection-start-line="3" selection-start-column="2" selection-end-line="3" selection-end-column="13" />
|
|
|
- <folding />
|
|
|
- </first_editor>
|
|
|
- <second_editor />
|
|
|
+ <entry file="file://$PROJECT_DIR$/applications/school/school-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" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="158">
|
|
|
- <caret line="111" column="20" lean-forward="true" selection-start-line="111" selection-start-column="20" selection-end-line="111" selection-end-column="20" />
|
|
|
+ <state relative-caret-position="1010">
|
|
|
+ <caret line="423" column="43" lean-forward="true" selection-start-line="423" selection-start-column="43" selection-end-line="423" selection-end-column="43" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|