夏文涛 hace 9 meses
padre
commit
bfc5a8db8e
Se han modificado 3 ficheros con 27 adiciones y 13 borrados
  1. 15 1
      .gitignore
  2. 11 11
      .idea/workspace.xml
  3. 1 1
      src/main/java/com/repair/controller/RepairRecordController.java

+ 15 - 1
.gitignore

@@ -23,4 +23,18 @@
 hs_err_pid*
 
 # 项目排除路径
-/target/
+/target/
+
+#Intellij
+.idea/
+logs/
+target/
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

+ 11 - 11
.idea/workspace.xml

@@ -23,8 +23,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="182">
-              <caret line="635" column="13" selection-start-line="635" selection-start-column="13" selection-end-line="635" selection-end-column="13" />
+            <state relative-caret-position="23">
+              <caret line="637" column="16" selection-start-line="637" selection-start-column="16" selection-end-line="637" selection-end-column="16" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -215,7 +215,7 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
@@ -598,12 +598,12 @@
       <workItem from="1756344245204" duration="1900000" />
       <workItem from="1756693944345" duration="29000" />
       <workItem from="1758268354634" duration="308000" />
-      <workItem from="1759110496778" duration="1906000" />
+      <workItem from="1759110496778" duration="2420000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="276955000" />
+    <option name="totallyTimeSpent" value="277469000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -615,7 +615,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="0" width="974" height="1039" extended-state="1" />
+    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Structure" order="0" side_tool="true" weight="0.25" />
@@ -626,10 +626,10 @@
       <window_info id="UI Designer" order="5" />
       <window_info id="Favorites" order="6" side_tool="true" />
       <window_info id="Web" order="7" side_tool="true" />
-      <window_info content_ui="combo" id="Project" order="8" visible="true" weight="0.23304157" />
+      <window_info content_ui="combo" id="Project" order="8" visible="true" weight="0.195629" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.42651933" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.42231947" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.46498907" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -647,7 +647,7 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.2494432" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info active="true" anchor="right" id="Maven" order="3" visible="true" weight="0.7330416" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.6247265" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
       <window_info anchor="right" id="Database" order="6" />
@@ -1073,8 +1073,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="635" column="13" selection-start-line="635" selection-start-column="13" selection-end-line="635" selection-end-column="13" />
+        <state relative-caret-position="23">
+          <caret line="637" column="16" selection-start-line="637" selection-start-column="16" selection-end-line="637" selection-end-column="16" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>

+ 1 - 1
src/main/java/com/repair/controller/RepairRecordController.java

@@ -635,7 +635,7 @@ public class RepairRecordController implements RepairRecordControllerAPI {
      */
     @Override
     public CommonResult uploadFile(MultipartFile file) throws Exception {
-
+        //限制文件类型
         List<String> allowedTypes = new ArrayList<>();
         allowedTypes.add("image/png");
         allowedTypes.add("image/jpeg");