修改代码 测试打包

.idea/workspace.xml

@@ -6,24 +6,33 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="582764bc-f4d5-49fa-89c5-ed5a1070192f" name="Default" comment="">
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRunner.java" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseUploadRunner.java" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change beforePath="$PROJECT_DIR$/logs/sys.log" afterPath="$PROJECT_DIR$/logs/sys.log" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractRemove.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractRemoveRunner.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractUpload.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractUploadRunner.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseAddHistory2QueueRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseAddHistory2QueueRunner.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseCurrentRunner.java" afterPath="" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRemoveRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRemoveRunner.java" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/CurrentUploadRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/CurrentUploadRunner.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/ErrorRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/ErrorRunner.java" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/HistoryUploadRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/HistoryUploadRunner.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.java" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.java" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/SuccessRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/SuccessRunner.java" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/BaseRemoveRunner.class" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/FileRemoveUtils.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/FileRemoveUtils.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/oss/OSSFileAndCallbackHleper.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/oss/OSSFileAndCallbackHleper.java" />
+      <change beforePath="$PROJECT_DIR$/target/classes/META-INF/spring-autoconfigure-metadata.properties" afterPath="$PROJECT_DIR$/target/classes/META-INF/spring-autoconfigure-metadata.properties" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/AbstractRemove.class" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/AbstractUpload.class" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/BaseAddHistory2QueueRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/BaseAddHistory2QueueRunner.class" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/BaseCurrentRunner.class" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/BaseRemoveRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/BaseRemoveRunner.class" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/CurrentUploadRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/CurrentUploadRunner.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/ErrorRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/ErrorRunner.class" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/HistoryUploadRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/HistoryUploadRunner.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.class" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.class" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/SuccessRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/SuccessRunner.class" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/FileRemoveUtils.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/FileRemoveUtils.class" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -56,152 +65,104 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="CurrentUploadRunner.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/CurrentUploadRunner.java">
+      <file leaf-file-name="BaseUploadRunner.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseUploadRunner.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="60">
-              <caret line="8" column="46" lean-forward="false" selection-start-line="8" selection-start-column="46" selection-end-line="8" selection-end-column="46" />
-              <folding />
+            <state relative-caret-position="12">
+              <caret line="7" column="60" lean-forward="false" selection-start-line="7" selection-start-column="60" selection-end-line="7" selection-end-column="60" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="AbstractUpload.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractUpload.java">
+      <file leaf-file-name="SuccessRunner.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/SuccessRunner.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="195">
-              <caret line="13" column="23" lean-forward="false" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="23" />
+            <state relative-caret-position="60">
+              <caret line="5" column="42" lean-forward="false" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="42" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SuccessRunner.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/SuccessRunner.java">
+      <file leaf-file-name="BaseRemoveRunner.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRemoveRunner.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="552">
-              <caret line="39" column="60" lean-forward="false" selection-start-line="39" selection-start-column="60" selection-end-line="39" selection-end-column="60" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#243#244#0" expanded="true" />
-                <element signature="e#271#272#0" expanded="true" />
-                <element signature="e#325#326#0" expanded="true" />
-                <element signature="e#363#364#0" expanded="true" />
-                <element signature="e#410#411#0" expanded="true" />
-                <element signature="e#467#468#0" expanded="true" />
-                <element signature="e#509#510#0" expanded="true" />
-                <element signature="e#565#566#0" expanded="true" />
-                <element signature="e#618#619#0" expanded="true" />
-                <element signature="e#655#656#0" expanded="true" />
-                <element signature="e#713#714#0" expanded="true" />
-                <element signature="e#777#778#0" expanded="true" />
-                <element signature="e#856#857#0" expanded="true" />
-                <element signature="e#925#926#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="60">
+              <caret line="4" column="22" lean-forward="false" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ErrorRunner.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/ErrorRunner.java">
+      <file leaf-file-name="ALiYunOSSCallbackBodyBean.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/request/bean/ALiYunOSSCallbackBodyBean.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="558">
-              <caret line="39" column="45" lean-forward="false" selection-start-line="39" selection-start-column="45" selection-end-line="39" selection-end-column="45" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#239#240#0" expanded="true" />
-                <element signature="e#267#268#0" expanded="true" />
-                <element signature="e#321#322#0" expanded="true" />
-                <element signature="e#357#358#0" expanded="true" />
-                <element signature="e#404#405#0" expanded="true" />
-                <element signature="e#459#460#0" expanded="true" />
-                <element signature="e#501#502#0" expanded="true" />
-                <element signature="e#555#556#0" expanded="true" />
-                <element signature="e#608#609#0" expanded="true" />
-                <element signature="e#643#644#0" expanded="true" />
-                <element signature="e#701#702#0" expanded="true" />
-                <element signature="e#763#764#0" expanded="true" />
-                <element signature="e#842#843#0" expanded="true" />
-                <element signature="e#910#911#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="60">
+              <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="AbstractRemove.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractRemove.java">
+      <file leaf-file-name="BaseResponse.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/response/BaseResponse.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="6" column="19" lean-forward="false" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="19" />
+            <state relative-caret-position="60">
+              <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="RemoveFile2RetryRunner.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.java">
+      <file leaf-file-name="FileUploadChcekResponse.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/response/FileUploadChcekResponse.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="234">
-              <caret line="39" column="63" lean-forward="false" selection-start-line="39" selection-start-column="63" selection-end-line="39" selection-end-column="63" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#261#262#0" expanded="true" />
-                <element signature="e#289#290#0" expanded="true" />
-                <element signature="e#343#344#0" expanded="true" />
-                <element signature="e#390#391#0" expanded="true" />
-                <element signature="e#437#438#0" expanded="true" />
-                <element signature="e#503#504#0" expanded="true" />
-                <element signature="e#545#546#0" expanded="true" />
-                <element signature="e#610#611#0" expanded="true" />
-                <element signature="e#663#664#0" expanded="true" />
-                <element signature="e#709#710#0" expanded="true" />
-                <element signature="e#767#768#0" expanded="true" />
-                <element signature="e#840#841#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="30">
+              <caret line="2" column="13" lean-forward="false" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="BaseCurrentRunner.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseCurrentRunner.java">
+      <file leaf-file-name="ZskkResponseFactory.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/response/ZskkResponseFactory.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="120">
-              <caret line="10" column="31" lean-forward="true" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
+            <state relative-caret-position="-8">
+              <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="AddRetryHistory2QueueRunner.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AddRetryHistory2QueueRunner.java">
+      <file leaf-file-name="OSSFileAndCallbackHleper.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/oss/OSSFileAndCallbackHleper.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="60">
-              <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+            <state relative-caret-position="280">
+              <caret line="100" column="113" lean-forward="false" selection-start-line="100" selection-start-column="113" selection-end-line="100" selection-end-column="113" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="AddHistory2QueueRunner.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AddHistory2QueueRunner.java">
+      <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="75">
-              <caret line="7" column="48" lean-forward="false" selection-start-line="7" selection-start-column="48" selection-end-line="7" selection-end-column="48" />
+            <state relative-caret-position="275">
+              <caret line="32" column="21" lean-forward="true" selection-start-line="32" selection-start-column="21" selection-end-line="32" selection-end-column="21" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="BaseRemoveRunner.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRemoveRunner.java">
+      <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="990">
-              <caret line="66" column="26" lean-forward="false" selection-start-line="66" selection-start-column="26" selection-end-line="66" selection-end-column="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#1406#1407#0" expanded="true" />
-                <element signature="e#1437#1438#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="409">
+              <caret line="110" column="0" lean-forward="true" selection-start-line="110" selection-start-column="0" selection-end-line="110" selection-end-column="0" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -235,12 +196,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/IQueue.kt" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractAddHistory2QueueRunner.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AddHistory2QueueRunner.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AddRetryHistory2QueueRunner.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/AbstractQueue.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseAddHistory2QueueRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/FileActionCallback.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/BaseFileActionCallback.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/RetryFileActionCallback.java" />
@@ -268,24 +223,30 @@
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/CurrentUploadQueue.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/CurrentRetryUploadQueue.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryCurrentRunner.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseCurrentRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/CurrentRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/HistoryRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/IRemove.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/utils/FileRemoveUtils.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractRemove.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/utils/MonitorFileUtils.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/HistoryUploadRunner.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/CurrentUploadRunner.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractUpload.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRemoveRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/ErrorRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/SuccessRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseCurrentRunner.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/CurrentUploadRunner.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractRemoveRunner.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractUploadRunner.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseUploadRunner.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseAddHistory2QueueRunner.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/HistoryUploadRunner.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRunner.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/FileRemoveUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRemoveRunner.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/oss/OSSFileAndCallbackHleper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java" />
       </list>
     </option>
   </component>
@@ -334,7 +295,7 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-36" />
+    <option name="x" value="-54" />
     <option name="y" value="24" />
     <option name="width" value="1440" />
     <option name="height" value="829" />
@@ -355,10 +316,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="AndroidView" />
-      <pane id="Scratches" />
       <pane id="PackagesPane" />
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -461,6 +420,43 @@
               <item name="monitor" type="462c0819:PsiDirectoryNode" />
               <item name="utils" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="uploader_zskk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="demo" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="dicom" type="462c0819:PsiDirectoryNode" />
+              <item name="oss" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="uploader_zskk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="demo" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="dicom" type="462c0819:PsiDirectoryNode" />
+              <item name="bean" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="uploader_zskk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="demo" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="dicom" type="462c0819:PsiDirectoryNode" />
+              <item name="response" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="uploader_zskk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="demo" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="dicom" type="462c0819:PsiDirectoryNode" />
+              <item name="response" type="462c0819:PsiDirectoryNode" />
+              <item name="bean" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="uploader_zskk" type="b2602c69:ProjectViewProjectNode" />
               <item name="demo" type="462c0819:PsiDirectoryNode" />
@@ -472,6 +468,8 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
+      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -671,7 +669,11 @@
       <workItem from="1553264000610" duration="1674000" />
       <workItem from="1553307146396" duration="538000" />
       <workItem from="1553310925318" duration="1787000" />
-      <workItem from="1553312732767" duration="813000" />
+      <workItem from="1553312732767" duration="1786000" />
+      <workItem from="1553314543157" duration="907000" />
+      <workItem from="1553316949034" duration="30000" />
+      <workItem from="1553322322843" duration="1772000" />
+      <workItem from="1553324126988" duration="871000" />
     </task>
     <task id="LOCAL-00001" summary="new">
       <created>1553046646348</created>
@@ -740,7 +742,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="124071000" />
+    <option name="totallyTimeSpent" value="128624000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -752,7 +754,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-36" y="24" width="1440" height="829" extended-state="0" />
+    <frame x="0" y="23" width="1440" height="830" 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" />
@@ -763,21 +765,21 @@
       <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="3" side_tool="false" 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.33" sideWeight="0.5" order="7" 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.33" sideWeight="0.5" order="3" 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.4332425" sideWeight="0.5" order="2" 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.33" sideWeight="0.5" order="7" 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.477551" sideWeight="0.5" order="2" 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.33" sideWeight="0.5" order="7" 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.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <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="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="2" 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.33619457" 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.36123034" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Problems" 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="7" 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.33" 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.25" 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="2" 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="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" 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="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" 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="true" content_ui="tabs" />
+      <window_info id="Debug" 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="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -841,48 +843,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/FileAction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" column="12" lean-forward="false" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/WatchDir.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="431">
-          <caret line="54" column="4" lean-forward="true" selection-start-line="54" selection-start-column="4" selection-end-line="54" selection-end-column="4" />
-        </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="180">
-          <caret line="13" column="44" lean-forward="false" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/RetryFileActionCallback.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="14" lean-forward="false" selection-start-line="6" selection-start-column="14" selection-end-line="6" selection-end-column="14" />
-        </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="225">
-          <caret line="16" column="23" lean-forward="false" selection-start-line="16" selection-start-column="23" selection-end-line="16" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/BaseFileChangeProc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="600">
-          <caret line="40" column="23" lean-forward="false" selection-start-line="40" selection-start-column="19" selection-end-line="40" selection-end-column="23" />
-        </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="225">
@@ -911,13 +871,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/oss/OSSFileAndCallbackHleper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="22" column="42" lean-forward="false" selection-start-line="22" selection-start-column="42" selection-end-line="22" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="15">
@@ -936,7 +889,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2235">
           <caret line="152" column="22" lean-forward="false" selection-start-line="152" selection-start-column="12" selection-end-line="152" selection-end-column="22" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1017,13 +969,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/SuccessQueue.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="16" column="15" lean-forward="false" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader_two.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
@@ -1066,13 +1011,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/FileRemoveUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="14" column="28" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/IUpload.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
@@ -1080,54 +1018,131 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/IRemove.java">
+    <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="45">
-          <caret line="3" column="11" lean-forward="false" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" />
+        <state relative-caret-position="3060">
+          <caret line="211" column="9" lean-forward="false" selection-start-line="211" selection-start-column="9" selection-end-line="211" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractRemoveRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1545">
-          <caret line="107" column="51" lean-forward="false" selection-start-line="107" selection-start-column="51" selection-end-line="107" selection-end-column="51" />
-          <folding />
+        <state relative-caret-position="75">
+          <caret line="5" column="20" lean-forward="false" selection-start-line="5" selection-start-column="20" selection-end-line="5" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/IRemove.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3060">
-          <caret line="211" column="9" lean-forward="false" selection-start-line="211" selection-start-column="9" selection-end-line="211" selection-end-column="9" />
-          <folding />
+        <state relative-caret-position="45">
+          <caret line="3" column="12" lean-forward="false" selection-start-line="3" selection-start-column="12" selection-end-line="3" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/HistoryUploadRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="23" column="21" lean-forward="false" selection-start-line="23" selection-start-column="21" selection-end-line="23" selection-end-column="21" />
+        <state relative-caret-position="234">
+          <caret line="46" column="19" lean-forward="false" selection-start-line="46" selection-start-column="19" selection-end-line="46" selection-end-column="19" />
+          <folding>
+            <element signature="imports" expanded="false" />
+            <element signature="e#361#362#0" expanded="false" />
+            <element signature="e#410#411#0" expanded="false" />
+            <element signature="e#472#473#0" expanded="false" />
+            <element signature="e#519#520#0" expanded="false" />
+            <element signature="e#577#578#0" expanded="false" />
+            <element signature="e#642#643#0" expanded="false" />
+            <element signature="e#689#690#0" expanded="false" />
+            <element signature="e#747#748#0" expanded="false" />
+            <element signature="e#789#790#0" expanded="false" />
+            <element signature="e#846#847#0" expanded="false" />
+            <element signature="e#899#900#0" expanded="false" />
+            <element signature="e#937#938#0" expanded="false" />
+            <element signature="e#991#992#0" expanded="false" />
+            <element signature="e#1040#1041#0" expanded="false" />
+            <element signature="e#1086#1087#0" expanded="false" />
+            <element signature="e#1113#1114#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="249">
-          <caret line="24" column="12" lean-forward="false" selection-start-line="24" selection-start-column="12" selection-end-line="24" selection-end-column="12" />
+        <state relative-caret-position="210">
+          <caret line="41" column="40" lean-forward="false" selection-start-line="41" selection-start-column="40" selection-end-line="41" selection-end-column="40" />
+          <folding>
+            <element signature="imports" expanded="false" />
+            <element signature="e#371#372#0" expanded="false" />
+            <element signature="e#420#421#0" expanded="false" />
+            <element signature="e#482#483#0" expanded="false" />
+            <element signature="e#529#530#0" expanded="false" />
+            <element signature="e#587#588#0" expanded="false" />
+            <element signature="e#662#663#0" expanded="false" />
+            <element signature="e#709#710#0" expanded="false" />
+            <element signature="e#777#778#0" expanded="false" />
+            <element signature="e#819#820#0" expanded="false" />
+            <element signature="e#886#887#0" expanded="false" />
+            <element signature="e#939#940#0" expanded="false" />
+            <element signature="e#987#988#0" expanded="false" />
+            <element signature="e#1041#1042#0" expanded="false" />
+            <element signature="e#1090#1091#0" expanded="false" />
+            <element signature="e#1136#1137#0" expanded="false" />
+            <element signature="e#1164#1165#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/CurrentUploadRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="309">
-          <caret line="31" column="76" lean-forward="false" selection-start-line="31" selection-start-column="76" selection-end-line="31" selection-end-column="76" />
+        <state relative-caret-position="390">
+          <caret line="26" column="33" lean-forward="false" selection-start-line="26" selection-start-column="15" selection-end-line="26" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="false" />
+            <element signature="e#372#373#0" expanded="false" />
+            <element signature="e#421#422#0" expanded="false" />
+            <element signature="e#483#484#0" expanded="false" />
+            <element signature="e#541#542#0" expanded="false" />
+            <element signature="e#599#600#0" expanded="false" />
+            <element signature="e#669#670#0" expanded="false" />
+            <element signature="e#716#717#0" expanded="false" />
+            <element signature="e#779#780#0" expanded="false" />
+            <element signature="e#821#822#0" expanded="false" />
+            <element signature="e#883#884#0" expanded="false" />
+            <element signature="e#936#937#0" expanded="false" />
+            <element signature="e#979#980#0" expanded="false" />
+            <element signature="e#1033#1034#0" expanded="false" />
+            <element signature="e#1077#1078#0" expanded="false" />
+            <element signature="e#1123#1124#0" expanded="false" />
+            <element signature="e#1151#1152#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseAddHistory2QueueRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="293">
+          <caret line="29" column="37" lean-forward="false" selection-start-line="29" selection-start-column="16" selection-end-line="29" selection-end-column="37" />
+          <folding>
+            <element signature="imports" expanded="false" />
+            <element signature="e#261#262#0" expanded="false" />
+            <element signature="e#289#290#0" expanded="false" />
+            <element signature="e#343#344#0" expanded="false" />
+            <element signature="e#390#391#0" expanded="false" />
+            <element signature="e#437#438#0" expanded="false" />
+            <element signature="e#503#504#0" expanded="false" />
+            <element signature="e#545#546#0" expanded="false" />
+            <element signature="e#610#611#0" expanded="false" />
+            <element signature="e#663#664#0" expanded="false" />
+            <element signature="e#709#710#0" expanded="false" />
+            <element signature="e#767#768#0" expanded="false" />
+            <element signature="e#840#841#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AddRetryHistory2QueueRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="465">
-          <caret line="36" column="24" lean-forward="false" selection-start-line="36" selection-start-column="8" selection-end-line="36" selection-end-column="24" />
+        <state relative-caret-position="75">
+          <caret line="7" column="10" lean-forward="true" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
           <folding />
         </state>
       </provider>
@@ -1135,129 +1150,171 @@
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AddHistory2QueueRunner.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="75">
-          <caret line="7" column="48" lean-forward="false" selection-start-line="7" selection-start-column="48" selection-end-line="7" selection-end-column="48" />
+          <caret line="7" column="12" lean-forward="false" selection-start-line="7" selection-start-column="12" selection-end-line="7" selection-end-column="12" />
+          <folding>
+            <element signature="e#248#249#0" expanded="false" />
+            <element signature="e#319#320#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseAddHistory2QueueRunner.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="43" column="64" lean-forward="false" selection-start-line="43" selection-start-column="57" selection-end-line="43" selection-end-column="64" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AddRetryHistory2QueueRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/HistoryUploadRunner.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="60">
-          <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-          <folding />
+          <caret line="7" column="46" lean-forward="false" selection-start-line="7" selection-start-column="46" selection-end-line="7" selection-end-column="46" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#368#369#0" expanded="true" />
+            <element signature="e#417#418#0" expanded="true" />
+            <element signature="e#479#480#0" expanded="true" />
+            <element signature="e#537#538#0" expanded="true" />
+            <element signature="e#595#596#0" expanded="true" />
+            <element signature="e#661#662#0" expanded="true" />
+            <element signature="e#708#709#0" expanded="true" />
+            <element signature="e#767#768#0" expanded="true" />
+            <element signature="e#809#810#0" expanded="true" />
+            <element signature="e#867#868#0" expanded="true" />
+            <element signature="e#920#921#0" expanded="true" />
+            <element signature="e#959#960#0" expanded="true" />
+            <element signature="e#1013#1014#0" expanded="true" />
+            <element signature="e#1057#1058#0" expanded="true" />
+            <element signature="e#1103#1104#0" expanded="true" />
+            <element signature="e#1130#1131#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractRemove.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractUploadRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="19" lean-forward="false" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="19" />
-          <folding />
+        <state relative-caret-position="75">
+          <caret line="5" column="57" lean-forward="false" selection-start-line="5" selection-start-column="57" selection-end-line="5" selection-end-column="57" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#217#218#0" expanded="true" />
+            <element signature="e#264#265#0" expanded="true" />
+            <element signature="e#295#296#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/CurrentUploadRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="8" column="46" lean-forward="false" selection-start-line="8" selection-start-column="46" selection-end-line="8" selection-end-column="46" />
+        <state relative-caret-position="180">
+          <caret line="14" column="35" lean-forward="false" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractUpload.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/SuccessQueue.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
-          <caret line="13" column="23" lean-forward="false" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="23" />
+          <caret line="16" column="15" lean-forward="false" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRemoveRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/FileRemoveUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="990">
-          <caret line="66" column="26" lean-forward="false" selection-start-line="66" selection-start-column="26" selection-end-line="66" selection-end-column="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1406#1407#0" expanded="true" />
-            <element signature="e#1437#1438#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="102">
+          <caret line="14" column="30" lean-forward="false" selection-start-line="14" selection-start-column="29" selection-end-line="14" selection-end-column="30" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/ErrorRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="558">
-          <caret line="39" column="45" lean-forward="false" selection-start-line="39" selection-start-column="45" selection-end-line="39" selection-end-column="45" />
+        <state relative-caret-position="25">
+          <caret line="5" column="42" lean-forward="false" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="42" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseUploadRunner.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="12">
+          <caret line="7" column="60" lean-forward="false" selection-start-line="7" selection-start-column="60" selection-end-line="7" selection-end-column="60" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#239#240#0" expanded="true" />
-            <element signature="e#267#268#0" expanded="true" />
-            <element signature="e#321#322#0" expanded="true" />
-            <element signature="e#357#358#0" expanded="true" />
-            <element signature="e#404#405#0" expanded="true" />
-            <element signature="e#459#460#0" expanded="true" />
-            <element signature="e#501#502#0" expanded="true" />
-            <element signature="e#555#556#0" expanded="true" />
-            <element signature="e#608#609#0" expanded="true" />
-            <element signature="e#643#644#0" expanded="true" />
-            <element signature="e#701#702#0" expanded="true" />
-            <element signature="e#763#764#0" expanded="true" />
-            <element signature="e#842#843#0" expanded="true" />
-            <element signature="e#910#911#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/SuccessRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="552">
-          <caret line="39" column="60" lean-forward="false" selection-start-line="39" selection-start-column="60" selection-end-line="39" selection-end-column="60" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#243#244#0" expanded="true" />
-            <element signature="e#271#272#0" expanded="true" />
-            <element signature="e#325#326#0" expanded="true" />
-            <element signature="e#363#364#0" expanded="true" />
-            <element signature="e#410#411#0" expanded="true" />
-            <element signature="e#467#468#0" expanded="true" />
-            <element signature="e#509#510#0" expanded="true" />
-            <element signature="e#565#566#0" expanded="true" />
-            <element signature="e#618#619#0" expanded="true" />
-            <element signature="e#655#656#0" expanded="true" />
-            <element signature="e#713#714#0" expanded="true" />
-            <element signature="e#777#778#0" expanded="true" />
-            <element signature="e#856#857#0" expanded="true" />
-            <element signature="e#925#926#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="60">
+          <caret line="5" column="42" lean-forward="false" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="42" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRemoveRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="234">
-          <caret line="39" column="63" lean-forward="false" selection-start-line="39" selection-start-column="63" selection-end-line="39" selection-end-column="63" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#261#262#0" expanded="true" />
-            <element signature="e#289#290#0" expanded="true" />
-            <element signature="e#343#344#0" expanded="true" />
-            <element signature="e#390#391#0" expanded="true" />
-            <element signature="e#437#438#0" expanded="true" />
-            <element signature="e#503#504#0" expanded="true" />
-            <element signature="e#545#546#0" expanded="true" />
-            <element signature="e#610#611#0" expanded="true" />
-            <element signature="e#663#664#0" expanded="true" />
-            <element signature="e#709#710#0" expanded="true" />
-            <element signature="e#767#768#0" expanded="true" />
-            <element signature="e#840#841#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="60">
+          <caret line="4" column="22" lean-forward="false" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseCurrentRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/request/bean/ALiYunOSSCallbackBodyBean.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/response/BaseResponse.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/response/FileUploadChcekResponse.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="13" lean-forward="false" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/response/ZskkResponseFactory.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-8">
+          <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/oss/OSSFileAndCallbackHleper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="280">
+          <caret line="100" column="113" lean-forward="false" selection-start-line="100" selection-start-column="113" selection-end-line="100" selection-end-column="113" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/UploaderZskkApplication.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="275">
+          <caret line="32" column="21" lean-forward="true" selection-start-line="32" selection-start-column="21" selection-end-line="32" selection-end-column="21" />
+          <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="120">
-          <caret line="10" column="31" lean-forward="true" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
+        <state relative-caret-position="409">
+          <caret line="110" column="0" lean-forward="true" selection-start-line="110" selection-start-column="0" selection-end-line="110" selection-end-column="0" />
           <folding />
         </state>
       </provider>

logs/sys.log

@@ -23,3 +23,58 @@ Dicom dir monitor...
 Monitoring directory:/Users/fuyu/Desktop/zzp/test/src
 --------------------------------------------------
 
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:/Users/fuyu/Desktop/zzp/test/src
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:/Users/fuyu/Desktop/zzp/test/src
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:/Users/fuyu/Desktop/zzp/test/src
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:/Users/fuyu/Desktop/zzp/test/src
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:/Users/fuyu/Desktop/zzp/test/src
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:/Users/fuyu/Desktop/zzp/test/src
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:/Users/fuyu/Desktop/zzp/test/src
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:/Users/fuyu/Desktop/zzp/test/src
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:/Users/fuyu/Desktop/zzp/test/src
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:/Users/fuyu/Desktop/zzp/test/src
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:/Users/fuyu/Desktop/zzp/test/src
+--------------------------------------------------
+

src/main/java/com/zskk/dicom/monitor/runner/AbstractRemoveRunner.java

@@ -0,0 +1,13 @@
+package com.zskk.dicom.monitor.runner;
+
+public abstract class AbstractRemoveRunner extends BaseRunner implements IRemove{
+    @Override
+    protected boolean handle() {
+        return remove();
+    }
+
+    @Override
+    protected String action() {
+        return "remove";
+    }
+}

src/main/java/com/zskk/dicom/monitor/runner/AbstractUploadRunner.java

@@ -0,0 +1,16 @@
+package com.zskk.dicom.monitor.runner;
+
+/**
+ * 上传方法抽象类
+ */
+public abstract class AbstractUploadRunner extends BaseRunner implements IUpload{
+    @Override
+    protected boolean handle() {
+        return upload();
+    }
+
+    @Override
+    protected String action() {
+        return "upload";
+    }
+}

src/main/java/com/zskk/dicom/monitor/runner/BaseAddHistory2QueueRunner.java

@@ -1,12 +1,13 @@
 package com.zskk.dicom.monitor.runner;
 
+import com.zskk.dicom.monitor.config.Configs;
 import com.zskk.dicom.monitor.queue.IQueue;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.util.Iterator;
 
-public abstract class BaseAddHistory2QueueRunner implements Runnable{
+public abstract class BaseAddHistory2QueueRunner implements Runnable {
     /**
      * 监听目录路径
      */
@@ -38,6 +39,7 @@ public abstract class BaseAddHistory2QueueRunner implements Runnable{
     }
 
     protected void addHistory2Queue() {
+        Configs.sysLog.info("BaseAddHistory2QueueRunner: init Dir:" + this.monitorDir);
         File dir = new File(this.monitorDir);
         Iterator<File> its = FileUtils.iterateFiles(dir, suffixs, true);
         while (its.hasNext()) {

src/main/java/com/zskk/dicom/monitor/runner/BaseCurrentRunner.java

@@ -1,30 +0,0 @@
-package com.zskk.dicom.monitor.runner;
-
-import com.zskk.dicom.monitor.config.Configs;
-
-import java.util.concurrent.TimeUnit;
-// todo
-public abstract class BaseCurrentRunner extends AbstractUpload implements Runnable{
-    @Override
-    public void run() {
-        while(true) {
-            boolean flag = upload();
-            Configs.sysLog.info("--老上传队列-- :" + getQueueName() + "\t 上传结果：" + flag + "\n队列长度：" + size());
-            try {
-                TimeUnit.MILLISECONDS.sleep(10);
-                if(empty()) {
-                    Configs.sysLog.info("The old UploadQueue is empty");
-                    return;
-                }
-                if(!flag) {
-                    TimeUnit.SECONDS.sleep(1);
-                }
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-    protected abstract boolean empty();
-    protected abstract String getQueueName();
-    protected abstract int size();
-}

src/main/java/com/zskk/dicom/monitor/runner/BaseRemoveRunner.java

@@ -1,69 +1,16 @@
 package com.zskk.dicom.monitor.runner;
 
-import com.zskk.dicom.monitor.config.Configs;
+import com.zskk.dicom.monitor.utils.FileRemoveUtils;
 
-import java.util.concurrent.TimeUnit;
-
-public abstract class BaseRemoveRunner extends AbstractRemove implements Runnable{
+public abstract class BaseRemoveRunner extends AbstractRemoveRunner {
     @Override
-    public void run() {
-        while (true) {
-            try {
-                while (empty()) {
-                    printEmptyAndSleep();
-                    if(exit()) {
-                        return;
-                    }
-                }
-                if(remove()) {
-                    printSuccessAndSleep();
-                } else {
-                    printFailAndSleep();
-                }
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-    private int MIN_FAIL_SLEEP_TIME = 1;
-    private int MAX_FAIL_SLEEP_TIME = 5;
-    private int failSleepTime = 0;
-
-    private int MIN_EMPTY_SLEEP_TIME = 10;
-    private int MAX_EMPTY_SLEEP_TIME = 60;
-    private int emptySleepTime = 0;
-
-    protected abstract boolean exit();
-
-    protected void printFailAndSleep() throws InterruptedException {
-        Configs.sysLog.warn(getRunnerName() + ": " + action() + " fail");
-        if(failSleepTime < MAX_FAIL_SLEEP_TIME) {
-            failSleepTime += MIN_FAIL_SLEEP_TIME;
-        }
-        TimeUnit.SECONDS.sleep(failSleepTime);
+    public boolean remove() {
+        String sourceFilePath = getSourceFilePath();
+        return FileRemoveUtils.remove(sourceFilePath, getTargetFilePath(sourceFilePath));
     }
 
-    protected abstract String getRunnerName();
+    protected abstract String getSourceFilePath();
 
-    private String action() {
-        return "upload";
-    }
-
-    protected void printSuccessAndSleep() {
-        Configs.sysLog.info(getRunnerName() + ": " + action() + " success!" + getQueueName() + " size :" + size());
-        failSleepTime = 0;
-        emptySleepTime = 0;
-    }
-
-    protected void printEmptyAndSleep() throws InterruptedException {
-        Configs.sysLog.warn(getRunnerName() + ": " + getQueueName() + " is empty");
-        if(emptySleepTime < MAX_EMPTY_SLEEP_TIME) {
-            emptySleepTime += MIN_EMPTY_SLEEP_TIME;
-        }
-        TimeUnit.SECONDS.sleep(emptySleepTime);
-    }
+    protected abstract String getTargetFilePath(String sourceFilePath);
 
-    protected abstract boolean empty();
-    protected abstract int size();
-    protected abstract String getQueueName();
 }

src/main/java/com/zskk/dicom/monitor/runner/BaseRunner.java

@@ -0,0 +1,67 @@
+package com.zskk.dicom.monitor.runner;
+
+import com.zskk.dicom.monitor.config.Configs;
+
+import java.util.concurrent.TimeUnit;
+
+public abstract class BaseRunner implements Runnable{
+
+    private int MIN_FAIL_SLEEP_TIME = 1;
+    private int MAX_FAIL_SLEEP_TIME = 5;
+    private int failSleepTime = 0;
+
+    private int MIN_EMPTY_SLEEP_TIME = 2;
+    private int MAX_EMPTY_SLEEP_TIME = 10;
+    private int emptySleepTime = 0;
+
+    @Override
+    public void run() {
+        while (true) {
+            try {
+                while (empty()) {
+                    printEmptyAndSleep();
+                    if(exit()) {
+                        return;
+                    }
+                }
+                if(handle()) {
+                    printSuccessAndSleep();
+                } else {
+                    printFailAndSleep();
+                }
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    protected void printFailAndSleep() throws InterruptedException {
+        Configs.sysLog.warn(getRunnerName() + ": " + action() + " fail");
+        if(failSleepTime < MAX_FAIL_SLEEP_TIME) {
+            failSleepTime += MIN_FAIL_SLEEP_TIME;
+        }
+        TimeUnit.SECONDS.sleep(failSleepTime);
+    }
+
+    protected void printSuccessAndSleep() {
+        Configs.sysLog.info(getRunnerName() + ": " + action() + " success!" + getQueueName() + " size :" + size());
+        failSleepTime = 0;
+        emptySleepTime = 0;
+    }
+
+    protected void printEmptyAndSleep() throws InterruptedException {
+        Configs.sysLog.warn(getRunnerName() + ": " + getQueueName() + " is empty");
+        if(emptySleepTime < MAX_EMPTY_SLEEP_TIME) {
+            emptySleepTime += MIN_EMPTY_SLEEP_TIME;
+        }
+        TimeUnit.SECONDS.sleep(emptySleepTime);
+    }
+
+    protected abstract String action();
+    protected abstract boolean empty();
+    protected abstract int size();
+    protected abstract String getQueueName();
+    protected abstract String getRunnerName();
+    protected abstract boolean handle();
+    protected abstract boolean exit();
+}

src/main/java/com/zskk/dicom/monitor/runner/BaseUploadRunner.java

@@ -0,0 +1,30 @@
+package com.zskk.dicom.monitor.runner;
+
+import com.zskk.dicom.monitor.queue.IQueue;
+import com.zskk.dicom.monitor.uploader.BaseFileUploader;
+import org.apache.http.util.TextUtils;
+
+// todo
+public abstract class BaseUploadRunner extends  AbstractUploadRunner {
+
+    @Override
+    public boolean upload() {
+        boolean flag = false;
+        String filePath = getUploadFilePath();
+        if(TextUtils.isEmpty(filePath)) {
+            return flag;
+        }
+        flag = upload(filePath);
+        return flag;
+    }
+
+    private boolean upload(String filePath) {
+        return BaseFileUploader.upload(filePath, getSuccessQueue(), getErrorQueue());
+    }
+
+    protected abstract String getUploadFilePath();
+
+    protected abstract IQueue<String> getSuccessQueue();
+
+    protected abstract IQueue<String> getErrorQueue();
+}

src/main/java/com/zskk/dicom/monitor/runner/CurrentUploadRunner.java

@@ -1,40 +1,49 @@
 package com.zskk.dicom.monitor.runner;
 
-import com.zskk.dicom.monitor.config.Configs;
-import com.zskk.dicom.monitor.queue.*;
-import com.zskk.dicom.monitor.uploader.BaseFileUploader;
+import com.zskk.dicom.monitor.queue.CurrentUploadQueue;
+import com.zskk.dicom.monitor.queue.IQueue;
+import com.zskk.dicom.monitor.queue.RemoveFile2RetryQueue;
+import com.zskk.dicom.monitor.queue.SuccessQueue;
 
-import java.util.concurrent.TimeUnit;
+public class CurrentUploadRunner extends BaseUploadRunner {
 
-public class CurrentUploadRunner extends AbstractUpload implements Runnable{
     @Override
-    protected boolean upload(String filePath) {
-        return BaseFileUploader.upload(filePath, SuccessQueue.getInstance(), RemoveFile2RetryQueue.getInstance());
+    protected IQueue<String> getSuccessQueue() {
+        return SuccessQueue.getInstance();
+    }
+
+    @Override
+    protected IQueue<String> getErrorQueue() {
+        return RemoveFile2RetryQueue.getInstance();
     }
 
     @Override
     protected String getUploadFilePath() {
         return (String) CurrentUploadQueue.getInstance().pop();
     }
+
+    @Override
+    protected boolean empty() {
+        return CurrentUploadQueue.getInstance().empty();
+    }
+
+    @Override
+    protected int size() {
+        return CurrentUploadQueue.getInstance().size();
+    }
+
+    @Override
+    protected String getQueueName() {
+        return "CurrentUploadQueue";
+    }
+
+    @Override
+    protected String getRunnerName() {
+        return "CurrentUploadRunner";
+    }
+
     @Override
-    public void run() {
-        while(true) {
-            try {
-                if(CurrentUploadQueue.getInstance().empty()) {
-                    Configs.sysLog.warn("CurrentUploadQueue is empty");
-                    TimeUnit.SECONDS.sleep(1);
-                }
-                if(upload()) {
-                    Configs.sysLog.info("CurrentUploadRunner upload success ");
-                    TimeUnit.MILLISECONDS.sleep(10);
-                } else {
-                    Configs.sysLog.warn("CurrentUploadRunner upload error ");
-                    TimeUnit.SECONDS.sleep(1);
-                }
-
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
+    protected boolean exit() {
+        return false;
     }
 }

src/main/java/com/zskk/dicom/monitor/runner/HistoryUploadRunner.java

@@ -1,17 +1,20 @@
 package com.zskk.dicom.monitor.runner;
 
-import com.zskk.dicom.monitor.config.Configs;
+import com.zskk.dicom.monitor.queue.IQueue;
 import com.zskk.dicom.monitor.queue.OldUploadQueue;
 import com.zskk.dicom.monitor.queue.RemoveFile2RetryQueue;
 import com.zskk.dicom.monitor.queue.SuccessQueue;
-import com.zskk.dicom.monitor.uploader.BaseFileUploader;
 
-import java.util.concurrent.TimeUnit;
+public class HistoryUploadRunner extends BaseUploadRunner {
 
-public class HistoryUploadRunner extends AbstractUpload implements Runnable{
     @Override
-    protected boolean upload(String filePath) {
-        return BaseFileUploader.upload(filePath, SuccessQueue.getInstance(), RemoveFile2RetryQueue.getInstance());
+    protected IQueue<String> getSuccessQueue() {
+        return SuccessQueue.getInstance();
+    }
+
+    @Override
+    protected IQueue<String> getErrorQueue() {
+        return RemoveFile2RetryQueue.getInstance();
     }
 
     @Override
@@ -20,23 +23,27 @@ public class HistoryUploadRunner extends AbstractUpload implements Runnable{
     }
 
     @Override
-    public void run() {
-        while(true) {
-            try {
-                if(OldUploadQueue.getInstance().empty()) {
-                    Configs.sysLog.warn("OldUploadQueue is empty");
-                    return;
-                }
-                if(upload()) {
-                    Configs.sysLog.info("HistoryUploadRunner upload success");
-                    TimeUnit.MILLISECONDS.sleep(10);
-                } else {
-                    Configs.sysLog.warn("HistoryUploadRunner upload fail");
-                    TimeUnit.SECONDS.sleep(1);
-                }
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
+    protected boolean empty() {
+        return OldUploadQueue.getInstance().empty();
+    }
+
+    @Override
+    protected int size() {
+        return OldUploadQueue.getInstance().size();
+    }
+
+    @Override
+    protected String getQueueName() {
+        return "OldUploadQueue";
+    }
+
+    @Override
+    protected String getRunnerName() {
+        return "HistoryUploadRunner";
+    }
+
+    @Override
+    protected boolean exit() {
+        return true;
     }
 }

src/main/java/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.java

@@ -1,17 +1,20 @@
 package com.zskk.dicom.monitor.runner;
 
-import com.zskk.dicom.monitor.config.Configs;
 import com.zskk.dicom.monitor.queue.CurrentRetryUploadQueue;
 import com.zskk.dicom.monitor.queue.ErrorQueue;
+import com.zskk.dicom.monitor.queue.IQueue;
 import com.zskk.dicom.monitor.queue.SuccessQueue;
-import com.zskk.dicom.monitor.uploader.BaseFileUploader;
 
-import java.util.concurrent.TimeUnit;
+public class RetryCurrentUploadRunner extends BaseUploadRunner {
 
-public class RetryCurrentUploadRunner extends AbstractUpload implements Runnable{
     @Override
-    protected boolean upload(String filePath) {
-        return BaseFileUploader.upload(filePath, SuccessQueue.getInstance(), ErrorQueue.getInstance());
+    protected IQueue<String> getSuccessQueue() {
+        return SuccessQueue.getInstance();
+    }
+
+    @Override
+    protected IQueue<String> getErrorQueue() {
+        return ErrorQueue.getInstance();
     }
 
     @Override
@@ -20,23 +23,27 @@ public class RetryCurrentUploadRunner extends AbstractUpload implements Runnable
     }
 
     @Override
-    public void run() {
-        while(true) {
-            try {
-                if(CurrentRetryUploadQueue.getInstance().empty()) {
-                    Configs.sysLog.warn("CurrentRetryUploadQueue is empty");
-                    TimeUnit.SECONDS.sleep(10);
-                }
-                if(upload()) {
-                    Configs.sysLog.info("RetryCurrentUploadRunner upload success");
-                    TimeUnit.MILLISECONDS.sleep(10);
-                } else {
-                    Configs.sysLog.warn("RetryCurrentUploadRunner upload fail");
-                    TimeUnit.SECONDS.sleep(1);
-                }
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
+    protected boolean empty() {
+        return CurrentRetryUploadQueue.getInstance().empty();
+    }
+
+    @Override
+    protected int size() {
+        return CurrentRetryUploadQueue.getInstance().size();
+    }
+
+    @Override
+    protected String getQueueName() {
+        return "CurrentRetryUploadQueue";
+    }
+
+    @Override
+    protected String getRunnerName() {
+        return "RetryCurrentUploadRunner";
+    }
+
+    @Override
+    protected boolean exit() {
+        return false;
     }
 }

src/main/java/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.java

@@ -1,17 +1,20 @@
 package com.zskk.dicom.monitor.runner;
 
-import com.zskk.dicom.monitor.config.Configs;
 import com.zskk.dicom.monitor.queue.ErrorQueue;
+import com.zskk.dicom.monitor.queue.IQueue;
 import com.zskk.dicom.monitor.queue.OldRetryQueue;
 import com.zskk.dicom.monitor.queue.SuccessQueue;
-import com.zskk.dicom.monitor.uploader.BaseFileUploader;
 
-import java.util.concurrent.TimeUnit;
+public class RetryHistoryUploadRunner extends BaseUploadRunner {
 
-public class RetryHistoryUploadRunner extends AbstractUpload implements Runnable{
     @Override
-    protected boolean upload(String filePath) {
-        return BaseFileUploader.upload(filePath, SuccessQueue.getInstance(), ErrorQueue.getInstance());
+    protected IQueue<String> getSuccessQueue() {
+        return SuccessQueue.getInstance();
+    }
+
+    @Override
+    protected IQueue<String> getErrorQueue() {
+        return ErrorQueue.getInstance();
     }
 
     @Override
@@ -20,24 +23,27 @@ public class RetryHistoryUploadRunner extends AbstractUpload implements Runnable
     }
 
     @Override
-    public void run() {
-        while(true) {
-            boolean flag = upload();
-            try {
-                if(OldRetryQueue.getInstance().empty()) {
-                    Configs.sysLog.warn("OldRetryQueue is empty");
-                    return;
-                }
-                if(upload()) {
-                    Configs.sysLog.warn("RetryHistoryUploadRunner is success");
-                    TimeUnit.MILLISECONDS.sleep(10);
-                } else {
-                    Configs.sysLog.warn("RetryHistoryUploadRunner is fail");
-                    TimeUnit.SECONDS.sleep(1);
-                }
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
+    protected boolean empty() {
+        return OldRetryQueue.getInstance().empty();
+    }
+
+    @Override
+    protected int size() {
+        return OldRetryQueue.getInstance().size();
+    }
+
+    @Override
+    protected String getQueueName() {
+        return "OldRetryQueue";
+    }
+
+    @Override
+    protected String getRunnerName() {
+        return "RetryHistoryUploadRunner";
+    }
+
+    @Override
+    protected boolean exit() {
+        return true;
     }
 }

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

@@ -87,22 +87,27 @@ public class StatRunner {
         // 老文件上传
         oldUploadPools = generatePools(oldUploadPools, 2);
         oldUploadPools.execute(new HistoryUploadRunner());
+        oldUploadPools.execute(new HistoryUploadRunner());
 
         // 新文件上传
         currentUploadPools = generatePools(currentUploadPools, 2);
         currentUploadPools.execute(new CurrentUploadRunner());
+        currentUploadPools.execute(new CurrentUploadRunner());
 
         //老重试上传
         oldRetryPools = generatePools(oldRetryPools, 2);
         oldRetryPools.execute(new RetryHistoryUploadRunner());
+        oldRetryPools.execute(new RetryHistoryUploadRunner());
 
         //新重试上传
         currentRetryPools = generatePools(currentRetryPools, 2);
         currentRetryPools.execute(new RetryCurrentUploadRunner());
+        currentRetryPools.execute(new RetryCurrentUploadRunner());
 
         //成功移动文件
         successPools = generatePools(successPools, 2);
         successPools.execute(new SuccessRunner());
+        successPools.execute(new SuccessRunner());
 
         //错误移动文件
         errorPools = generateSinglePools(errorPools);

src/main/java/com/zskk/dicom/monitor/utils/FileRemoveUtils.java

@@ -15,12 +15,15 @@ import java.io.IOException;
 public class FileRemoveUtils {
     public static boolean remove(String sourceFilePath, String targetFilePath) {
         if(TextUtils.isEmpty(sourceFilePath) || TextUtils.isEmpty(targetFilePath)) {
+            Configs.sysLog.warn("remove error: sourceFilePath or targetFilePath is empty \tsourceFilePath: " + sourceFilePath + "\ttargetFilePath: " + targetFilePath);
             return false;
         }
         File sourceFile = new File(sourceFilePath);
         if(!sourceFile.exists() || !sourceFile.isFile()) {
+            Configs.sysLog.warn("remove error: sourceFile not exists or not isFile \tsourceFilePath: " + sourceFilePath);
             return false;
         }
+        Configs.sysLog.info("remove file \tsourceFilePath:" + sourceFilePath + "\ttargetFilePath:" + targetFilePath);
         File targetFile = new File(targetFilePath);
         return remove(sourceFile, targetFile);
     }

target/classes/META-INF/spring-autoconfigure-metadata.properties

@@ -1,3 +1,3 @@
-#Fri Mar 22 20:49:52 CST 2019
+#Sat Mar 23 14:25:50 CST 2019
 com.zskk.dicom.UploaderZskkApplication.Configuration=
 com.zskk.dicom.UploaderZskkApplication=