注释文件结尾

.gitignore

@@ -7,4 +7,5 @@
 *.iml
 out
 gen
-*.log
+*.log
+/logs/

.idea/workspace.xml

@@ -6,13 +6,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="582764bc-f4d5-49fa-89c5-ed5a1070192f" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/sys.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sys.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/project.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/project.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/MonitorFileUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/MonitorFileUtils.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/project.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/project.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileChangeProc.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileChangeProc.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/OldFileChangeProc.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/OldFileChangeProc.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -45,11 +43,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="StatRunner.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="StatRunner.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1625">
-              <caret line="69" column="10" selection-start-line="69" selection-start-column="10" selection-end-line="69" selection-end-column="10" />
+            <state relative-caret-position="-370">
+              <caret line="54" selection-start-line="54" selection-end-line="54" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -60,8 +58,17 @@
       <file leaf-file-name="MonitorFileUtils.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1775">
-              <caret line="77" column="26" selection-start-line="77" selection-start-column="26" selection-end-line="77" selection-end-column="26" />
+            <state relative-caret-position="175">
+              <caret line="13" column="13" lean-forward="true" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="OldFileChangeProc.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/OldFileChangeProc.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="743">
+              <caret line="57" column="27" selection-start-line="57" selection-start-column="27" selection-end-line="57" selection-end-column="27" />
             </state>
           </provider>
         </entry>
@@ -69,17 +76,17 @@
       <file leaf-file-name="NowFileChangeProc.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileChangeProc.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="425">
-              <caret line="23" selection-start-line="23" selection-end-line="23" />
+            <state relative-caret-position="150">
+              <caret line="71" column="23" selection-start-line="71" selection-start-column="23" selection-end-line="71" selection-end-column="23" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SuccessUploadQuenu.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/SuccessUploadQuenu.java">
+      <file leaf-file-name="DirMonitor.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/DirMonitor.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+            <state relative-caret-position="475">
+              <caret line="19" column="70" selection-start-line="19" selection-start-column="70" selection-end-line="19" selection-end-column="70" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -87,11 +94,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="UploaderZskkApplication.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/UploaderZskkApplication.java">
+      <file leaf-file-name="InitMonitor.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="350">
-              <caret line="23" column="23" selection-start-line="23" selection-start-column="23" selection-end-line="23" selection-end-column="23" />
+            <state relative-caret-position="294">
+              <caret line="25" column="11" selection-start-line="25" selection-start-column="11" selection-end-line="25" selection-end-column="11" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -99,11 +106,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="InitMonitor.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java">
+      <file leaf-file-name="RetryDirMonitor.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/RetryDirMonitor.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="525">
-              <caret line="23" column="34" selection-start-line="23" selection-start-column="34" selection-end-line="23" selection-end-column="34" />
+            <state relative-caret-position="400">
+              <caret line="17" column="37" selection-start-line="17" selection-start-column="37" selection-end-line="17" selection-end-column="37" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -111,20 +118,23 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="project.properties" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/project.properties">
+      <file leaf-file-name="SuccessUploadQuenu.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/SuccessUploadQuenu.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="100">
-              <caret line="4" column="27" selection-start-line="4" selection-start-column="27" selection-end-line="4" selection-end-column="27" />
+            <state relative-caret-position="300">
+              <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/.gitignore">
+      <file leaf-file-name="project.properties" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/project.properties">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="6" column="5" lean-forward="true" selection-start-line="6" selection-start-column="5" selection-end-line="6" selection-end-column="5" />
+            <state relative-caret-position="100">
+              <caret line="4" column="27" selection-start-line="4" selection-start-column="27" selection-end-line="4" selection-end-column="27" />
             </state>
           </provider>
         </entry>
@@ -141,15 +151,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="FileMover.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileMover.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="950">
-              <caret line="47" column="8" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="59" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -175,7 +176,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/LogEnginer.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/FileChangeProc.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/RetryDirMonitor.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileChangeProc.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/CopyFile.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/FileHashUtil.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/HistoryFile2UploadQuenu.java" />
@@ -188,18 +188,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader_two.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/SuccessUploadQuenu.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/DirMonitor.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/OldFileChangeProc.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileMover.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/RetryUploadRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploadsOss.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/Configs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/UploaderZskkApplication.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java" />
         <option value="$PROJECT_DIR$/src/main/resources/project.properties" />
         <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/OldFileChangeProc.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileChangeProc.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java" />
       </list>
     </option>
   </component>
@@ -507,7 +508,7 @@
       <workItem from="1553132992622" duration="14255000" />
       <workItem from="1553156098317" duration="7211000" />
       <workItem from="1553219266255" duration="2776000" />
-      <workItem from="1553223215863" duration="196000" />
+      <workItem from="1553223215863" duration="1353000" />
     </task>
     <task id="LOCAL-00001" summary="new">
       <created>1553046646348</created>
@@ -558,11 +559,18 @@
       <option name="project" value="LOCAL" />
       <updated>1553165101920</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <task id="LOCAL-00008" summary="修改配置文件,忽略上传">
+      <created>1553223507256</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1553223507256</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="100495000" />
+    <option name="totallyTimeSpent" value="101652000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -582,7 +590,7 @@
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info active="true" anchor="bottom" id="Event Log" order="7" sideWeight="0.08800482" side_tool="true" visible="true" weight="0.28522336" />
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.08800482" side_tool="true" visible="true" weight="0.14432989" />
       <window_info anchor="right" id="Maven Projects" order="3" weight="0.15618336" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.9119952" weight="0.45933563" />
@@ -591,7 +599,7 @@
       <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.90777576" weight="0.096219935" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19770946" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19770946" />
       <window_info anchor="bottom" id="Problems" order="7" weight="0.32983682" />
       <window_info anchor="right" id="Database" order="3" weight="0.32995737" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -652,7 +660,8 @@
     <MESSAGE value="11111111111111111111111" />
     <MESSAGE value="测" />
     <MESSAGE value="修改创建文件路径" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改创建文件路径" />
+    <MESSAGE value="修改配置文件,忽略上传" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改配置文件,忽略上传" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -869,33 +878,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/RetryDirMonitor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="400">
-          <caret line="17" column="37" selection-start-line="17" selection-start-column="37" selection-end-line="17" selection-end-column="37" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/DirMonitor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="475">
-          <caret line="19" column="70" selection-start-line="19" selection-start-column="70" selection-end-line="19" selection-end-column="70" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/OldFileChangeProc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1500">
@@ -954,16 +936,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="525">
-          <caret line="23" column="34" selection-start-line="23" selection-start-column="34" selection-end-line="23" selection-end-column="34" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileMover.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="950">
@@ -971,16 +943,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1625">
-          <caret line="69" column="10" selection-start-line="69" selection-start-column="10" selection-end-line="69" selection-end-column="10" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/LogEnginer.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="525">
@@ -1028,31 +990,78 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/project.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="100">
+          <caret line="4" column="27" selection-start-line="4" selection-start-column="27" selection-end-line="4" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="175">
+          <caret line="7" column="3" lean-forward="true" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1775">
-          <caret line="77" column="26" selection-start-line="77" selection-start-column="26" selection-end-line="77" selection-end-column="26" />
+        <state relative-caret-position="175">
+          <caret line="13" column="13" lean-forward="true" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/OldFileChangeProc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="743">
+          <caret line="57" column="27" selection-start-line="57" selection-start-column="27" selection-end-line="57" selection-end-column="27" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileChangeProc.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
-          <caret line="23" selection-start-line="23" selection-end-line="23" />
+        <state relative-caret-position="150">
+          <caret line="71" column="23" selection-start-line="71" selection-start-column="23" selection-end-line="71" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/project.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/DirMonitor.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="100">
-          <caret line="4" column="27" selection-start-line="4" selection-start-column="27" selection-end-line="4" selection-end-column="27" />
+        <state relative-caret-position="475">
+          <caret line="19" column="70" selection-start-line="19" selection-start-column="70" selection-end-line="19" selection-end-column="70" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="6" column="5" lean-forward="true" selection-start-line="6" selection-start-column="5" selection-end-line="6" selection-end-column="5" />
+        <state relative-caret-position="294">
+          <caret line="25" column="11" selection-start-line="25" selection-start-column="11" selection-end-line="25" selection-end-column="11" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/RetryDirMonitor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="400">
+          <caret line="17" column="37" selection-start-line="17" selection-start-column="37" selection-end-line="17" selection-end-column="37" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-370">
+          <caret line="54" selection-start-line="54" selection-end-line="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

src/main/java/com/zskk/dicom/monitor/monitors/NowFileChangeProc.java

@@ -35,7 +35,7 @@ public class NowFileChangeProc {
 //							if(file.renameTo(file)) {
 //								msg += "\r\n add to queue";
                             String absolutePath = file.getAbsolutePath();
-                            if(absolutePath.endsWith("txt")) {
+                          //  if(absolutePath.endsWith("txt")) {
                                 Timer timer = new Timer();
                                 timer.schedule(new TimerTask() {
 
@@ -45,7 +45,7 @@ public class NowFileChangeProc {
                                         UploadsQueue.addCurrent(new File(absolutePath));
                                     }
                                 }, 1000);
-                            }
+                        //   }
                             Configs.sysLog.info(msg+"---------监听新文件夹创建");
                         }
 
@@ -59,7 +59,7 @@ public class NowFileChangeProc {
                         public void modify(File file) {
                             String msg = "File update \t" + file.getAbsolutePath();
                             String absolutePath = file.getAbsolutePath();
-                            if(absolutePath.endsWith("txt")) {
+                           // if(absolutePath.endsWith("txt")) {
                                 Timer timer = new Timer();
                                 timer.schedule(new TimerTask() {
 
@@ -69,7 +69,7 @@ public class NowFileChangeProc {
                                         UploadsQueue.addCurrent(new File(absolutePath));
                                     }
                                 }, 1000);
-                            }
+                        //  }
                             Configs.sysLog.info(msg+"---------监听新文件夹移动");
                         }
                     });

src/main/java/com/zskk/dicom/monitor/monitors/OldFileChangeProc.java

@@ -44,7 +44,7 @@ public class OldFileChangeProc{
 //								msg += "\r\n add to queue";
                             String absolutePath = file.getAbsolutePath();
                             //dcm 后缀
-                            if(absolutePath.endsWith("txt")) {
+                          //  if(absolutePath.endsWith("txt")) {
                                 //定时器
                                 Timer timer = new Timer();
                                 timer.schedule(new TimerTask() {
@@ -55,7 +55,7 @@ public class OldFileChangeProc{
                                         UploadsQueue.addFail(new File(absolutePath));
                                     }
                                 }, 1000);
-                            }
+                         //   }
                             Configs.sysLog.info(msg+"---------监听重试文件夹创建");
                         }
 
@@ -69,7 +69,7 @@ public class OldFileChangeProc{
                         public void modify(File file) {
                             String msg = "File update \t" + file.getAbsolutePath();
                             String absolutePath = file.getAbsolutePath();
-                            if(absolutePath.endsWith("txt")) {
+                          //  if(absolutePath.endsWith("txt")) {
                                 Timer timer = new Timer();
                                 timer.schedule(new TimerTask() {
 
@@ -79,7 +79,7 @@ public class OldFileChangeProc{
                                         UploadsQueue.addFail(new File(absolutePath));
                                     }
                                 }, 1000);
-                            }
+                        //    }
                             Configs.sysLog.info(msg+"---------监听重试文件夹移动");
                         }
                     });

src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java

@@ -11,7 +11,7 @@ public class InitMonitor {
     public static void start() {
         Configs.sysLog.info("Dicom monitor check waiting files ...");
         //读取监听文件
-         File monitorBackDir = new File(Configs.monitorBackDir);
+        File monitorBackDir = new File(Configs.monitorBackDir);
         File monitorRetryDir = new File(Configs.monitorRetryDir);
         File eorrRetryDir = new File(Configs.eorrRetryDir);
          if (!monitorBackDir.exists()){
@@ -23,13 +23,13 @@ public class InitMonitor {
         if (!eorrRetryDir.exists()){
             eorrRetryDir.mkdirs();
         }
-        //创建备份文件夹
+        // 创建备份文件夹
          //MonitorFileUtils.touchBackDir(monitorDir);
 
-        monitorRetryDir.mkdirs();
-         //MonitorFileUtils.touchRetryDir(monitorRetryDir);
+          // monitorRetryDir.mkdirs();
+         // MonitorFileUtils.touchRetryDir(monitorRetryDir);
 
-        eorrRetryDir.mkdirs();
+         // eorrRetryDir.mkdirs();
         // MonitorFileUtils.touchEorrDir(eorrRetryDir);
     }
 }

src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java

@@ -52,21 +52,18 @@ public class StatRunner {
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-
         //老上传
         oldUploadPools = generatePools(oldUploadPools, 2);
         oldUploadPools.execute(new OldUploadRunner());
         // oldUploadPools.execute(new FileUploadsOss(UploadsQueue.fileQueue));
        // oldUploadPools.execute(new OldUploadRunner());
       //  oldUploadPools.execute(new FileUploadsOss(FileUploadsOss.FLAG_UPLOAD));
-
         //新上传
         currentUploadPools = generatePools(currentUploadPools, 2);
         currentUploadPools.execute(new CurrentUploadRunner());
         //重试上传
         retryUploadPools = generatePools(retryUploadPools, 2);
-
-       retryUploadPools.execute(new RetryUploadRunner());
+        retryUploadPools.execute(new RetryUploadRunner());
         // retryUploadPools.execute(new FileUploadsOss(UploadsQueue.failFileQueue));
        // retryUploadPools.execute(new RetryUploadRunner());
        // retryUploadPools.execute(new FileUploadsOss(FileUploadsOss.FLAG_RETRY));