忽略iml文件

.idea/workspace.xml

@@ -2,28 +2,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/school/school-dto/src/main/java/com/usoftchina/smartschool/school/dto/ListReqDTO.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/controller/GradeController.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/controller/SchoolController.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/exception/BizExceptionCode.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/mapper/SysSchoolMapper.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/po/SysSchool.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/service/SchoolService.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/service/impl/SchoolServiceImpl.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/applications/school/school-server/src/main/resources/mapper/SysSchoolMapper.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/frontend/wechat-web/Dockerfile" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/frontend/wechat-web/runtime/nginx/default.conf" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/controller/SchoolTest.java" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/applications/school/school-dto/pom.xml" afterPath="$PROJECT_DIR$/applications/school/school-dto/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/applications/school/school-server/pom.xml" afterPath="$PROJECT_DIR$/applications/school/school-server/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/SchoolApplication.java" afterPath="$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/SchoolApplication.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/applications/school/school-server/src/main/resources/application.yml" afterPath="$PROJECT_DIR$/applications/school/school-server/src/main/resources/application.yml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/applications/wechat/wechat-api/wechat-api.iml" afterPath="$PROJECT_DIR$/applications/wechat/wechat-api/wechat-api.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/WechatApplication.java" afterPath="$PROJECT_DIR$/applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/WechatApplication.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/applications/wechat/wechat-server/wechat-server.iml" afterPath="$PROJECT_DIR$/applications/wechat/wechat-server/wechat-server.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/frontend/wechat-web/.gitignore" afterPath="$PROJECT_DIR$/frontend/wechat-web/.gitignore" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -71,65 +51,65 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="default.conf" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/frontend/pc-web/runtime/nginx/default.conf">
+      <file leaf-file-name="WechatApplication.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/WechatApplication.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="171">
-              <caret line="9" column="5" lean-forward="true" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
+            <state relative-caret-position="168">
+              <caret line="23" column="5" lean-forward="true" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="WechatApplication.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/WechatApplication.java">
+      <file leaf-file-name="compiler.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/.idea/compiler.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="168">
-              <caret line="23" column="5" lean-forward="true" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" />
+            <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-dev.yml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/config/application-dev.yml">
+      <file leaf-file-name="SchoolApplication.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/SchoolApplication.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="171">
-              <caret line="9" column="35" lean-forward="true" selection-start-line="9" selection-start-column="35" selection-end-line="9" selection-end-column="35" />
-              <folding />
+            <state relative-caret-position="123">
+              <caret line="12" column="4" lean-forward="true" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
+              <folding>
+                <element signature="e#740#741#0" expanded="true" />
+                <element signature="e#808#809#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/applications/wechat/wechat-server/src/main/resources/application.yml">
+      <file leaf-file-name="Dockerfile" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/Dockerfile">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="152">
-              <caret line="17" column="25" lean-forward="true" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
+            <state relative-caret-position="76">
+              <caret line="4" column="34" lean-forward="true" selection-start-line="4" selection-start-column="34" selection-end-line="4" selection-end-column="34" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="compiler.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.idea/compiler.xml">
+      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/frontend/wechat-web/.gitignore">
           <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="494">
+              <caret line="26" column="0" lean-forward="true" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SchoolApplication.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/SchoolApplication.java">
+      <file leaf-file-name="wechat.iml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/applications/wechat/wechat.iml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-84">
-              <caret line="12" column="4" lean-forward="true" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
-              <folding>
-                <element signature="e#740#741#0" expanded="true" />
-                <element signature="e#808#809#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="190">
+              <caret line="10" column="14" lean-forward="true" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -227,8 +207,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/framework/core/pom.xml" />
-        <option value="$PROJECT_DIR$/applications/school/school-server/src/main/docker/Dockerfile" />
         <option value="$PROJECT_DIR$/base-servers/file/file-server/src/main/java/com/usoftchina/smartschool/file/controller/FileController.java" />
         <option value="$PROJECT_DIR$/applications/school/pom.xml" />
         <option value="$PROJECT_DIR$/applications/school/school-server/pom.xml" />
@@ -278,6 +256,8 @@
         <option value="$PROJECT_DIR$/applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/WechatApplication.java" />
         <option value="$PROJECT_DIR$/applications/school/school-server/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/SchoolApplication.java" />
+        <option value="$PROJECT_DIR$/frontend/wechat-web/.gitignore" />
+        <option value="$PROJECT_DIR$/applications/wechat/wechat.iml" />
       </list>
     </option>
   </component>
@@ -897,11 +877,18 @@
       <option name="project" value="LOCAL" />
       <updated>1547694746727</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="1、基础资料接口&#10;2、错误代码注解&#10;3、微信前端构建代码">
+      <created>1548125505584</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1548125505584</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="32288000" />
+    <option name="totallyTimeSpent" value="32526000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -915,7 +902,7 @@
       <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="Run Dashboard" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.43822077" sideWeight="0.8774584" order="10" side_tool="false" content_ui="combo" />
       <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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.5222405" 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="true" show_stripe_button="true" weight="0.18121912" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36573312" sideWeight="0.81240547" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42009884" 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.42174628" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
@@ -1051,8 +1038,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/frontend/pc-web/build/development/smartschool/resources/smartschool-all.css" />
-    <entry file="file://$PROJECT_DIR$/frontend/pc-web/build/development/smartschool/resources/smartschool-all_1.css" />
     <entry file="file://$PROJECT_DIR$/frontend/pc-web/build/development/smartschool/resources/smartschool-all_2.css" />
     <entry file="file://$PROJECT_DIR$/frontend/pc-web/build/development/smartschool/resources/smartschool-all_3.css" />
     <entry file="file://$PROJECT_DIR$/frontend/pc-web/app.js">
@@ -1322,14 +1307,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/Dockerfile">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="4" column="34" lean-forward="true" selection-start-line="4" selection-start-column="34" selection-end-line="4" selection-end-column="34" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/frontend/pc-web/runtime/nginx/default.conf">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="171">
@@ -1424,7 +1401,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/SchoolApplication.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-84">
+        <state relative-caret-position="123">
           <caret line="12" column="4" lean-forward="true" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
           <folding>
             <element signature="e#740#741#0" expanded="true" />
@@ -1433,6 +1410,30 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/Dockerfile">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="76">
+          <caret line="4" column="34" lean-forward="true" selection-start-line="4" selection-start-column="34" selection-end-line="4" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/applications/wechat/wechat.iml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="190">
+          <caret line="10" column="14" lean-forward="true" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/frontend/wechat-web/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="26" column="0" lean-forward="true" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

frontend/wechat-web/.gitignore

@@ -22,6 +22,8 @@ yarn.lock
 .env.test.local
 .env.production.local
 
+#iml文件
+*.iml
 
 npm-debug.log*
 yarn-debug.log*