Browse Source

README文档

guq 7 years ago
parent
commit
b91cd7bc07

+ 98 - 190
.idea/workspace.xml

@@ -1,58 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="980ddd15-b0f5-453d-b57f-9e0d36b01ada" name="Default" comment="初始化">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/applications/websocket/websocket-server/src/main/docker/Dockerfile" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/applications/wechat/wechat-server/src/main/docker/Dockerfile" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-dto/target/classes/com/usoftchina/smartschool/file/dto/BaseFileInfo.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-dto/target/classes/com/usoftchina/smartschool/file/dto/FileInfoDTO.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-dto/target/classes/com/usoftchina/smartschool/file/dto/FolderDTO.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-dto/target/classes/com/usoftchina/smartschool/file/dto/FolderSaveDTO.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-server/target/classes/application.yml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-server/target/classes/com/usoftchina/smartschool/file/FileApplication.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-server/target/classes/com/usoftchina/smartschool/file/constant/FileConstant.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-server/target/classes/com/usoftchina/smartschool/file/constant/FileType.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-server/target/classes/com/usoftchina/smartschool/file/controller/FileController.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-server/target/classes/com/usoftchina/smartschool/file/mapper/FileInfoMapper.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-server/target/classes/com/usoftchina/smartschool/file/po/FileInfo$Builder.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-server/target/classes/com/usoftchina/smartschool/file/po/FileInfo.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-server/target/classes/com/usoftchina/smartschool/file/service/FileInfoService.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-server/target/classes/com/usoftchina/smartschool/file/service/impl/FileInfoServiceImpl.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-server/target/classes/com/usoftchina/smartschool/file/util/FileTypeUtils.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-server/target/classes/config/application-docker-dev.yml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-server/target/classes/config/application-docker-prod.yml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-server/target/classes/config/application-docker-test.yml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-server/target/classes/config/application-docker.yml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-server/target/classes/i18n/messages_en_US.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-server/target/classes/i18n/messages_zh_CN.properties" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-server/target/classes/logback-spring.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/file/file-server/target/classes/mapper/FileInfoMapper.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/application.yml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/auth/pub.key" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/banner.txt" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/com/usoftchina/smartschool/gateway/GatewayApplication.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/com/usoftchina/smartschool/gateway/config/AuthConfig.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/com/usoftchina/smartschool/gateway/config/CookieConfig.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/com/usoftchina/smartschool/gateway/config/ErrorConfig.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/com/usoftchina/smartschool/gateway/config/WebConfig.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/com/usoftchina/smartschool/gateway/context/SpringContextListener.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/com/usoftchina/smartschool/gateway/error/MyExceptionAdvice.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/com/usoftchina/smartschool/gateway/error/MyExceptionHandler.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/com/usoftchina/smartschool/gateway/interceptor/ServiceFeignInterceptor.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/com/usoftchina/smartschool/gateway/util/AntPathRequestMatcher$1.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/com/usoftchina/smartschool/gateway/util/AntPathRequestMatcher$Matcher.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/com/usoftchina/smartschool/gateway/util/AntPathRequestMatcher$SpringAntMatcher.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/com/usoftchina/smartschool/gateway/util/AntPathRequestMatcher$SubpathMatcher.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/com/usoftchina/smartschool/gateway/util/AntPathRequestMatcher.class" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/config/application-docker-dev.yml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/config/application-docker-prod.yml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/config/application-docker-test.yml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/config/application-docker.yml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/gateway-server/target/classes/logback-spring.xml" afterPath="" />
+    <list default="true" id="980ddd15-b0f5-453d-b57f-9e0d36b01ada" name="Default" comment="">
+      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/eureka-server/target/classes/application.yml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/eureka-server/target/classes/banner.txt" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/eureka-server/target/classes/com/usoftchina/smartschool/eureka/EurekaApplication.class" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/eureka-server/target/classes/com/usoftchina/smartschool/eureka/config/WebSecurityConfig.class" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/base-servers/eureka-server/target/classes/logback-spring.xml" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/applications/school/school-api/pom.xml" afterPath="$PROJECT_DIR$/applications/school/school-api/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/base-servers/eureka-server/pom.xml" afterPath="$PROJECT_DIR$/base-servers/eureka-server/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/base-servers/eureka-server/target/classes/application.yml" afterPath="$PROJECT_DIR$/base-servers/eureka-server/target/classes/application.yml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -140,51 +96,54 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Dockerfile" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Dockerfile" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/docker/Dockerfile">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="38">
-              <caret line="2" column="15" lean-forward="false" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
+            <state relative-caret-position="95">
+              <caret line="5" column="34" lean-forward="false" selection-start-line="5" selection-start-column="34" selection-end-line="5" selection-end-column="34" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/pom.xml">
+      <file leaf-file-name="bootstrap.json" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/frontend/pc-web/bootstrap.json">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="209">
-              <caret line="11" column="30" lean-forward="true" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="30" />
+            <state relative-caret-position="0">
+              <caret line="0" column="19086" lean-forward="false" selection-start-line="0" selection-start-column="19086" selection-end-line="0" selection-end-column="19086" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
       <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/base-servers/pom.xml">
+        <entry file="file://$PROJECT_DIR$/pom.xml">
           <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="456">
+              <caret line="24" column="22" lean-forward="false" selection-start-line="24" selection-start-column="22" selection-end-line="24" selection-end-column="22" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
-        <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="228">
-              <caret line="150" column="99" lean-forward="false" selection-start-line="150" selection-start-column="99" selection-end-line="150" selection-end-column="99" />
-              <folding />
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SECOND">
+              <first_editor relative-caret-position="2223">
+                <caret line="117" column="0" lean-forward="false" selection-start-line="117" selection-start-column="0" selection-end-line="117" selection-end-column="0" />
+                <folding />
+              </first_editor>
+              <second_editor />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="application-docker.yml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/src/main/resources/config/application-docker.yml">
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="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="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>
@@ -193,8 +152,8 @@
       <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/base-servers/eureka-server/src/main/resources/application.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="66">
-              <caret line="18" column="9" lean-forward="true" selection-start-line="18" selection-start-column="9" selection-end-line="18" selection-end-column="9" />
+            <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>
@@ -222,12 +181,12 @@
       <find>1.0-SNAPSHOT</find>
       <find>docker-maven-plugin</find>
       <find>com.usoftchina.saas.file.po.FileInfo</find>
-      <find>saas</find>
       <find>school-dto</find>
+      <find>saas</find>
     </findStrings>
     <replaceStrings>
-      <replace>1.0.0-SNAPSHOT</replace>
       <replace>smartschool</replace>
+      <replace>1.0.0-SNAPSHOT</replace>
     </replaceStrings>
   </component>
   <component name="Git.Settings">
@@ -241,7 +200,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/java/com/usoftchina/smartschool/file/service/FileInfoService.java" />
         <option value="$PROJECT_DIR$/base-servers/file/file-dto/src/main/java/com/usoftchina/smartschool/file/dto/BaseFileInfo.java" />
         <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" />
@@ -292,6 +250,7 @@
         <option value="$PROJECT_DIR$/base-servers/eureka-server/pom.xml" />
         <option value="$PROJECT_DIR$/base-servers/gateway-server/src/main/docker/Dockerfile" />
         <option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/docker/Dockerfile" />
+        <option value="$PROJECT_DIR$/README.md" />
       </list>
     </option>
   </component>
@@ -315,7 +274,17 @@
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand />
+      <expand>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="smartschool-platform" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+        </path>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="smartschool-platform" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+          <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
+        </path>
+      </expand>
       <select />
     </treeState>
   </component>
@@ -343,8 +312,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scratches" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -687,46 +655,12 @@
               <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="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-            </path>
-            <path>
-              <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="Maven: org.springframework.cloud:spring-cloud-netflix-eureka-client:2.0.1.RELEASE" type="70bed36:NamedLibraryElementNode" />
-            </path>
-            <path>
-              <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="Maven: org.springframework.cloud:spring-cloud-netflix-eureka-client:2.0.1.RELEASE" type="70bed36:NamedLibraryElementNode" />
-              <item name="spring-cloud-netflix-eureka-client-2.0.1.RELEASE.jar" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="Maven: org.springframework.cloud:spring-cloud-netflix-eureka-client:2.0.1.RELEASE" type="70bed36:NamedLibraryElementNode" />
-              <item name="spring-cloud-netflix-eureka-client-2.0.1.RELEASE.jar" type="462c0819:PsiDirectoryNode" />
-              <item name="netflix" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="smartschool-platform" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="Maven: org.springframework.cloud:spring-cloud-netflix-eureka-client:2.0.1.RELEASE" type="70bed36:NamedLibraryElementNode" />
-              <item name="spring-cloud-netflix-eureka-client-2.0.1.RELEASE.jar" type="462c0819:PsiDirectoryNode" />
-              <item name="netflix" type="462c0819:PsiDirectoryNode" />
-              <item name="eureka" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
+      <pane id="Scratches" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -936,7 +870,8 @@
       <option name="presentableId" value="Default" />
       <updated>1547624293267</updated>
       <workItem from="1547624296253" duration="4914000" />
-      <workItem from="1547630177539" duration="11854000" />
+      <workItem from="1547630177539" duration="12661000" />
+      <workItem from="1547685937807" duration="857000" />
     </task>
     <task id="LOCAL-00001" summary="删除编译文件">
       <created>1547633261163</created>
@@ -973,32 +908,36 @@
       <option name="project" value="LOCAL" />
       <updated>1547645902624</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="初始化">
+      <created>1547646691913</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1547646691913</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="16768000" />
+    <option name="totallyTimeSpent" value="18432000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3294893" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <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&#9;" 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" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.30484116" sideWeight="0.49041095" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.57990116" sideWeight="0.81240547" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27182865" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42339373" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47116968" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3756178" 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.5930807" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2677761" 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.08850227" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.38879737" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25340393" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -1010,11 +949,13 @@
       <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" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45688352" sideWeight="0.509589" order="9" side_tool="true" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.38879737" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
@@ -1066,29 +1007,10 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/framework/server-starter/src/main/java/com/usoftchina/smartschool/server/context/SpringContextListener.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="8" column="18" lean-forward="false" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="266">
-          <caret line="14" column="8" lean-forward="false" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="8" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/java/com/usoftchina/smartschool/file/controller/FileController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="151">
           <caret line="48" column="14" lean-forward="false" selection-start-line="48" selection-start-column="14" selection-end-line="48" selection-end-column="14" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1104,7 +1026,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="190">
           <caret line="18" column="18" lean-forward="false" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="18" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1112,17 +1033,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="50">
           <caret line="110" column="15" lean-forward="false" selection-start-line="110" selection-start-column="15" selection-end-line="110" selection-end-column="15" />
-          <folding>
-            <marker date="1547642461703" expanded="true" signature="371:1011" ph="insert into f_fileinfo... " />
-            <marker date="1547642461703" expanded="true" signature="4292:4961" ph="update f_fil... " />
-            <marker date="1547642461703" expanded="true" signature="5090:6858" ph="update f_fil... " />
-            <marker date="1547642461703" expanded="true" signature="6949:6986" ph="delete from " />
-            <marker date="1547642461703" expanded="true" signature="8752:8820" ph="select from f_fileinfo" />
-            <marker date="1547642461703" expanded="true" signature="8937:9018" ph="select from f_fileinfo" />
-            <marker date="1547642461703" expanded="true" signature="9133:9226" ph="select from f_fileinfo" />
-            <marker date="1547642461703" expanded="true" signature="9348:9467" ph="select from f_fileinfo" />
-            <marker date="1547642461703" expanded="true" signature="9589:9707" ph="select from f_fileinfo" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1130,7 +1040,6 @@
       <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>
@@ -1154,7 +1063,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-171">
           <caret line="36" column="23" lean-forward="false" selection-start-line="36" selection-start-column="23" selection-end-line="36" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1162,7 +1070,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="228">
           <caret line="12" column="99" lean-forward="false" selection-start-line="12" selection-start-column="99" selection-end-line="12" selection-end-column="99" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1178,7 +1085,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="209">
           <caret line="11" column="99" lean-forward="false" selection-start-line="11" selection-start-column="99" selection-end-line="11" selection-end-column="99" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1186,7 +1092,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="152">
           <caret line="62" column="12" lean-forward="false" selection-start-line="62" selection-start-column="12" selection-end-line="62" selection-end-column="12" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1194,7 +1099,6 @@
       <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>
@@ -1202,7 +1106,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="209">
           <caret line="11" column="99" lean-forward="false" selection-start-line="11" selection-start-column="99" selection-end-line="11" selection-end-column="99" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1210,7 +1113,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="38">
           <caret line="2" column="16" lean-forward="false" selection-start-line="2" selection-start-column="16" selection-end-line="2" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1226,11 +1128,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="285">
           <caret line="15" column="19" lean-forward="false" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#740#741#0" expanded="true" />
-            <element signature="e#808#809#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1238,7 +1135,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="266">
           <caret line="14" column="9" lean-forward="false" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1254,7 +1150,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="209">
           <caret line="202" column="9" lean-forward="false" selection-start-line="202" selection-start-column="9" selection-end-line="202" selection-end-column="9" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1288,7 +1183,6 @@
       <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>
@@ -1316,19 +1210,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="456">
-          <caret line="24" column="22" lean-forward="false" selection-start-line="24" selection-start-column="22" selection-end-line="24" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <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" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1336,7 +1221,6 @@
       <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" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1380,7 +1264,6 @@
       <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>
@@ -1396,7 +1279,6 @@
       <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>
@@ -1428,13 +1310,12 @@
       <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/gateway-server/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
+        <state relative-caret-position="2850">
           <caret line="150" column="99" lean-forward="false" selection-start-line="150" selection-start-column="99" selection-end-line="150" selection-end-column="99" />
           <folding />
         </state>
@@ -1442,8 +1323,8 @@
     </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="66">
-          <caret line="18" column="9" lean-forward="true" selection-start-line="18" selection-start-column="9" selection-end-line="18" selection-end-column="9" />
+        <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>
@@ -1467,7 +1348,7 @@
     <entry file="file://$PROJECT_DIR$/base-servers/gateway-server/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="209">
-          <caret line="11" column="30" lean-forward="true" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="30" />
+          <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>
@@ -1490,12 +1371,39 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/base-servers/file/file-server/src/main/docker/Dockerfile">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="38">
-          <caret line="2" column="15" lean-forward="false" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
+        <state relative-caret-position="95">
+          <caret line="5" column="34" lean-forward="false" selection-start-line="5" selection-start-column="34" selection-end-line="5" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/pc-web/bootstrap.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="19086" lean-forward="false" selection-start-line="0" selection-start-column="19086" selection-end-line="0" selection-end-column="19086" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="456">
+          <caret line="24" column="22" lean-forward="false" selection-start-line="24" selection-start-column="22" selection-end-line="24" selection-end-column="22" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SECOND">
+          <first_editor relative-caret-position="2223">
+            <caret line="117" column="0" lean-forward="false" selection-start-line="117" selection-start-column="0" selection-end-line="117" selection-end-column="0" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

+ 24 - 131
README.md

@@ -4,58 +4,34 @@
 ├─saas-platform
 │  │  
 │  ├─applications-----------------------------业务应用
-│  |  ├─commons-------------------------------业务通用
-│  |  |  |─commons-api------------------------业务通用api
-│  |  |  |─commons-com.usoftchina.smartschool.file.dto------------------------业务通用数据传输对象
-│  |  |  |─commons-server---------------------业务通用服务
-│  |  ├─document------------------------------基础资料
-│  |  |  |─document-api-----------------------基础资料api
-│  |  |  |─document-com.usoftchina.smartschool.file.dto-----------------------基础资料数据传输对象
-│  |  |  |─document-server--------------------基础资料服务
-│  |  ├─money---------------------------------资金
-│  |  |  |─money-api--------------------------资金服务api
-│  |  |  |─money-com.usoftchina.smartschool.file.dto--------------------------资金服务数据传输对象
-│  |  |  |─money-server-----------------------资金服务
-│  |  ├─purchase------------------------------采购
-│  |  |  |─purchase-api-----------------------采购服务api
-│  |  |  |─purchase-com.usoftchina.smartschool.file.dto-----------------------采购服务数据传输对象
-│  |  |  |─purchase-server--------------------采购服务
-│  |  ├─sale----------------------------------销售
-│  |  |  |─sale-com.usoftchina.smartschool.file.dto---------------------------销售服务数据传输对象
-│  |  |  |─sale-server------------------------销售服务
-│  |  ├─storage-------------------------------库存
-│  |  |  |─storage-api------------------------库存服务api
-│  |  |  |─storage-com.usoftchina.smartschool.file.dto------------------------库存服务数据传输对象
-│  |  |  |─storage-server---------------------库存服务
+│  |  ├─school-------------------------------后台业务
+│  |  |  |─school-api------------------------后台业务api
+│  |  |  |─school.dto------------------------后台通用数据传输对象
+│  |  |  |─school-server---------------------后台通用服务
+│  |  ├─websocket------------------------------设备集成服务
+│  |  |  |─websocket-api-----------------------设备集成服务api
+│  |  |  |─websocket.dto-----------------------设备集成服务数据传输对象
+│  |  |  |─websocket-server--------------------设备集成服务
+│  |  ├─wechat---------------------------------微信集成模块
+│  |  |  |─wechat-api--------------------------微信集成api
+│  |  |  |─wechatdto--------------------------微信集成数据传输对象
+│  |  |  |─wechat-server-----------------------微信集成服务
 │  │ 
 │  ├─base-servers-----------------------------基础服务
-│  |  ├─admin-server--------------------------spring-boot-admin监控中心
 │  |  ├─account-------------------------------账户中心
 │  |  |  |─account-api------------------------账户中心api
-│  |  |  |─account-com.usoftchina.smartschool.file.dto------------------------账户中心数据传输对象
+│  |  |  |─account-dto------------------------账户中心数据传输对象
 │  |  |  |─account-server---------------------账户中心服务
-│  |  ├─auth----------------------------------鉴权中心
-│  |  |  |─auth-api---------------------------鉴权中心api
-│  |  |  |─auth-client------------------------鉴权中心客户端
-│  |  |  |─auth-common------------------------鉴权中心公共包
-│  |  |  |─auth-com.usoftchina.smartschool.file.dto---------------------------鉴权中心数据传输对象
-│  |  |  |─auth-server------------------------鉴权中心服务
 │  |  ├─eureka-server-------------------------服务注册中心
 │  |  ├─file----------------------------------文件服务
 │  |  |  |─file-api---------------------------文件服务api
-│  |  |  |─file-com.usoftchina.smartschool.file.dto---------------------------文件服务数据传输对象
+│  |  |  |─file-dto---------------------------文件服务数据传输对象
 │  |  |  |─file-server------------------------文件服务
-│  |  ├─com.usoftchina.smartschool.gateway-server------------------------统一网关
-│  |  ├─mail----------------------------------邮件服务
-│  |  |  |─mail-api---------------------------邮件服务api
-│  |  |  |─mail-com.usoftchina.smartschool.file.dto---------------------------邮件服务数据传输对象
-│  |  |  |─mail-server------------------------邮件服务
+│  |  ├─gateway-server------------------------统一网关
 │  |  ├─sms-----------------------------------短信服务
 │  |  |  |─sms-api----------------------------短信服务api
-│  |  |  |─sms-com.usoftchina.smartschool.file.dto----------------------------短信服务数据传输对象
+│  |  |  |─sms-dto----------------------------短信服务数据传输对象
 │  |  |  |─sms-server-------------------------短信服务
-│  |  ├─ui-server-----------------------------UI配置服务
-│  |  ├─zipkin-server-------------------------zipkin分布式服务链路跟踪
 │  │ 
 │  ├─doc--------------------------------------项目文档
 │  │
@@ -65,9 +41,8 @@
 │  |  ├─test-starter--------------------------测试启动辅助工具
 │  │
 │  ├─frontend---------------------------------前端
-│  |  ├─saas-portal-web-----------------------门户前端
-│  |  ├─saas-web------------------------------系统前端(extjs)
-│  |  ├─web-----------------------------------系统前端(vue + element-ui)
+│  |  ├─wechat-web-----------------------微信前端
+│  |  ├─pc-web------------------------------后台系统前端(extjs)
 │  │ 
 │  ├─script-----------------------------------脚本
 │  |  ├─mysql---------------------------------mysql脚本
@@ -81,19 +56,16 @@
 
 | 数据库      | 类型   | 地址   |  账号  |  密码  |  说明  |
 | --------   | :-----: | :-----:  | :----:  | :----: | :------  |
-| saas_account | mysql | 10.1.81.79:3306 |  root  | select111*** |  账户中心  |
-| saas_auth | mysql | 10.1.81.79:3306 |  root  | select111*** |  鉴权系统  |
-| saas_file | mysql | 10.1.81.79:3306 |  root  | select111*** |  文件系统  |
-| saas_mail | mysql | 10.1.81.79:3306 |  root  | select111*** |  邮件系统  |
-| saas_biz | mysql | 10.1.81.79:3306 |  root  | select111*** |  业务系统  |
-| saas_ui | mongo | 10.1.81.63:27017 |    |  |  UI配置  |
+| smart_campus | mysql | 10.10.100.166:3306  |  root  | select111*** |  账户中心  |
+
 
 > 中间件
 
 | 类型 | 地址 | 账号 | 密码 | 说明 |
 | ---- | :----: | :----: | :----: | ---- |
-| rabbitmq | 10.1.81.75:5672 | saas | select123*** | 消息中间件 [控制台](http://10.1.81.75:15672)|
-| redis | 10.1.81.62:6379 | | | 内存数据库 |
+| rabbitmq | 10.10.100.166:5672 | school | select123*** | 
+消息中间件 [控制台](http://10.10.100.166:15672)|
+| redis | 10.10.100.166:6379 | | | 内存数据库 |
 
 
 > 服务器
@@ -116,12 +88,6 @@
 
 * [jenkins](http://10.1.81.61:8080/job/saas/view/dev) **账号** admin **密码** select123***
 
-> 日志
-
-* [kibana](http://10.1.81.1:5601)
-* [logstash](tcp://10.1.81.1:5000)
-* [elasticsearch](http://10.1.81.1:9200/_search?pretty)
-
 > 服务
 
 * [eureka http://10.1.81.61:8500](http://10.1.81.61:8500) **账号** admin **密码** select111***
@@ -148,77 +114,4 @@
 
 > 构建
 
-* [jenkins](http://10.1.81.61:8080/job/saas/view/test) **账号** admin **密码** select123***
-
-> 服务
-
-* [eureka http://10.1.81.61:8515](http://10.1.81.61:8515) **账号** admin **密码** select111***
-* [com.usoftchina.smartschool.gateway http://10.1.81.61:8575](http://10.1.81.61:8575)
-* [admin http://10.1.81.61:8535](http://10.1.81.61:8535) **账号** admin **密码** select111***
-* [zipkin http://10.1.81.61:8555](http://10.1.81.61:8555) **账号** admin **密码** select111***
-
-> 访问
-
-* [门户 https://saas-test.usoftchina.com:5443](https://saas-test.usoftchina.com:5443)
-* [系统 https://trade-test.usoftchina.com:5443](https://trade-test.usoftchina.com:5443)
-* [打印 https://saas-report-dev.usoftchina.com:5443](https://saas-report-dev.usoftchina.com:5443)
-* [接口 https://saas-api-test.usoftchina.com:5443](https://saas-api-test.usoftchina.com:5443)
-
-# 生产环境
-
-> 数据库
-
-| 数据库      | 类型   | 地址   |  账号  |  密码  |  说明  |
-| --------   | :-----: | :-----:  | :----:  | :----: | :------  |
-| saas_account | mysql | 10.10.100.18:3306 |  saas  | select111*** |  账户中心  |
-| saas_auth | mysql | 10.10.100.18:3306 |  saas  | select111*** |  鉴权系统  |
-| saas_file | mysql | 10.10.100.18:3306 |  saas  | select111*** |  文件系统  |
-| saas_mail | mysql | 10.10.100.18:3306 |  saas  | select111*** |  邮件系统  |
-| saas_biz | mysql | 10.10.100.18:3306 |  saas  | select111*** |  业务系统  |
-| saas_ui | mongo | 10.10.100.123:27017 |    |  |  UI配置  |
-
-> 中间件
-
-| 类型 | 地址 | 账号 | 密码 | 说明 |
-| ---- | :----: | :----: | :----: | ---- |
-| rabbitmq | 10.10.100.103:5672 | saas | select123*** | 消息中间件 [控制台](http://10.10.100.103:15672)|
-| redis | 10.10.100.173:6379 | | | 内存数据库 |
-
-
-> 服务器
-
-| IP      |  账号  |  密码  |  环境  |  资源  |
-| --------   | :----:  | :----: | :------:  | :------:  |
-| 10.10.100.103 |  centos  | mykey.key |  CentOS6, RabbitMQ  | Cpu: 4, Mem: 8G, Disk: 35G |
-| 10.10.100.123 |  centos  | mykey.key |  CentOS6, MongoDB  | Cpu: 8, Mem: 8G, Disk: 60G |
-| 10.10.100.127 |  centos  | mykey.key |  CentOS6, Nginx  | Cpu: 4, Mem: 8G, Disk: 35G |
-| 10.10.100.160 |  centos  | mykey.key |  CentOS6, ELK  | Cpu: 8, Mem: 8G, Disk: 60G |
-| 10.10.100.173 |  centos  | mykey.key |  CentOS6, Redis  | Cpu: 4, Mem: 8G, Disk: 35G |
-| 10.10.100.23 |  root  | 62cddbcc624b1b072d84117cc0e5a4db |  CentOS7, Docker  | Cpu: 40, Mem: 128G, Disk: 800G |
-| 10.10.100.24 |  root  | 4fd19c28ee472ef9ebc3c06de9277c1b |  CentOS7, Docker  | Cpu: 40, Mem: 128G, Disk: 800G |
-| 10.10.100.25 |  root  | 61a12a65cd42ef77a52dfef8e436bacc |  CentOS7, Docker  | Cpu: 40, Mem: 128G, Disk: 800G |
-| 10.10.100.26 |  root  | 8743e445c7a308edf4588b7997b21c73 |  CentOS7, Docker  | Cpu: 40, Mem: 128G, Disk: 800G |
-
-> 构建
-
-* [jenkins](http://10.10.100.200:5001/job/saas/job/prod) **账号** admin **密码** select123***
-
-> 日志
-
-* [kibana](http://10.10.100.160:5601)
-* [logstash](tcp://10.10.100.160:5000)
-* [elasticsearch](http://10.10.100.160:9200/_search?pretty)
-
-> 服务
-
-* [eureka http://10.10.100.23:8500](http://10.10.100.23:8500) **账号** admin **密码** select111***
-* [com.usoftchina.smartschool.gateway http://10.10.100.23:8560](https://saas-api.usoftchina.com)
-* [admin](http://10.10.100.23:8520) **账号** admin **密码** select111***
-* [zipkin](http://10.10.100.23:8540) **账号** admin **密码** select111***
-
-> 访问
-
-* [门户 https://saas.usoftchina.com](https://saas.usoftchina.com)
-* [系统 https://trade.usoftchina.com](https://trade.usoftchina.com)
-* [打印 https://saas-report.usoftchina.com](https://saas-report.usoftchina.com)
-* [接口 https://saas-api.usoftchina.com](https://saas-api.usoftchina.com)
+* [jenkins](http://10.10.100.200:5001/job/school/) **账号** admin **密码** select123***

+ 0 - 33
base-servers/eureka-server/target/classes/application.yml

@@ -1,33 +0,0 @@
-spring:
-  application:
-    name: eureka-server
-  security:
-    user:
-      name: admin
-      password: select111***
-eureka:
-  server:
-    enable-self-preservation: false
-  instance:
-    status-page-url-path: /actuator/info
-    health-check-url-path: /actuator/health
-    home-page-url-path: /
-    hostname: localhost
-    metadata-map:
-      user.name: ${spring.security.user.name}
-      user.password: ${spring.security.user.password}
-  client:
-    register-with-eureka: false
-    fetch-registry: false
-    service-url:
-      defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
-server:
-  port: 9500
-  tomcat:
-    uri-encoding: UTF-8
-info:
-  name: 'eureka-server'
-  description: 'smartschool-platform'
-  version: '1.0.0-SNAPSHOT'
-  spring-boot-version: '2.0.4.RELEASE'
-  spring-cloud-version: 'Finchley.SR1'

+ 0 - 15
base-servers/eureka-server/target/classes/banner.txt

@@ -1,15 +0,0 @@
-${AnsiColor.BRIGHT_YELLOW}
-
-88        88   ad88888ba     ,ad8888ba,    88888888888  888888888888  ,ad8888ba,   88        88  88  888b      88         db
-88        88  d8"     "8b   d8"'    `"8b   88                88      d8"'    `"8b  88        88  88  8888b     88        d88b
-88        88  Y8,          d8'        `8b  88                88     d8'            88        88  88  88 `8b    88       d8'`8b
-88        88  `Y8aaaaa,    88          88  88aaaaa           88     88             88aaaaaaaa88  88  88  `8b   88      d8'  `8b
-88        88    `"""""8b,  88          88  88"""""           88     88             88""""""""88  88  88   `8b  88     d8YaaaaY8b
-88        88          `8b  Y8,        ,8P  88                88     Y8,            88        88  88  88    `8b 88    d8""""""""8b
-Y8a.    .a8P  Y8a     a8P   Y8a.    .a8P   88                88      Y8a.    .a8P  88        88  88  88     `8888   d8'        `8b
- `"Y8888Y"'    "Y88888P"     `"Y8888Y"'    88                88       `"Y8888Y"'   88        88  88  88      `888  d8'          `8b
-
-
-Application Version: ${application.version}${application.formatted-version}
-Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
-${AnsiColor.DEFAULT}

BIN
base-servers/eureka-server/target/classes/com/usoftchina/smartschool/eureka/EurekaApplication.class


BIN
base-servers/eureka-server/target/classes/com/usoftchina/smartschool/eureka/config/WebSecurityConfig.class


+ 0 - 130
base-servers/eureka-server/target/classes/logback-spring.xml

@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml" />
-    <jmxConfigurator/>
-
-    <!--
-    %m
-    输出代码中指定的消息
-    %p
-    输出优先级,即DEBUG,INFO,WARN,ERROR,FATAL
-    %r
-    输出自应用启动到输出该log信息耗费的毫秒数
-    %c
-    输出所属的类目,通常就是所在类的全名
-    %t
-    输出产生该日志事件的线程名
-    %n
-    输出一个回车换行符,Windows平台为“\r\n”,Unix平台为“\n”
-    %d
-    输出日志时间点的日期或时间,默认格式为ISO8601,也可以在其后指定格式,比如:%d{yyy MMM dd HH:mm:ss,SSS},
-    输出类似:2002年10月18日 22:10:28,921
-    %l
-    输出日志事件的发生位置,包括类目名、发生的线程,以及在代码中的行数。举例:Testlog4.main(TestLog4.java:10)
-    -->
-
-    <springProperty scope="context" name="log.path" source="logging.path" defaultValue="/var/log/smartschool/eureka-server"/>
-    <springProperty scope="context" name="spring.application.name" source="spring.application.name" defaultValue="eureka-server"/>
-    <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
-    <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
-    <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-    <springProperty scope="context" name="log.destination" source="logging.destination" defaultValue="10.1.81.1:5000"/>
-
-    <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
-
-    <appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>${log.level.console}</level>
-        </filter>
-        <encoder>
-            <pattern>${common-pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="ROOT_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/root.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/%d{yyyy-MM}/root-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
-            <maxFileSize>128MB</maxFileSize>
-            <maxHistory>7</maxHistory>
-            <totalSizeCap>20GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${common-pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- Appender to log in a JSON format -->
-    <appender name="JSON_APPENDER" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>${log.destination}</destination>
-        <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
-            <providers>
-                <pattern>
-                    <pattern>
-                        {
-                        "severity": "%level",
-                        "service": "${spring.application.name:-}",
-                        "trace": "%X{X-B3-TraceId:-}",
-                        "span": "%X{X-B3-SpanId:-}",
-                        "parent": "%X{X-B3-ParentSpanId:-}",
-                        "exportable": "%X{X-Span-Export:-}",
-                        "pid": "${PID:-}",
-                        "thread": "%thread",
-                        "class": "%logger{40}",
-                        "rest": "%message"
-                        }
-                    </pattern>
-                </pattern>
-            </providers>
-        </encoder>
-    </appender>
-
-    <logger name="org.springframework" level="INFO"/>
-    <logger name="com.usoftchina.smartschool" level="INFO"/>
-
-    <springProfile name="dev">
-        <root level="INFO">
-            <appender-ref ref="CONSOLE_APPENDER"/>
-        </root>
-    </springProfile>
-
-    <springProfile name="test">
-        <root level="INFO">
-            <appender-ref ref="CONSOLE_APPENDER"/>
-            <appender-ref ref="ROOT_APPENDER"/>
-        </root>
-    </springProfile>
-
-    <springProfile name="docker">
-        <logger name="org.springframework" level="WARN"/>
-        <root level="WARN">
-            <appender-ref ref="CONSOLE_APPENDER"/>
-            <appender-ref ref="JSON_APPENDER"/>
-        </root>
-    </springProfile>
-
-    <springProfile name="docker-dev">
-        <root level="INFO">
-            <appender-ref ref="CONSOLE_APPENDER"/>
-        </root>
-    </springProfile>
-
-    <springProfile name="docker-test">
-        <logger name="org.springframework" level="WARN"/>
-        <logger name="com.usoftchina.smartschool" level="WARN"/>
-        <root level="WARN">
-            <appender-ref ref="CONSOLE_APPENDER"/>
-            <appender-ref ref="JSON_APPENDER"/>
-        </root>
-    </springProfile>
-
-    <springProfile name="docker-prod">
-        <logger name="org.springframework" level="WARN"/>
-        <logger name="com.usoftchina.smartschool" level="WARN"/>
-        <root level="WARN">
-            <appender-ref ref="CONSOLE_APPENDER"/>
-            <appender-ref ref="JSON_APPENDER"/>
-        </root>
-    </springProfile>
-
-</configuration>