Browse Source

修改代码 提交代码 还剩下文件夹删除

fuyu 6 years ago
parent
commit
7565d67afb

+ 73 - 141
.idea/workspace.xml

@@ -6,80 +6,8 @@
   </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/queue/BaseStringQueue.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/RunnerAction.java" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/FileActionCallback.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/FileActionCallback.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileActionCallback.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileActionCallback.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileChangeProc.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileChangeProc.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/RetryFileActionCallback.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/RetryFileActionCallback.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/BaseQueue.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/BaseQueue.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/CurrentRetryUploadQueue.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/CurrentRetryUploadQueue.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/CurrentUploadQueue.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/CurrentUploadQueue.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/ErrorQueue.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/ErrorQueue.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/IQueue.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/IQueue.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/OldRetryQueue.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/OldRetryQueue.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/OldUploadQueue.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/OldUploadQueue.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/RemoveFile2RetryQueue.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/RemoveFile2RetryQueue.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/SuccessQueue.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/SuccessQueue.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AbstractRemoveRunner.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/AbstractUploadRunner.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/AddHistory2QueueRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AddHistory2QueueRunner.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AddRetryHistory2QueueRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/AddRetryHistory2QueueRunner.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/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/BaseRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseRunner.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseUploadRunner.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/BaseUploadRunner.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/IRemove.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/IRemove.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/IUpload.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/IUpload.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$/src/main/java/com/zskk/dicom/monitor/uploader/BaseFileUploader.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/BaseFileUploader.java" />
+      <change beforePath="$PROJECT_DIR$/logs/sys.log" afterPath="$PROJECT_DIR$/logs/sys.log" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/project.properties" afterPath="$PROJECT_DIR$/src/main/resources/project.properties" />
-      <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/config/NetCodeConfig.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/config/NetCodeConfig.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/config/Constants.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/config/Constants.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/monitors/FileAction.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/monitors/FileAction.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/monitors/RetryFileActionCallback.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/monitors/RetryFileActionCallback.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/BaseQueue.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/BaseQueue.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/CurrentRetryUploadQueue$CurrentRetryUploadQueueHolder.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/CurrentRetryUploadQueue$CurrentRetryUploadQueueHolder.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/CurrentRetryUploadQueue.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/CurrentRetryUploadQueue.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/CurrentUploadQueue$CurrentUploadQueueHolder.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/CurrentUploadQueue$CurrentUploadQueueHolder.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/CurrentUploadQueue.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/CurrentUploadQueue.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/ErrorQueue$ErrorQueueHolder.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/ErrorQueue$ErrorQueueHolder.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/ErrorQueue.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/ErrorQueue.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/OldRetryQueue$OldRetryQueueHolder.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/OldRetryQueue$OldRetryQueueHolder.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/OldRetryQueue.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/OldRetryQueue.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/OldUploadQueue$OldUploadQueueHolder.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/OldUploadQueue$OldUploadQueueHolder.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/OldUploadQueue.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/OldUploadQueue.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/RemoveFile2RetryQueue$RemoveFile2RetryQueueHolder.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/RemoveFile2RetryQueue$RemoveFile2RetryQueueHolder.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/RemoveFile2RetryQueue.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/RemoveFile2RetryQueue.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/SuccessQueue$SuccessQueueHolder.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/SuccessQueue$SuccessQueueHolder.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/SuccessQueue.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/queue/SuccessQueue.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/AbstractRemoveRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/AbstractRemoveRunner.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/AddHistory2QueueRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/AddHistory2QueueRunner.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/AddRetryHistory2QueueRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/AddRetryHistory2QueueRunner.class" />
-      <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/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/BaseRunner.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/runner/BaseRunner.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/ExceptionUtil.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/ExceptionUtil.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/FileHashUtil.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/FileHashUtil.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/LogEnginer.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/LogEnginer.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/oss/BaseOSSHleper.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/oss/BaseOSSHleper.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/request/bean/ALiYunOSSCallbackBodyBean.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/request/bean/ALiYunOSSCallbackBodyBean.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/BaseResponse.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/BaseResponse.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/FileUploadChcekResponse.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/FileUploadChcekResponse.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/ZskkResponseFactory$ZskkExceptionFactoryHoler.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/ZskkResponseFactory$ZskkExceptionFactoryHoler.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/ZskkResponseFactory.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/ZskkResponseFactory.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/bean/BaseResponseBean.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/bean/BaseResponseBean.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/bean/FileUploadChcekResponseBean.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/bean/FileUploadChcekResponseBean.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/bean/FileUploadResponseBean.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/response/bean/FileUploadResponseBean.class" />
-      <change beforePath="$PROJECT_DIR$/target/classes/project.properties" afterPath="$PROJECT_DIR$/target/classes/project.properties" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -130,19 +58,6 @@
           </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">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="285">
-              <caret line="29" column="56" lean-forward="false" selection-start-line="29" selection-start-column="56" selection-end-line="29" selection-end-column="56" />
-              <folding>
-                <element signature="e#1005#1006#0" expanded="true" />
-                <element signature="e#1055#1056#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="StartTimer.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StartTimer.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -163,7 +78,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="InitMonitor.java" pinned="false" current-in-tab="true">
+      <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="60">
@@ -173,6 +88,16 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="project.properties" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/project.properties">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="75">
+              <caret line="5" column="29" lean-forward="false" selection-start-line="5" selection-start-column="29" selection-end-line="9" selection-end-column="27" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="BaseFileUploader.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/BaseFileUploader.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -214,7 +139,7 @@
         <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="309">
-              <caret line="28" column="34" lean-forward="true" selection-start-line="28" selection-start-column="34" selection-end-line="28" selection-end-column="34" />
+              <caret line="28" column="34" lean-forward="false" selection-start-line="28" selection-start-column="34" selection-end-line="28" selection-end-column="34" />
               <folding />
             </state>
           </provider>
@@ -279,7 +204,6 @@
         <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/StartTimer.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/project.properties" />
         <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/NowFileActionCallback.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileChangeProc.java" />
@@ -313,6 +237,7 @@
         <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/BaseUploadRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/BaseFileUploader.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/project.properties" />
       </list>
     </option>
   </component>
@@ -503,6 +428,13 @@
               <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="resources" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -730,7 +662,7 @@
       <workItem from="1553331389550" duration="8000" />
       <workItem from="1553331405111" duration="394000" />
       <workItem from="1553332295376" duration="1606000" />
-      <workItem from="1553334103392" duration="1449000" />
+      <workItem from="1553334103392" duration="1570000" />
     </task>
     <task id="LOCAL-00001" summary="new">
       <created>1553046646348</created>
@@ -799,7 +731,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="137348000" />
+    <option name="totallyTimeSpent" value="137469000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -812,17 +744,17 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1440" height="830" extended-state="0" />
-    <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="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="true" show_stripe_button="true" weight="0.4" sideWeight="0.50858366" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5114449" 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.3297568" sideWeight="0.48958334" order="3" 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="false" show_stripe_button="true" weight="0.4" sideWeight="0.4914163" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4" sideWeight="0.4914163" 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" />
@@ -840,7 +772,6 @@
       <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" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Messages" 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="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24964234" sideWeight="0.5208333" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32833788" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -937,13 +868,6 @@
         </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="225">
-          <caret line="15" column="22" lean-forward="false" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
-        </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="195">
@@ -1039,10 +963,10 @@
         <state relative-caret-position="195">
           <caret line="13" column="34" lean-forward="false" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
           <folding>
-            <element signature="e#192#193#0" expanded="true" />
-            <element signature="e#223#224#0" expanded="true" />
-            <element signature="e#276#277#0" expanded="true" />
-            <element signature="e#318#319#0" expanded="true" />
+            <element signature="e#192#193#0" expanded="false" />
+            <element signature="e#223#224#0" expanded="false" />
+            <element signature="e#276#277#0" expanded="false" />
+            <element signature="e#318#319#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1060,8 +984,8 @@
         <state relative-caret-position="75">
           <caret line="6" column="22" lean-forward="false" selection-start-line="6" selection-start-column="3" selection-end-line="6" selection-end-column="22" />
           <folding>
-            <element signature="e#279#280#0" expanded="true" />
-            <element signature="e#350#351#0" expanded="true" />
+            <element signature="e#279#280#0" expanded="false" />
+            <element signature="e#350#351#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1095,8 +1019,8 @@
         <state relative-caret-position="150">
           <caret line="12" column="39" lean-forward="false" selection-start-line="12" selection-start-column="39" selection-end-line="12" selection-end-column="39" />
           <folding>
-            <element signature="e#260#261#0" expanded="true" />
-            <element signature="e#308#309#0" expanded="true" />
+            <element signature="e#260#261#0" expanded="false" />
+            <element signature="e#308#309#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1106,8 +1030,8 @@
         <state relative-caret-position="150">
           <caret line="12" column="34" lean-forward="false" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
           <folding>
-            <element signature="e#245#246#0" expanded="true" />
-            <element signature="e#288#289#0" expanded="true" />
+            <element signature="e#245#246#0" expanded="false" />
+            <element signature="e#288#289#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1117,8 +1041,8 @@
         <state relative-caret-position="150">
           <caret line="12" column="26" lean-forward="false" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="26" />
           <folding>
-            <element signature="e#221#222#0" expanded="true" />
-            <element signature="e#256#257#0" expanded="true" />
+            <element signature="e#221#222#0" expanded="false" />
+            <element signature="e#256#257#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1128,8 +1052,8 @@
         <state relative-caret-position="150">
           <caret line="12" column="28" lean-forward="false" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
           <folding>
-            <element signature="e#232#233#0" expanded="true" />
-            <element signature="e#269#270#0" expanded="true" />
+            <element signature="e#232#233#0" expanded="false" />
+            <element signature="e#269#270#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1139,8 +1063,8 @@
         <state relative-caret-position="150">
           <caret line="12" column="30" lean-forward="false" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="30" />
           <folding>
-            <element signature="e#233#234#0" expanded="true" />
-            <element signature="e#272#273#0" expanded="true" />
+            <element signature="e#233#234#0" expanded="false" />
+            <element signature="e#272#273#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1150,8 +1074,8 @@
         <state relative-caret-position="150">
           <caret line="12" column="37" lean-forward="false" selection-start-line="12" selection-start-column="37" selection-end-line="12" selection-end-column="37" />
           <folding>
-            <element signature="e#256#257#0" expanded="true" />
-            <element signature="e#302#303#0" expanded="true" />
+            <element signature="e#256#257#0" expanded="false" />
+            <element signature="e#302#303#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1161,8 +1085,8 @@
         <state relative-caret-position="150">
           <caret line="12" column="28" lean-forward="false" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
           <folding>
-            <element signature="e#223#224#0" expanded="true" />
-            <element signature="e#260#261#0" expanded="true" />
+            <element signature="e#223#224#0" expanded="false" />
+            <element signature="e#260#261#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1172,8 +1096,8 @@
         <state relative-caret-position="206">
           <caret line="36" column="67" lean-forward="false" selection-start-line="36" selection-start-column="67" selection-end-line="36" selection-end-column="67" />
           <folding>
-            <element signature="e#1244#1245#0" expanded="true" />
-            <element signature="e#1300#1301#0" expanded="true" />
+            <element signature="e#1244#1245#0" expanded="false" />
+            <element signature="e#1300#1301#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1191,8 +1115,8 @@
         <state relative-caret-position="615">
           <caret line="46" column="11" lean-forward="false" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="11" />
           <folding>
-            <element signature="e#922#923#0" expanded="true" />
-            <element signature="e#956#957#0" expanded="true" />
+            <element signature="e#922#923#0" expanded="false" />
+            <element signature="e#956#957#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1202,8 +1126,8 @@
         <state relative-caret-position="75">
           <caret line="6" column="8" lean-forward="false" selection-start-line="6" selection-start-column="8" selection-end-line="6" selection-end-column="8" />
           <folding>
-            <element signature="e#290#291#0" expanded="true" />
-            <element signature="e#365#366#0" expanded="true" />
+            <element signature="e#290#291#0" expanded="false" />
+            <element signature="e#365#366#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1229,8 +1153,8 @@
         <state relative-caret-position="185">
           <caret line="36" column="58" lean-forward="false" selection-start-line="36" selection-start-column="58" selection-end-line="36" selection-end-column="58" />
           <folding>
-            <element signature="e#1210#1211#0" expanded="true" />
-            <element signature="e#1260#1261#0" expanded="true" />
+            <element signature="e#1210#1211#0" expanded="false" />
+            <element signature="e#1260#1261#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1248,10 +1172,10 @@
         <state relative-caret-position="196">
           <caret line="29" column="54" lean-forward="false" selection-start-line="29" selection-start-column="54" selection-end-line="29" selection-end-column="54" />
           <folding>
-            <element signature="e#608#609#0" expanded="true" />
-            <element signature="e#670#671#0" expanded="true" />
-            <element signature="e#990#991#0" expanded="true" />
-            <element signature="e#1038#1039#0" expanded="true" />
+            <element signature="e#608#609#0" expanded="false" />
+            <element signature="e#670#671#0" expanded="false" />
+            <element signature="e#990#991#0" expanded="false" />
+            <element signature="e#1038#1039#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1261,10 +1185,10 @@
         <state relative-caret-position="199">
           <caret line="29" column="65" lean-forward="false" selection-start-line="29" selection-start-column="65" selection-end-line="29" selection-end-column="65" />
           <folding>
-            <element signature="e#663#664#0" expanded="true" />
-            <element signature="e#736#737#0" expanded="true" />
-            <element signature="e#1071#1072#0" expanded="true" />
-            <element signature="e#1119#1120#0" expanded="true" />
+            <element signature="e#663#664#0" expanded="false" />
+            <element signature="e#736#737#0" expanded="false" />
+            <element signature="e#1071#1072#0" expanded="false" />
+            <element signature="e#1119#1120#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1274,8 +1198,8 @@
         <state relative-caret-position="273">
           <caret line="36" column="57" lean-forward="false" selection-start-line="36" selection-start-column="57" selection-end-line="36" selection-end-column="57" />
           <folding>
-            <element signature="e#1193#1194#0" expanded="true" />
-            <element signature="e#1249#1250#0" expanded="true" />
+            <element signature="e#1193#1194#0" expanded="false" />
+            <element signature="e#1249#1250#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1313,7 +1237,7 @@
     <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="309">
-          <caret line="28" column="34" lean-forward="true" selection-start-line="28" selection-start-column="34" selection-end-line="28" selection-end-column="34" />
+          <caret line="28" column="34" lean-forward="false" selection-start-line="28" selection-start-column="34" selection-end-line="28" selection-end-column="34" />
           <folding />
         </state>
       </provider>
@@ -1375,6 +1299,14 @@
         </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="75">
+          <caret line="5" column="29" lean-forward="false" selection-start-line="5" selection-start-column="29" selection-end-line="9" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

+ 10 - 0
logs/sys.log

@@ -103,3 +103,13 @@ Dicom dir monitor...
 Monitoring directory:/Users/fuyu/Desktop/zzp/test/src
 --------------------------------------------------
 
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:D:\ZSKK_SYSTEM\ScpServer\Release\DICOM
+--------------------------------------------------
+
+Dicom dir monitor...
+--------------------------------------------------
+Monitoring directory:/Users/fuyu/Desktop/zzp/test/src
+--------------------------------------------------
+

+ 3 - 0
src/main/java/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: com.zskk.dicom.UploaderZskkApplication
+

+ 9 - 9
src/main/resources/project.properties

@@ -1,13 +1,13 @@
-monitor.monitorDir=D:\\ZSKK_SYSTEM\\ScpServer\\Release\\DICOM
-monitor.monitorBackDir=D:\\ZSKK_SYSTEM\\ScpServer\\Release\\DICOM_BCK
-monitor.monitorRetryDir=D:\\ZSKK_SYSTEM\\ScpServer\\Release\\DICOM_RETRY
-monitor.errorDir=D:\\ZSKK_SYSTEM\\ScpServer\\Release\\DICOM_ERROR
-monitor.hospitalId=13000003
-#monitor.monitorDir=/Users/fuyu/Desktop/zzp/test/src
-#monitor.monitorBackDir=/Users/fuyu/Desktop/zzp/test/target
-#monitor.monitorRetryDir=/Users/fuyu/Desktop/zzp/test/retry
-#monitor.errorDir=/Users/fuyu/Desktop/zzp/test/error
+#monitor.monitorDir=D:\\ZSKK_SYSTEM\\ScpServer\\Release\\DICOM
+#monitor.monitorBackDir=D:\\ZSKK_SYSTEM\\ScpServer\\Release\\DICOM_BCK
+#monitor.monitorRetryDir=D:\\ZSKK_SYSTEM\\ScpServer\\Release\\DICOM_RETRY
+#monitor.errorDir=D:\\ZSKK_SYSTEM\\ScpServer\\Release\\DICOM_ERROR
 #monitor.hospitalId=13000003
+monitor.monitorDir=/Users/fuyu/Desktop/zzp/test/src
+monitor.monitorBackDir=/Users/fuyu/Desktop/zzp/test/target
+monitor.monitorRetryDir=/Users/fuyu/Desktop/zzp/test/retry
+monitor.errorDir=/Users/fuyu/Desktop/zzp/test/error
+monitor.hospitalId=test_zzp
 monitor.pool.successPoolsLength=2
 monitor.pool.oldRetryPoolsLength=2
 monitor.pool.currentUploadPoolsLength=4

BIN
target/classes/com/zskk/dicom/monitor/queue/BaseStringQueue.class


BIN
target/classes/com/zskk/dicom/monitor/runner/RunnerAction.class


+ 9 - 9
target/classes/project.properties

@@ -1,13 +1,13 @@
-monitor.monitorDir=D:\\ZSKK_SYSTEM\\ScpServer\\Release\\DICOM
-monitor.monitorBackDir=D:\\ZSKK_SYSTEM\\ScpServer\\Release\\DICOM_BCK
-monitor.monitorRetryDir=D:\\ZSKK_SYSTEM\\ScpServer\\Release\\DICOM_RETRY
-monitor.errorDir=D:\\ZSKK_SYSTEM\\ScpServer\\Release\\DICOM_ERROR
-monitor.hospitalId=13000003
-#monitor.monitorDir=/Users/fuyu/Desktop/zzp/test/src
-#monitor.monitorBackDir=/Users/fuyu/Desktop/zzp/test/target
-#monitor.monitorRetryDir=/Users/fuyu/Desktop/zzp/test/retry
-#monitor.errorDir=/Users/fuyu/Desktop/zzp/test/error
+#monitor.monitorDir=D:\\ZSKK_SYSTEM\\ScpServer\\Release\\DICOM
+#monitor.monitorBackDir=D:\\ZSKK_SYSTEM\\ScpServer\\Release\\DICOM_BCK
+#monitor.monitorRetryDir=D:\\ZSKK_SYSTEM\\ScpServer\\Release\\DICOM_RETRY
+#monitor.errorDir=D:\\ZSKK_SYSTEM\\ScpServer\\Release\\DICOM_ERROR
 #monitor.hospitalId=13000003
+monitor.monitorDir=/Users/fuyu/Desktop/zzp/test/src
+monitor.monitorBackDir=/Users/fuyu/Desktop/zzp/test/target
+monitor.monitorRetryDir=/Users/fuyu/Desktop/zzp/test/retry
+monitor.errorDir=/Users/fuyu/Desktop/zzp/test/error
+monitor.hospitalId=test_zzp
 monitor.pool.successPoolsLength=2
 monitor.pool.oldRetryPoolsLength=2
 monitor.pool.currentUploadPoolsLength=4

+ 5 - 0
target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Sat Mar 23 17:00:05 CST 2019
+version=0.0.1-SNAPSHOT
+groupId=dicom_monitor
+artifactId=dicom_monitor

+ 0 - 0
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst


+ 74 - 0
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,74 @@
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/uploader/BaseFileUploader.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/response/bean/FileUploadChcekResponseBean.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/runner/AbstractRemoveRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/runner/IUpload.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/runner/BaseAddHistory2QueueRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/runner/AddHistory2QueueRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/queue/CurrentUploadQueue.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/monitors/RetryFileActionCallback.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/runner/ErrorRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/schedules/RetryDirMonitor.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/queue/CurrentRetryUploadQueue.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/utils/MailerUtil.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/runner/AbstractUploadRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/queue/IQueue.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/monitors/BaseFileChangeProc.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/utils/ExceptionUtil.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/utils/FileRemoveUtils.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/response/ZskkResponseFactory.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/config/Configs.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/monitors/RetryFileChangeProc.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/schedules/StartTimer.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/runner/IRemove.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/queue/BaseQueue.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/queue/SuccessQueue.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/report/ErrReporter.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/queue/OldUploadQueue.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/runner/RemoveFile2RetryRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/queue/OldRetryQueue.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/oss/OSSFileAndCallbackHleper.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/runner/BaseRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/schedules/DirMonitor.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/oss/BaseOSSHleper.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/UploaderZskkApplication.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/uploader/RetryUploadRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader_two.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/config/CopyFile.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/monitors/NowFileChangeProc.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/response/bean/FileUploadResponseBean.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/runner/AddRetryHistory2QueueRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/request/bean/ALiYunOSSCallbackBodyBean.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/utils/LogEnginer.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/response/bean/BaseResponseBean.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/config/NetCodeConfig.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/config/Constants.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/uploader/SuccessUploadQuenu.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/monitors/NowFileActionCallback.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/runner/BaseRemoveRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/uploader/HistoryFileQuenuRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/monitors/WatchDir.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/report/ErrReporterSender.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/response/FileUploadChcekResponse.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/utils/FileHashUtil.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/queue/RemoveFile2RetryQueue.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/config/OSSConfig.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/runner/SuccessRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/runner/BaseUploadRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/uploader/CurrentUploadRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/monitors/FileAction.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/response/BaseResponse.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/runner/RetryCurrentUploadRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/monitors/BaseFileActionCallback.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/runner/RetryHistoryUploadRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/monitors/OldFileChangeProc.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/runner/HistoryUploadRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/uploader/FileMover.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/monitors/FileActionCallback.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/uploader/UploadsQueue.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/uploader/OldUploadRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/runner/CurrentUploadRunner.java
+/Users/fuyu/Desktop/zzp/demo/src/main/java/com/zskk/dicom/monitor/queue/ErrorQueue.java

BIN
target/zskk-dicom-monitor-jar-with-dependencies.jar


BIN
target/zskk-dicom-monitor.jar


BIN
target/zskk-dicom-monitor.jar.original