Browse Source

prod配置文件修改

guq 6 years ago
parent
commit
81347f842d

+ 271 - 313
.idea/workspace.xml

@@ -2,8 +2,18 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="980ddd15-b0f5-453d-b57f-9e0d36b01ada" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker-dev.yml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker-prod.yml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker-test.yml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker.yml" />
       <change type="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" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/applications/school/school-server/src/main/resources/config/application-docker-prod.yml" afterPath="$PROJECT_DIR$/applications/school/school-server/src/main/resources/config/application-docker-prod.yml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/application.yml" afterPath="$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/application.yml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/config/application-docker-prod.yml" afterPath="$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/config/application-docker-prod.yml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/config/application-docker-prod.yml" afterPath="$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/config/application-docker-prod.yml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/config/application-docker-prod.yml" afterPath="$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/config/application-docker-prod.yml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/application.yml" afterPath="$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/application.yml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/config/application-docker-prod.yml" afterPath="$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/config/application-docker-prod.yml" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -51,21 +61,101 @@
   </component>
   <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$/applications/school/school-server/src/main/docker/Dockerfile">
+      <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/application.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="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="874">
+              <caret line="55" column="103" lean-forward="true" selection-start-line="55" selection-start-column="88" selection-end-line="55" selection-end-column="103" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pom.xml">
+      <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/application.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <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" />
+            <state relative-caret-position="-1140">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="application-dev.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/config/application-dev.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="application-docker-prod.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/config/application-docker-prod.yml">
+          <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" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/application.yml">
+          <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>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="application-dev.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/config/application-dev.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="application-docker.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/config/application-docker.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="9" selection-end-column="24" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="application-docker-prod.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/config/application-docker-prod.yml">
+          <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" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="application-docker-prod.yml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/applications/school/school-server/src/main/resources/config/application-docker-prod.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="353">
+              <caret line="20" column="14" lean-forward="false" selection-start-line="20" selection-start-column="14" selection-end-line="20" selection-end-column="14" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="application-docker-prod.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/config/application-docker-prod.yml">
+          <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" />
               <folding />
             </state>
           </provider>
@@ -114,12 +204,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/base-servers/file/file-server/pom.xml" />
-        <option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/logback-spring.xml" />
-        <option value="$PROJECT_DIR$/framework/server-starter/src/main/java/com/usoftchina/smartschool/server/error/ServletErrorUtils.java" />
-        <option value="$PROJECT_DIR$/framework/server-starter/src/main/java/com/usoftchina/smartschool/server/error/GlobalExceptionHandler.java" />
-        <option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/java/com/usoftchina/smartschool/file/FileApplication.java" />
-        <option value="$PROJECT_DIR$/framework/server-starter/src/main/java/com/usoftchina/smartschool/server/web/DefaultWebMvcConfig.java" />
         <option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/java/com/usoftchina/smartschool/file/service/impl/FileInfoServiceImpl.java" />
         <option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/java/com/usoftchina/smartschool/file/util/FileTypeUtils.java" />
         <option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/java/com/usoftchina/smartschool/file/po/FileInfo.java" />
@@ -138,7 +222,6 @@
         <option value="$PROJECT_DIR$/applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/WechatApplication.java" />
         <option value="$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/application.yml" />
-        <option value="$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/config/application-dev.yml" />
         <option value="$PROJECT_DIR$/applications/school/school-server/src/main/resources/config/application-dev.yml" />
         <option value="$PROJECT_DIR$/applications/school/school-server/src/main/resources/application.yml" />
@@ -153,7 +236,6 @@
         <option value="$PROJECT_DIR$/applications/websocket/websocket-api/pom.xml" />
         <option value="$PROJECT_DIR$/applications/websocket/websocket-server/pom.xml" />
         <option value="$PROJECT_DIR$/applications/websocket/websocket-server/src/main/java/com/usoftchina/smartschool/websocket/WebsocketApplication.java" />
-        <option value="$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/logback-spring.xml" />
         <option value="$PROJECT_DIR$/applications/school/school-api/pom.xml" />
         <option value="$PROJECT_DIR$/applications/websocket/websocket-server/src/main/docker/Dockerfile" />
@@ -165,6 +247,14 @@
         <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/.idea/workspace.xml" />
         <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker-prod.yml" />
+        <option value="$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/config/application-docker-prod.yml" />
+        <option value="$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/config/application-docker-prod.yml" />
+        <option value="$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/config/application-docker-prod.yml" />
+        <option value="$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/config/application-docker-prod.yml" />
+        <option value="$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/applications/school/school-server/src/main/resources/config/application-docker-prod.yml" />
       </list>
     </option>
   </component>
@@ -277,47 +367,24 @@
               <item name="school-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="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" />
+              <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="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" />
-              <item name="websocket-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" />
@@ -325,9 +392,6 @@
               <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="java" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
@@ -336,9 +400,6 @@
               <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="java" type="462c0819:PsiDirectoryNode" />
-              <item name="websocket" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
@@ -348,7 +409,6 @@
               <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" />
@@ -359,7 +419,6 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="auth" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
@@ -375,43 +434,39 @@
             <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="eureka-server" 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="base-servers" type="462c0819:PsiDirectoryNode" />
-              <item name="eureka-server" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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="base-servers" type="462c0819:PsiDirectoryNode" />
-              <item name="eureka-server" 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="base-servers" type="462c0819:PsiDirectoryNode" />
-              <item name="eureka-server" 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="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="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" />
@@ -419,82 +474,37 @@
             <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" />
-            </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" />
-            </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" />
-            </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" />
-            </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="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="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" />
-              <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" />
               <item name="base-servers" type="462c0819:PsiDirectoryNode" />
-              <item name="gateway-server" 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="gateway-server" 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="gateway-server" type="462c0819:PsiDirectoryNode" />
+              <item name="account" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -502,85 +512,27 @@
               <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="docker" type="462c0819:PsiDirectoryNode" />
+              <item name="sms" 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="sms" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
               <item name="smartschool-platform" type="462c0819:PsiDirectoryNode" />
               <item name="base-servers" type="462c0819:PsiDirectoryNode" />
-              <item name="gateway-server" type="462c0819:PsiDirectoryNode" />
+              <item name="sms" 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="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 />
@@ -610,11 +562,11 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\git\smartschool-platform\base-servers\eureka-server\src\main\resources\config" />
       <recent name="C:\git\smartschool-platform\applications\wechat\wechat-server\src\main" />
       <recent name="C:\git\smartschool-platform\applications\websocket\websocket-server\src\main" />
       <recent name="C:\git\smartschool-platform\applications\websocket\websocket-server\src\main\resources" />
       <recent name="C:\git\smartschool-platform\applications\wechat\wechat-server\src\main\resources" />
-      <recent name="C:\git\smartschool-platform\applications\school\school-server\src\main\docker" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -787,7 +739,7 @@
       <workItem from="1547624296253" duration="4914000" />
       <workItem from="1547630177539" duration="12661000" />
       <workItem from="1547685937807" duration="1100000" />
-      <workItem from="1547688698570" duration="985000" />
+      <workItem from="1547688698570" duration="2557000" />
     </task>
     <task id="LOCAL-00001" summary="删除编译文件">
       <created>1547633261163</created>
@@ -849,7 +801,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="19885000" />
+    <option name="totallyTimeSpent" value="21457000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -866,7 +818,7 @@
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47116968" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.50082374" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
       <window_info id="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="false" show_stripe_button="true" weight="0.23373677" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2473525" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.38879737" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -974,57 +926,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-api/websocket-api.iml">
-      <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>
-      </provider>
-    </entry>
-    <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="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/websocket/websocket-server/src/main/java/com/usoftchina/smartschool/websocket/WebsocketApplication.java">
-      <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>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/applications/school/pom.xml">
-      <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" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/applications/school/school-dto/pom.xml">
-      <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>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/applications/school/school-api/pom.xml">
-      <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>
-      </provider>
-    </entry>
-    <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="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$/applications/wechat/wechat-server/src/main/docker/Dockerfile">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="38">
@@ -1056,21 +957,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/application.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="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/websocket/websocket-server/src/main/docker/Dockerfile">
-      <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>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/docker/Dockerfile">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="95">
@@ -1153,14 +1039,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/applications/school/school-server/src/main/resources/config/application-docker-prod.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="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$/.idea/compiler.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="380">
@@ -1193,14 +1071,6 @@
         </state>
       </provider>
     </entry>
-    <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="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/websocket/websocket-server/src/main/resources/config/application-docker-test.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="111">
@@ -1209,22 +1079,6 @@
         </state>
       </provider>
     </entry>
-    <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="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/src/main/resources/config/application-docker-prod.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <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/wechat/wechat-server/src/main/resources/config/application-docker-test.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="98">
@@ -1281,14 +1135,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/config/application-docker-prod.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="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$/base-servers/gateway-server/src/main/resources/config/application-docker-test.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="114">
@@ -1313,18 +1159,90 @@
         </state>
       </provider>
     </entry>
+    <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="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/app.json">
+      <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" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <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$/pom.xml">
+      <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" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <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="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/eureka-server/src/main/resources/config/config/application-docker.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/config/config/application-docker-dev.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <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-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" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/application.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="475">
+          <caret line="25" column="9" lean-forward="true" selection-start-line="25" selection-start-column="9" selection-end-line="25" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="384">
+          <caret line="135" column="25" lean-forward="false" selection-start-line="135" selection-start-column="25" selection-end-line="135" selection-end-column="25" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/config/application-docker-prod.yml">
+    <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/config/application-docker-prod.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="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" />
+        <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>
@@ -1337,42 +1255,82 @@
         </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/file/file-server/src/main/resources/config/application-docker-prod.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="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$/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="874">
+          <caret line="55" column="103" lean-forward="true" selection-start-line="55" selection-start-column="88" selection-end-line="55" selection-end-column="103" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/resources/application.yml">
+    <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="-1320">
+        <state relative-caret-position="-1140">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <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-dev.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="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$/pom.xml">
+    <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="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$/applications/websocket/websocket-server/src/main/resources/config/application-docker.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="9" selection-end-column="24" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <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="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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/applications/websocket/websocket-server/src/main/resources/config/application-dev.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <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="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$/applications/school/school-server/src/main/resources/config/application-docker-prod.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="353">
+          <caret line="20" column="14" lean-forward="false" selection-start-line="20" selection-start-column="14" selection-end-line="20" selection-end-column="14" />
           <folding />
         </state>
       </provider>

+ 6 - 8
applications/school/school-server/src/main/resources/config/application-docker-prod.yml

@@ -1,23 +1,21 @@
 eureka:
   instance:
-    hostname: saas-sale-server
+    hostname: smartschool-school-server
     prefer-ip-address: false
   client:
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@smartschool-eureka-server:9500/eureka/
 spring:
   rabbitmq:
     host: 10.10.100.103
     port: 5672
-    virtual-host: docker
-    username: saas
+    virtual-host: school
+    username: school
     password: select123***
   datasource:
     url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
-    username: saas
+    username: root
     password: select111***
   redis:
     host: 10.10.100.173
-    port: 6379
-logging:
-  destination: 10.10.100.160:5000
+    port: 6379

+ 1 - 1
applications/websocket/websocket-server/src/main/resources/application.yml

@@ -35,7 +35,7 @@ spring:
     sampler:
       probability: 1.0
   redis:
-    host: 10.1.81.62
+    host: 10.10.100.166
     port: 6379
   profiles:
     active: dev

+ 9 - 11
applications/websocket/websocket-server/src/main/resources/config/application-docker-prod.yml

@@ -1,23 +1,21 @@
 eureka:
   instance:
-    hostname: saas-sale-server
+    hostname: smartschool-websocket-server
     prefer-ip-address: false
   client:
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@smartschool-eureka-server:9500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.166
     port: 5672
-    virtual-host: docker
-    username: saas
+    virtual-host: school
+    username: school
     password: select123***
   datasource:
-    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
-    username: saas
+    url: jdbc:mysql://10.10.100.166:3306/smart_campus?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    username: root
     password: select111***
   redis:
-    host: 10.10.100.173
-    port: 6379
-logging:
-  destination: 10.10.100.160:5000
+    host: 10.10.100.166
+    port: 6379

+ 9 - 11
applications/wechat/wechat-server/src/main/resources/config/application-docker-prod.yml

@@ -1,23 +1,21 @@
 eureka:
   instance:
-    hostname: saas-sale-server
+    hostname: smartschool-wechat-server
     prefer-ip-address: false
   client:
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@smartschool-eureka-server:9500/eureka/
 spring:
   rabbitmq:
-    host: 10.10.100.103
+    host: 10.10.100.166
     port: 5672
-    virtual-host: docker
-    username: saas
+    virtual-host: school
+    username: school
     password: select123***
   datasource:
-    url: jdbc:mysql://10.10.100.18:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
-    username: saas
+    url: jdbc:mysql://10.10.100.166:3306/smart_campus?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    username: root
     password: select111***
   redis:
-    host: 10.10.100.173
-    port: 6379
-logging:
-  destination: 10.10.100.160:5000
+    host: 10.10.100.166
+    port: 6379

+ 5 - 0
base-servers/eureka-server/src/main/resources/config/config/application-docker-dev.yml

@@ -0,0 +1,5 @@
+eureka:
+  instance:
+    hostname: saas-eureka-server-dev
+server:
+  port: 8510

+ 5 - 0
base-servers/eureka-server/src/main/resources/config/config/application-docker-prod.yml

@@ -0,0 +1,5 @@
+eureka:
+  instance:
+    hostname: smartschool-eureka-server
+server:
+  port: 9500

+ 5 - 0
base-servers/eureka-server/src/main/resources/config/config/application-docker-test.yml

@@ -0,0 +1,5 @@
+eureka:
+  instance:
+    hostname: saas-eureka-server-test
+server:
+  port: 8515

+ 5 - 0
base-servers/eureka-server/src/main/resources/config/config/application-docker.yml

@@ -0,0 +1,5 @@
+eureka:
+  instance:
+    hostname: saas-eureka-server
+server:
+  port: 8500

+ 3 - 19
base-servers/file/file-server/src/main/resources/config/application-docker-prod.yml

@@ -1,26 +1,10 @@
 eureka:
   instance:
-    hostname: saas-file-server
+    hostname: smartschool-file-server
     prefer-ip-address: false
   client:
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
-spring:
-  rabbitmq:
-    host: 10.10.100.103
-    port: 5672
-    virtual-host: docker
-    username: saas
-    password: select123***
-  datasource:
-    url: jdbc:mysql://10.10.100.18:3306/saas_file?characterEncoding=utf-8&useSSL=false
-    username: saas
-    password: select111***
-  redis:
-    host: 10.10.100.173
-    port: 6379
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@smartschool-eureka-server:9500/eureka/
 fdfs:
   tracker-list:
-    - 10.10.100.200:22122
-logging:
-  destination: 10.10.100.160:5000
+    - 10.10.100.200:22122

+ 2 - 84
base-servers/gateway-server/src/main/resources/application.yml

@@ -32,20 +32,14 @@ spring:
         locator:
           enabled: true
       routes:
-      - id: UI-SERVER
-        uri: lb://UI-SERVER
-        predicates:
-        - Path=/api/ui/**
-        filters:
-        - RewritePath=/api/ui/(?<segment>.*), /$\{segment}
       - id: ACCOUNT-SERVER
         uri: lb://ACCOUNT-SERVER
         predicates:
         - Path=/api/account/**
         filters:
         - RewritePath=/api/account/(?<segment>.*), /$\{segment}
-      - id: AUTH-SERVER
-        uri: lb://AUTH-SERVER
+      - id: SCHOOL-SERVER
+        uri: lb://SCHOOL-SERVER
         predicates:
         - Path=/api/auth/**
         filters:
@@ -68,64 +62,6 @@ spring:
         - Path=/api/sms/**
         filters:
         - RewritePath=/api/sms/(?<segment>.*), /$\{segment}
-      - id: PURCHASE-SERVER
-        uri: lb://PURCHASE-SERVER
-        predicates:
-        - Path=/api/purchase/**
-        filters:
-        - RewritePath=/api/purchase/(?<segment>.*), /$\{segment}
-      - id: SALE-SERVER
-        uri: lb://SALE-SERVER
-        predicates:
-        - Path=/api/sale/**
-        filters:
-        - RewritePath=/api/sale/(?<segment>.*), /$\{segment}
-      - id: STORAGE-SERVER
-        uri: lb://STORAGE-SERVER
-        predicates:
-        - Path=/api/storage/**
-        filters:
-        - RewritePath=/api/storage/(?<segment>.*), /$\{segment}
-      - id: DOCUMENT-SERVER
-        uri: lb://DOCUMENT-SERVER
-        predicates:
-        - Path=/api/document/**
-        filters:
-        - RewritePath=/api/document/(?<segment>.*), /$\{segment}
-      - id: MONEY-SERVER
-        uri: lb://MONEY-SERVER
-        predicates:
-        - Path=/api/money/**
-        filters:
-        - RewritePath=/api/money/(?<segment>.*), /$\{segment}
-      - id: COMMONS-SERVER
-        uri: lb://COMMONS-SERVER
-        predicates:
-        - Path=/api/commons/**
-        filters:
-        - RewritePath=/api/commons/(?<segment>.*), /$\{segment}
-      - id: SOCKET-SERVER
-        uri: lb:ws://SOCKET-SERVER
-        predicates:
-        - Path=/ws/**
-      - id: OPERATION-AUTH-SERVER
-        uri: lb://OPERATION-AUTH-SERVER
-        predicates:
-        - Path=/api/oper_auth/**
-        filters:
-        - RewritePath=/api/oper_auth/(?<segment>.*), /$\{segment}
-      - id: OPERATION-SERVER
-        uri: lb://OPERATION-SERVER
-        predicates:
-        - Path=/api/operation/**
-        filters:
-        - RewritePath=/api/operation/(?<segment>.*), /$\{segment}
-      - id: TRANSFERS-SERVER
-        uri: lb://TRANSFERS-SERVER
-        predicates:
-        - Path=/api/open/**
-        filters:
-        - RewritePath=/api/open/(?<segment>.*), /$\{segment}
   redis:
     host: 10.10.100.166
     port: 6379
@@ -198,21 +134,3 @@ auth:
   expire: 18000
   ignores:
     - /api/auth/authorize
-    - /api/auth/virtual/authorize/**
-    - /api/auth/sso/callback/**
-    - /api/account/account/register
-    - /api/auth/info
-    - /ws/**
-    - /api/file/download
-    - /api/commons/excel/import/templet
-    - /api/commons/share/valid/**
-    - /api/commons/share/weixin/ticket
-    - /api/commons/share/getSmsCode
-    - /api/commons/share/submit
-    - /api/account/role/list/**
-    - /api/account/account/share/join
-    - /api/oper_auth/authorize
-    - /api/open/**
-  cookie:
-    name: uid
-    secret-key: 0taQcW073Z7G628g5H

+ 2 - 14
base-servers/gateway-server/src/main/resources/config/application-docker-prod.yml

@@ -1,19 +1,7 @@
 eureka:
   instance:
-    hostname: saas-gateway-server
+    hostname: smartschool-gateway-server
     prefer-ip-address: false
   client:
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/
-spring:
-  rabbitmq:
-    host: 10.10.100.103
-    port: 5672
-    virtual-host: docker
-    username: saas
-    password: select123***
-  redis:
-    host: 10.10.100.173
-    port: 6379
-logging:
-  destination: 10.10.100.160:5000
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@smartschool-eureka-server:9500/eureka/