|
|
@@ -2,12 +2,11 @@
|
|
|
<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/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$/frontend/pc-web/Dockerfile" afterPath="$PROJECT_DIR$/frontend/pc-web/Dockerfile" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/frontend/pc-web/app.json" afterPath="$PROJECT_DIR$/frontend/pc-web/app.json" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/frontend/pc-web/app/view/main/Main.js" afterPath="$PROJECT_DIR$/frontend/pc-web/app/view/main/Main.js" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/frontend/pc-web/index.html" afterPath="$PROJECT_DIR$/frontend/pc-web/index.html" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/out/" />
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
@@ -55,64 +54,105 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
- <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 />
|
|
|
+ <file leaf-file-name="app.js" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/app.js">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="171">
|
|
|
+ <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#!!doc" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/application.yml">
|
|
|
+ <file leaf-file-name="bootstrap.js" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/bootstrap.js">
|
|
|
<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" />
|
|
|
+ <state relative-caret-position="175">
|
|
|
+ <caret line="10" column="5" lean-forward="false" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
|
|
|
<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/gateway-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
+ <file leaf-file-name="smartschool-all.css" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/build/development/smartschool/resources/smartschool-all.css">
|
|
|
<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" />
|
|
|
+ <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="Dockerfile" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/docker/Dockerfile">
|
|
|
+ <file leaf-file-name="smartschool-all_1.css" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/build/development/smartschool/resources/smartschool-all_1.css">
|
|
|
<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" />
|
|
|
+ <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="smartschool-all_2.css" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/build/development/smartschool/resources/smartschool-all_2.css">
|
|
|
+ <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.yml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/application.yml">
|
|
|
+ <file leaf-file-name="smartschool-all_3.css" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/build/development/smartschool/resources/smartschool-all_3.css">
|
|
|
<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" />
|
|
|
+ <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-prod.yml" pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
+ <file leaf-file-name="Main.js" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/app/view/main/Main.js">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="228">
|
|
|
+ <caret line="33" column="131" lean-forward="false" selection-start-line="33" selection-start-column="131" selection-end-line="33" selection-end-column="131" />
|
|
|
+ <folding>
|
|
|
+ <marker date="1547726679180" expanded="true" signature="2087:2144" ph="..." />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/index.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="152">
|
|
|
+ <caret line="8" column="15" lean-forward="false" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="app.json" pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/app.json">
|
|
|
<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" />
|
|
|
+ <caret line="2" column="22" lean-forward="false" selection-start-line="2" selection-start-column="18" selection-end-line="2" selection-end-column="22" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="Dockerfile" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/Dockerfile">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="76">
|
|
|
+ <caret line="4" column="40" lean-forward="false" selection-start-line="4" selection-start-column="40" selection-end-line="4" selection-end-column="40" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
@@ -142,8 +182,12 @@
|
|
|
<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>
|
|
|
+ <find>project.basedir</find>
|
|
|
+ <find>docker-prod</find>
|
|
|
+ <find>gateway</find>
|
|
|
+ <find>saas-operation</find>
|
|
|
+ <find>saas</find>
|
|
|
</findStrings>
|
|
|
<replaceStrings>
|
|
|
<replace>smartschool</replace>
|
|
|
@@ -161,11 +205,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/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" />
|
|
|
- <option value="$PROJECT_DIR$/framework/server-starter/src/main/resources/META-INF/spring.factories" />
|
|
|
- <option value="$PROJECT_DIR$/applications/school/school-server/src/main/resources/logback-spring.xml" />
|
|
|
<option value="$PROJECT_DIR$/framework/server-starter/src/main/java/com/usoftchina/smartschool/server/ServerAutoConfiguration.java" />
|
|
|
<option value="$PROJECT_DIR$/framework/core/pom.xml" />
|
|
|
<option value="$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/SchoolApplication.java" />
|
|
|
@@ -212,6 +251,11 @@
|
|
|
<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" />
|
|
|
+ <option value="$PROJECT_DIR$/frontend/pc-web/app.js" />
|
|
|
+ <option value="$PROJECT_DIR$/frontend/pc-web/Dockerfile" />
|
|
|
+ <option value="$PROJECT_DIR$/frontend/pc-web/index.html" />
|
|
|
+ <option value="$PROJECT_DIR$/frontend/pc-web/app.json" />
|
|
|
+ <option value="$PROJECT_DIR$/frontend/pc-web/app/view/main/Main.js" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -284,280 +328,28 @@
|
|
|
<path>
|
|
|
<item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="applications" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="applications" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="school" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="applications" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="school" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="school-server" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="applications" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="school" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="school-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="applications" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="school" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="school-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="applications" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="school" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="school-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="applications" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="school" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="school-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="applications" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="websocket" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="applications" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="websocket" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="websocket-server" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="applications" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="websocket" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="websocket-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="applications" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="websocket" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="websocket-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="applications" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="websocket" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="websocket-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="applications" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="websocket" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="websocket-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="applications" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="wechat" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="applications" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="wechat" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="wechat-server" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="applications" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="wechat" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="wechat-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="applications" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="wechat" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="wechat-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="applications" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="wechat" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="wechat-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="applications" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="wechat" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="wechat-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" />
|
|
|
- </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="account" 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="account" 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="account" 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" />
|
|
|
- </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" />
|
|
|
- </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" />
|
|
|
- </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" />
|
|
|
+ <item name="frontend" 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="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="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" />
|
|
|
+ <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="development" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
@@ -764,7 +556,7 @@
|
|
|
<workItem from="1547624296253" duration="4914000" />
|
|
|
<workItem from="1547630177539" duration="12661000" />
|
|
|
<workItem from="1547685937807" duration="1100000" />
|
|
|
- <workItem from="1547688698570" duration="4335000" />
|
|
|
+ <workItem from="1547688698570" duration="10718000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="删除编译文件">
|
|
|
<created>1547633261163</created>
|
|
|
@@ -829,17 +621,25 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1547692966833</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="10" />
|
|
|
+ <task id="LOCAL-00010" summary="prod配置文件修改">
|
|
|
+ <created>1547694746727</created>
|
|
|
+ <option name="number" value="00010" />
|
|
|
+ <option name="presentableId" value="LOCAL-00010" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1547694746727</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="11" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="23235000" />
|
|
|
+ <option name="totallyTimeSpent" value="29618000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
|
|
|
<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" />
|
|
|
+ <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="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" />
|
|
|
@@ -847,12 +647,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="false" show_stripe_button="true" weight="0.50247115" 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.51235586" 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="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="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28517398" 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="Find" 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="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" />
|
|
|
@@ -864,7 +664,6 @@
|
|
|
<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="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="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="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" />
|
|
|
@@ -958,271 +757,282 @@
|
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/pom.xml">
|
|
|
+ <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="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="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/pom.xml">
|
|
|
+ <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="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="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/pom.xml">
|
|
|
+ <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="-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/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/src/main/docker/Dockerfile">
|
|
|
+ <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="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="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$/frontend/pc-web/bootstrap.json">
|
|
|
+ <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="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" />
|
|
|
+ <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$/applications/websocket/websocket-server/src/main/docker/Dockerfile">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <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" />
|
|
|
+ <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" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/docker/Dockerfile">
|
|
|
+ <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="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="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/file/file-server/pom.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker-prod.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <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" />
|
|
|
+ <state relative-caret-position="76">
|
|
|
+ <caret line="4" column="12" lean-forward="false" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/.gitignore">
|
|
|
+ <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="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" />
|
|
|
+ <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$/applications/school/school-server/src/main/resources/application.yml">
|
|
|
+ <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="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" />
|
|
|
+ <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" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/.idea/compiler.xml">
|
|
|
+ <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="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" />
|
|
|
+ <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$/applications/school/school-server/src/main/resources/config/application-docker-test.yml">
|
|
|
+ <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="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" />
|
|
|
+ <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" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/.idea/vcs.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="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="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>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/school/school-server/src/main/resources/config/application-docker.yml">
|
|
|
+ <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="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" />
|
|
|
+ <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$/applications/websocket/websocket-server/src/main/resources/config/application-docker-test.yml">
|
|
|
+ <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="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" />
|
|
|
+ <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$/applications/wechat/wechat-server/src/main/resources/config/application-docker-test.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="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" />
|
|
|
+ <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$/applications/wechat/wechat-server/src/main/resources/config/application-docker.yml">
|
|
|
+ <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="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" />
|
|
|
+ <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/file/file-server/src/main/resources/config/application-docker-dev.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="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" />
|
|
|
+ <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>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/config/application-docker-test.yml">
|
|
|
+ <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="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" />
|
|
|
+ <state relative-caret-position="95">
|
|
|
+ <caret line="5" column="18" lean-forward="false" selection-start-line="5" selection-start-column="18" selection-end-line="5" selection-end-column="18" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/config/application-docker.yml">
|
|
|
+ <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="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" />
|
|
|
+ <state relative-caret-position="38">
|
|
|
+ <caret line="2" column="33" lean-forward="true" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="33" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/java/com/usoftchina/smartschool/gateway/config/AuthFilter.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <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" />
|
|
|
+ <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$/base-servers/gateway-server/src/main/resources/config/application-docker-dev.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <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" />
|
|
|
+ <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" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/config/application-docker-test.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <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" />
|
|
|
+ <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/gateway-server/src/main/resources/config/application-docker.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <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" />
|
|
|
+ <state relative-caret-position="-437">
|
|
|
+ <caret line="439" column="27" lean-forward="false" selection-start-line="439" selection-start-column="16" selection-end-line="439" selection-end-column="27" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/logback-spring.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="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" />
|
|
|
+ <state relative-caret-position="76">
|
|
|
+ <caret line="4" column="10" lean-forward="false" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/frontend/pc-web/build/temp/development/saas-operation/sass/saas-operation-all.scss.tmp">
|
|
|
+ <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="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" />
|
|
|
+ <state relative-caret-position="-114">
|
|
|
+ <caret line="6" column="28" lean-forward="true" selection-start-line="6" selection-start-column="16" selection-end-line="6" selection-end-column="28" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/frontend/pc-web/app.json">
|
|
|
+ <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="-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" />
|
|
|
+ <state relative-caret-position="207">
|
|
|
+ <caret line="57" column="12" lean-forward="false" selection-start-line="57" selection-start-column="8" selection-end-line="57" selection-end-column="12" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/school/school-server/src/main/docker/Dockerfile">
|
|
|
+ <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="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="55">
|
|
|
+ <caret line="62" column="12" lean-forward="false" selection-start-line="62" selection-start-column="8" selection-end-line="62" selection-end-column="12" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/pom.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/application.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="829">
|
|
|
- <caret line="359" column="59" lean-forward="true" selection-start-line="359" selection-start-column="59" selection-end-line="359" selection-end-column="59" />
|
|
|
+ <state relative-caret-position="266">
|
|
|
+ <caret line="62" column="12" lean-forward="false" selection-start-line="62" selection-start-column="8" selection-end-line="62" selection-end-column="12" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/docker/Dockerfile">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/runtime/nginx/default.conf">
|
|
|
<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="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">
|
|
|
+ <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="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="277">
|
|
|
+ <caret line="62" column="12" lean-forward="false" selection-start-line="62" selection-start-column="8" selection-end-line="62" selection-end-column="12" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker-prod.yml">
|
|
|
+ <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="76">
|
|
|
- <caret line="4" column="12" lean-forward="false" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" />
|
|
|
+ <state relative-caret-position="171">
|
|
|
+ <caret line="9" column="23" lean-forward="true" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
|
|
|
<folding />
|
|
|
</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$/README.md">
|
|
|
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
+ <state split_layout="FIRST">
|
|
|
+ <first_editor relative-caret-position="422">
|
|
|
+ <caret line="116" column="49" lean-forward="false" selection-start-line="116" selection-start-column="12" selection-end-line="116" selection-end-column="49" />
|
|
|
+ <folding />
|
|
|
+ </first_editor>
|
|
|
+ <second_editor />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/app/model/cuservice/Feedback.js">
|
|
|
<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" />
|
|
|
@@ -1230,31 +1040,31 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/workspace.json">
|
|
|
<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="-693">
|
|
|
+ <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/file/file-server/src/main/resources/application.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/build.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="874">
|
|
|
- <caret line="55" column="103" lean-forward="false" selection-start-line="55" selection-start-column="88" selection-end-line="55" selection-end-column="103" />
|
|
|
+ <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$/applications/wechat/wechat-server/src/main/resources/application.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/bootstrap.json">
|
|
|
<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" />
|
|
|
+ <state relative-caret-position="-950">
|
|
|
+ <caret line="0" column="48333" lean-forward="false" selection-start-line="0" selection-start-column="48333" selection-end-line="0" selection-end-column="48333" />
|
|
|
<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$/frontend/pc-web/bootstrap.jsonp">
|
|
|
<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" />
|
|
|
@@ -1262,109 +1072,102 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/bootstrap.css">
|
|
|
<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" />
|
|
|
+ <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/websocket/websocket-server/src/main/resources/config/application-docker.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/package.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="9" selection-end-column="24" />
|
|
|
+ <state relative-caret-position="19">
|
|
|
+ <caret line="1" column="25" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="25" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/application.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/app.js">
|
|
|
<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" />
|
|
|
- <folding />
|
|
|
+ <state relative-caret-position="171">
|
|
|
+ <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#!!doc" expanded="true" />
|
|
|
+ </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$/frontend/pc-web/bootstrap.js">
|
|
|
<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="175">
|
|
|
+ <caret line="10" column="5" lean-forward="false" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/build/development/smartschool/resources/smartschool-all.css">
|
|
|
<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" />
|
|
|
+ <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/school/school-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/build/development/smartschool/resources/smartschool-all_1.css">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <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" />
|
|
|
+ <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$/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">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/build/development/smartschool/resources/smartschool-all_2.css">
|
|
|
<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" />
|
|
|
+ <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/gateway-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/build/development/smartschool/resources/smartschool-all_3.css">
|
|
|
<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" />
|
|
|
+ <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/docker/Dockerfile">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/app/view/main/Main.js">
|
|
|
<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 relative-caret-position="228">
|
|
|
+ <caret line="33" column="131" lean-forward="false" selection-start-line="33" selection-start-column="131" selection-end-line="33" selection-end-column="131" />
|
|
|
+ <folding>
|
|
|
+ <marker date="1547726679180" expanded="true" signature="2087:2144" ph="..." />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/application.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/Dockerfile">
|
|
|
<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" />
|
|
|
+ <state relative-caret-position="76">
|
|
|
+ <caret line="4" column="40" lean-forward="false" selection-start-line="4" selection-start-column="40" selection-end-line="4" selection-end-column="40" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/index.html">
|
|
|
<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="152">
|
|
|
+ <caret line="8" column="15" lean-forward="false" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/application-docker-prod.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/frontend/pc-web/app.json">
|
|
|
<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" />
|
|
|
+ <caret line="2" column="22" lean-forward="false" selection-start-line="2" selection-start-column="18" selection-end-line="2" selection-end-column="22" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|