增加配置文件

.idea/workspace.xml

@@ -6,33 +6,16 @@
   </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/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/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/config/Configs.java" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/Configs.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/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$/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/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/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/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/utils/FileRemoveUtils.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/FileRemoveUtils.class" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/config/Configs.class" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/config/Configs.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/schedules/StatRunner.class" afterPath="" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -49,39 +32,40 @@
   <component name="CompilerWorkspaceConfiguration">
     <option name="MAKE_PROJECT_ON_SAVE" value="true" />
   </component>
+  <component name="CoverageDataManager">
+    <SUITE FILE_PATH="coverage/uploader_zskk$UploaderZskkApplication.coverage" NAME="UploaderZskkApplication Coverage Results" MODIFIED="1553326344726" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="true">
+      <FILTER>com.zskk.dicom.*</FILTER>
+    </SUITE>
+  </component>
   <component name="DatabaseView">
     <option name="SHOW_INTERMEDIATE" value="true" />
     <option name="GROUP_DATA_SOURCES" value="true" />
     <option name="GROUP_SCHEMA" value="true" />
     <option name="GROUP_CONTENTS" value="false" />
     <option name="SORT_POSITIONED" value="false" />
+    <option name="SHOW_TABLE_DETAILS" value="true" />
     <option name="SHOW_EMPTY_GROUPS" value="false" />
     <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
     <expand />
     <select />
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <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">
+      <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="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 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="BaseQueue.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/BaseQueue.java">
           <provider selected="true" editor-type-id="text-editor">
-            <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" />
+            <state relative-caret-position="255">
+              <caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding />
             </state>
           </provider>
@@ -97,71 +81,76 @@
           </provider>
         </entry>
       </file>
-      <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">
+      <file leaf-file-name="BaseRunner.java" pinned="false" current-in-tab="false">
+        <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="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+            <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>
       </file>
-      <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">
+      <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="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-              <folding />
+            <state relative-caret-position="75">
+              <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="FileUploadChcekResponse.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/response/FileUploadChcekResponse.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="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" />
+            <state relative-caret-position="1200">
+              <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="ZskkResponseFactory.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/response/ZskkResponseFactory.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="-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" />
+            <state relative-caret-position="345">
+              <caret line="32" column="21" lean-forward="false" 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="OSSFileAndCallbackHleper.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/oss/OSSFileAndCallbackHleper.java">
+      <file leaf-file-name="StatRunner.java" pinned="false" current-in-tab="false">
+        <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="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 relative-caret-position="-2162">
+              <caret line="76" column="20" lean-forward="false" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+              <folding>
+                <element signature="e#6716#6717#0" expanded="true" />
+                <element signature="e#6764#6765#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="UploaderZskkApplication.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/UploaderZskkApplication.java">
+      <file leaf-file-name="Configs.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/Configs.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" />
+            <state relative-caret-position="466">
+              <caret line="171" column="0" lean-forward="true" selection-start-line="171" selection-start-column="0" selection-end-line="171" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <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">
+      <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="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" />
+            <state relative-caret-position="240">
+              <caret line="16" column="34" lean-forward="true" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" />
               <folding />
             </state>
           </provider>
@@ -183,6 +172,8 @@
       <find>eorrRetryDir</find>
       <find>oss</find>
       <find>renameFileName</find>
+      <find>addHistoryFile2UploadPools</find>
+      <find>postPort</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -205,12 +196,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/BaseFileChangeProc.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileChangeProc.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileActionCallback.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/BaseQueue.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/IQueue.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/OldRetryQueue.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/OldUploadQueue.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/project.properties" />
-        <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/uploader/OldUploadRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/OldUploadRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader.java" />
@@ -246,7 +234,10 @@
         <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/queue/BaseQueue.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/Configs.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/project.properties" />
       </list>
     </option>
   </component>
@@ -295,7 +286,7 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-54" />
+    <option name="x" value="12" />
     <option name="y" value="24" />
     <option name="width" value="1440" />
     <option name="height" value="829" />
@@ -316,99 +307,34 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scratches" />
-      <pane id="ProjectPane">
+      <pane id="PackagesPane">
         <subPane>
           <expand>
             <path>
-              <item name="uploader_zskk" type="b2602c69:ProjectViewProjectNode" />
-              <item name="demo" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="uploader_zskk" type="b2602c69:ProjectViewProjectNode" />
-              <item name="demo" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
-            </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" />
-            </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" />
-            </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="monitor" 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="monitor" type="462c0819:PsiDirectoryNode" />
-              <item name="monitors" 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="monitor" type="462c0819:PsiDirectoryNode" />
-              <item name="queue" type="462c0819:PsiDirectoryNode" />
+              <item name="uploader_zskk" type="58d84e3e:PackageViewProjectNode" />
+              <item name="dicom_monitor" type="616d4139:PackageViewModuleNode" />
             </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
             <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="monitor" type="462c0819:PsiDirectoryNode" />
-              <item name="runner" 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="monitor" type="462c0819:PsiDirectoryNode" />
-              <item name="schedules" 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="monitor" type="462c0819:PsiDirectoryNode" />
-              <item name="uploader" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="uploader_zskk" type="b2602c69:ProjectViewProjectNode" />
@@ -416,9 +342,6 @@
               <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="monitor" type="462c0819:PsiDirectoryNode" />
-              <item name="utils" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="uploader_zskk" type="b2602c69:ProjectViewProjectNode" />
@@ -427,7 +350,6 @@
               <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" />
@@ -436,26 +358,7 @@
               <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" />
+              <item name="config" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="uploader_zskk" type="b2602c69:ProjectViewProjectNode" />
@@ -468,6 +371,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scratches" />
       <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
@@ -673,7 +577,11 @@
       <workItem from="1553314543157" duration="907000" />
       <workItem from="1553316949034" duration="30000" />
       <workItem from="1553322322843" duration="1772000" />
-      <workItem from="1553324126988" duration="871000" />
+      <workItem from="1553324126988" duration="1654000" />
+      <workItem from="1553325947172" duration="417000" />
+      <workItem from="1553326368863" duration="1354000" />
+      <workItem from="1553327756166" duration="927000" />
+      <workItem from="1553329568596" duration="1115000" />
     </task>
     <task id="LOCAL-00001" summary="new">
       <created>1553046646348</created>
@@ -742,7 +650,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="128624000" />
+    <option name="totallyTimeSpent" value="133220000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -759,23 +667,22 @@
     <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="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="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="true" show_stripe_button="true" weight="0.477551" sideWeight="0.5" order="2" 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.79564035" 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.36123034" 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.38125893" 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="Database" 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="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="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24964234" sideWeight="0.47916666" 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="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" />
@@ -784,7 +691,9 @@
       <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" />
     </layout>
   </component>
@@ -878,20 +787,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="150">
-          <caret line="10" column="18" lean-forward="false" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/Configs.java">
-      <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" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/OldUploadRunner.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -920,13 +815,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/BaseQueue.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="492">
-          <caret line="60" column="29" lean-forward="false" selection-start-line="60" selection-start-column="29" selection-end-line="60" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/CurrentUploadQueue.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
@@ -1043,25 +931,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <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>
@@ -1069,25 +938,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <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>
@@ -1095,25 +945,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <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>
@@ -1121,21 +952,6 @@
       <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>
@@ -1143,7 +959,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <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>
     </entry>
@@ -1170,25 +985,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="60">
           <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>
@@ -1196,20 +992,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <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/BaseRunner.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <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>
@@ -1217,7 +999,6 @@
       <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" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1225,7 +1006,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <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>
@@ -1233,88 +1013,118 @@
       <provider selected="true" editor-type-id="text-editor">
         <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">
+    <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="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 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" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/runner/SuccessRunner.java">
+    <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="42" lean-forward="false" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="42" />
-          <folding />
+          <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>
       </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/response/FileUploadChcekResponse.java">
       <provider selected="true" editor-type-id="text-editor">
-        <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 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" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/request/bean/ALiYunOSSCallbackBodyBean.java">
+    <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="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" />
+        </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="1200">
+          <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/response/BaseResponse.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="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" />
+          <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/response/FileUploadChcekResponse.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="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" />
+        <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/response/ZskkResponseFactory.java">
+    <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="-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" />
+        <state relative-caret-position="75">
+          <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>
+    <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="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/oss/OSSFileAndCallbackHleper.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/queue/BaseQueue.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" />
+        <state relative-caret-position="255">
+          <caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
           <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" />
+        <state relative-caret-position="345">
+          <caret line="32" column="21" lean-forward="false" 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="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" />
+        <state relative-caret-position="-2162">
+          <caret line="76" column="20" lean-forward="false" selection-start-line="76" selection-start-column="20" selection-end-line="76" selection-end-column="20" />
+          <folding>
+            <element signature="e#6716#6717#0" expanded="true" />
+            <element signature="e#6764#6765#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/Configs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="466">
+          <caret line="171" column="0" lean-forward="true" selection-start-line="171" selection-start-column="0" selection-end-line="171" selection-end-column="0" />
+          <folding />
+        </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="240">
+          <caret line="16" column="34" lean-forward="true" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" />
           <folding />
         </state>
       </provider>

logs/sys.log

@@ -78,3 +78,28 @@ 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/config/Configs.java

@@ -6,6 +6,23 @@ import java.io.File;
 import java.util.ResourceBundle;
 
 public class Configs {
+    /**
+     * 成功移除线程数
+     */
+    public static Integer successPoolsLength = 2;
+    /**
+     * 老重试线程数
+     */
+    public static Integer oldRetryPoolsLength = 2;
+    /**
+     * 当前上传线程数
+     */
+    public static Integer currentUploadPoolsLength = 4;
+    /**
+     * 老文件上传线程数
+     */
+    public static Integer oldUploadPoolsLength = 4;
+
     /**
      * 医院编号
      */
@@ -152,5 +169,10 @@ public class Configs {
         if(!"fastdfs".equals(archiveWay)){
             archiveWay = "oss";
         }
+
+        successPoolsLength = Integer.parseInt(rb.getString("monitor.pool.successPoolsLength"));
+        oldRetryPoolsLength = Integer.parseInt(rb.getString("monitor.pool.oldRetryPoolsLength"));
+        currentUploadPoolsLength = Integer.parseInt(rb.getString("monitor.pool.currentUploadPoolsLength"));
+        oldUploadPoolsLength = Integer.parseInt(rb.getString("monitor.pool.oldUploadPoolsLength"));
     }
 }

src/main/java/com/zskk/dicom/monitor/queue/BaseQueue.java

@@ -25,7 +25,7 @@ public class BaseQueue<T> implements IQueue<T>{
     }
 
     @Override
-    public T pop() {
+    public synchronized T pop() {
         checkSecurity();
         if(size() == 0) {
             return null;
@@ -43,7 +43,7 @@ public class BaseQueue<T> implements IQueue<T>{
     }
 
     @Override
-    public boolean push(T t) {
+    public synchronized boolean push(T t) {
         checkSecurity();
         if(this.queue.contains(t)) {
             return false;

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

@@ -1,5 +1,6 @@
 package com.zskk.dicom.monitor.schedules;
 
+import com.zskk.dicom.monitor.config.Configs;
 import com.zskk.dicom.monitor.runner.*;
 
 import java.util.concurrent.ExecutorService;
@@ -17,67 +18,92 @@ import java.util.concurrent.TimeUnit;
  */
 public class StatRunner {
 
-/*
-    //手动创建线程池
-    private static  ThreadFactory namedThreadFactory = new ThreadFactoryBuilder().setNameFormat("dirMonitorThread-call-runner-%d").build();
-    private static  ExecutorService dirMonitorPools = new ThreadPoolExecutor(1,1,0L,TimeUnit.MILLISECONDS,new LinkedBlockingQueue<Runnable>(),namedThreadFactory);
-    private static  ThreadFactory namedThreadFactory1 = new ThreadFactoryBuilder().setNameFormat("oldUploadThread-call-runner-%d").build();
-    private static  ExecutorService oldUploadPools = new ThreadPoolExecutor(1,2,0L,TimeUnit.MILLISECONDS,new LinkedBlockingQueue<Runnable>(),namedThreadFactory1);
-    private static  ThreadFactory namedThreadFactory2 = new ThreadFactoryBuilder().setNameFormat("currentUploadThread-call-runner-%d").build();
-    private static  ExecutorService currentUploadPools = new ThreadPoolExecutor(1,2,0L,TimeUnit.MILLISECONDS,new LinkedBlockingQueue<Runnable>(),namedThreadFactory2);
-    private static  ThreadFactory namedThreadFactory3 = new ThreadFactoryBuilder().setNameFormat("addHistoryFileThread-call-runner-%d").build();
-    private static  ExecutorService addHistoryFile2UploadPools = new ThreadPoolExecutor(1,2,0L,TimeUnit.MILLISECONDS,new LinkedBlockingQueue<Runnable>(),namedThreadFactory3);
-*/
-//    private static ExecutorService oldUploadPools = null;
-//    //新
-//    private static ExecutorService currentUploadPools = null;
-//    //历史文件记录
-////    private static ExecutorService addHistoryFile2UploadPools = null;
-//    //成功备份移除
-//    private static ExecutorService successPools = null;
-//    //重试上传线程
-//    private static ExecutorService retryUploadPools = null;
-
-
-    /**
-     * 文件监听线程(池)
+    /**
+     * dcm文件产生文件夹监听线程(池)
      */
     private static ExecutorService dirMonitorPools = null;
+
+    /**
+     * 重试文件夹监听线程(池)
+     */
     private static ExecutorService retryMonitorPools = null;
 
-    private static ExecutorService addHistoryFile2UploadPools = null;
-    private static ExecutorService addHistoryRetryFile2UploadPools = null;
+    /**
+     * 把遗留上传文件添加进入队列的线程(池)
+     */
+    private static ExecutorService addHistoryFile2QueuePools = null;
+
+    /**
+     * 把遗留重试上传文件添加进入队列的线程(池)
+     */
+    private static ExecutorService addHistoryRetryFile2QueuePools = null;
+
+
+    /**
+     * 上传当前重试文件线程(池)
+     */
+    private static ExecutorService currentRetryPools = null;
+    /**
+     * 把文件移动到错误文件的线程(池)
+     */
+    private static ExecutorService errorPools = null;
+
+    /**
+     * 把文件移动到重试文件的线程(池)
+     */
+    private static ExecutorService remove2RetryPools = null;
 
+    /**
+     * 上传遗留上传文件线程池(默认线程数 4 最小线程数 1)
+     */
     private static ExecutorService oldUploadPools = null;
+
+    /**
+     * 上传当前上传文件线程池(默认线程数 4 最小线程数 1)
+     */
     private static ExecutorService currentUploadPools = null;
+
+    /**
+     * 上传遗留重试文件线程池(默认线程数 2 最小线程数 1)
+     */
     private static ExecutorService oldRetryPools = null;
-    private static ExecutorService currentRetryPools = null;
 
+    /**
+     * 把文件移动到备份文件的线程池(默认线程数 2 最小线程数 1)
+     */
     private static ExecutorService successPools = null;
-    private static ExecutorService errorPools = null;
-    private static ExecutorService remove2RetryPools = null;
-
 
+    /**
+     * 初始化各种线程池并启动线程
+     */
     public static void start() {
-        //监听目标文件
-        dirMonitorPools = generateSinglePools(dirMonitorPools);
-        dirMonitorPools.execute(new DirMonitor());
+        // 监听目标文件
+        startDirMonitorPools();
 
-        //监听重试文件
-        retryMonitorPools = generateSinglePools(retryMonitorPools);
-        retryMonitorPools.execute(new RetryDirMonitor());
+        // 监听重试文件
+        startRetryMonitorPools();
 
         //老文件加入老上传队列
-        addHistoryFile2UploadPools = generateSinglePools(addHistoryFile2UploadPools);
-        addHistoryFile2UploadPools.execute(new AddHistory2QueueRunner());
+        startAddHistoryFile2UploadPools();
 
         //老重试文件加入老重试上传队列
-        addHistoryRetryFile2UploadPools = generateSinglePools(addHistoryRetryFile2UploadPools);
-        addHistoryRetryFile2UploadPools.execute(new AddRetryHistory2QueueRunner());
+        startAddHistoryRetryFile2UploadPools();
+
+        //新重试上传
+        startCurrentRetryPools();
+
+        //重试移动文件
+        startRemove2RetryPools();
+
+        //错误移动文件
+        startErrorPools();
+
+        // 成功移动
+        startSuccessPools(Math.max(Configs.successPoolsLength, 1));
+
+        // 当前上传
+        startCurrentUploadPools(Math.max(Configs.currentUploadPoolsLength, 1));
 
-        //老文件or重试放入队列
-//        addHistoryFile2UploadPools = generatePools(addHistoryFile2UploadPools, 2);
-//        addHistoryFile2UploadPools.execute(new HistoryFileQuenuRunner());
         try {
             TimeUnit.SECONDS.sleep(1);
         } catch (InterruptedException e) {
@@ -85,58 +111,126 @@ public class StatRunner {
         }
 
         // 老文件上传
-        oldUploadPools = generatePools(oldUploadPools, 2);
-        oldUploadPools.execute(new HistoryUploadRunner());
-        oldUploadPools.execute(new HistoryUploadRunner());
+        startOldUploadPools(Math.max(Configs.oldUploadPoolsLength, 1));
 
-        // 新文件上传
-        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());
+        // 老重试上传
+        startOldRetryPools(Math.max(Configs.oldRetryPoolsLength, 1));
+    }
 
-        //错误移动文件
+    /**
+     * 启动文件移动到错误文件夹的线程池(单线程)
+     */
+    private static void startErrorPools() {
         errorPools = generateSinglePools(errorPools);
         errorPools.execute(new ErrorRunner());
+    }
 
-        //重试移动文件
+    /**
+     * 启动文件移动到重试文件夹的线程池(单线程)
+     */
+    private static void startRemove2RetryPools() {
         remove2RetryPools = generateSinglePools(remove2RetryPools);
         remove2RetryPools.execute(new RemoveFile2RetryRunner());
-        // 成功备份移除
-//        successPools = generatePools(successPools, 2);
-//        successPools.execute(new SuccessUploadQuenu());
-//        // 老上传
-//        oldUploadPools = generatePools(oldUploadPools, 2);
-//        oldUploadPools.execute(new CurrentUploadRunner());
-//        // oldUploadPools.execute(new FileUploadsOss(UploadsQueue.fileQueue));
-//        // oldUploadPools.execute(new CurrentUploadRunner());
-//        // oldUploadPools.execute(new FileUploadsOss(FileUploadsOss.FLAG_UPLOAD));
-//        // 新上传
-//        currentUploadPools = generatePools(currentUploadPools, 2);
-//        currentUploadPools.execute(new CurrentUploadRunner());
-//        // 重试上传
-//        retryUploadPools = generatePools(retryUploadPools, 2);
-//        retryUploadPools.execute(new RetryUploadRunner());
-        // retryUploadPools.execute(new FileUploadsOss(UploadsQueue.failFileQueue));
-        // retryUploadPools.execute(new RetryUploadRunner());
-        // retryUploadPools.execute(new FileUploadsOss(FileUploadsOss.FLAG_RETRY));
+    }
+
+    /**
+     * 启动重试上传的线程池(单线程)
+     */
+    private static void startCurrentRetryPools() {
+        currentRetryPools = generateSinglePools(currentRetryPools);
+        currentRetryPools.execute(new RetryCurrentUploadRunner());
+    }
+
+    /**
+     * 启动遍历重试文件夹并把遗留重试文件放入队列的线程池(单线程)
+     */
+    private static void startAddHistoryRetryFile2UploadPools() {
+        addHistoryRetryFile2QueuePools = generateSinglePools(addHistoryRetryFile2QueuePools);
+        addHistoryRetryFile2QueuePools.execute(new AddRetryHistory2QueueRunner());
+    }
+
+    /**
+     * 启动遍历dcm产生文件夹并把遗留上传文件放入上传队列的线程池(单线程)
+     */
+    private static void startAddHistoryFile2UploadPools() {
+        addHistoryFile2QueuePools = generateSinglePools(addHistoryFile2QueuePools);
+        addHistoryFile2QueuePools.execute(new AddHistory2QueueRunner());
+    }
 
+    /**
+     * 启动重试文件夹监听的线程池(单线程)
+     */
+    private static void startRetryMonitorPools() {
+        retryMonitorPools = generateSinglePools(retryMonitorPools);
+        retryMonitorPools.execute(new RetryDirMonitor());
     }
 
+    /**
+     * 启动目标dcm产生文件夹监听的线程池(单线程)
+     */
+    private static void startDirMonitorPools() {
+        dirMonitorPools = generateSinglePools(dirMonitorPools);
+        dirMonitorPools.execute(new DirMonitor());
+    }
+
+    /**
+     * 启动遗留重试文件上传的线程池
+     * @param oldRetryPoolsLength 线程池数量
+     */
+    private static void startOldRetryPools(int oldRetryPoolsLength) {
+        int count = 0;
+        oldRetryPools = generatePools(oldRetryPools, oldRetryPoolsLength);
+        while (count < oldRetryPoolsLength) {
+            oldRetryPools.execute(new RetryHistoryUploadRunner());
+            count++;
+        }
+    }
+
+    /**
+     * 启动遗留文件上传的线程池
+     * @param oldUploadPoolsLength 线程池数量
+     */
+    private static void startOldUploadPools(int oldUploadPoolsLength) {
+        int count = 0;
+        oldUploadPools = generatePools(oldUploadPools, oldUploadPoolsLength);
+        while (count < oldUploadPoolsLength) {
+            oldUploadPools.execute(new HistoryUploadRunner());
+            count++;
+        }
+    }
+
+    /**
+     * 启动当前文件上传的线程池
+     * @param currentUploadPoolsLength 线程池数量
+     */
+    private static void startCurrentUploadPools(int currentUploadPoolsLength) {
+        int count = 0;
+        currentUploadPools = generatePools(currentUploadPools, currentUploadPoolsLength);
+        while (count < currentUploadPoolsLength) {
+            currentUploadPools.execute(new CurrentUploadRunner());
+            count++;
+        }
+    }
+
+    /**
+     * 启动上传成功后文件移动到备份文件夹的线程池
+     * @param successPoolsLength 线程池数量
+     */
+    private static void startSuccessPools(int successPoolsLength) {
+        int count = 0;
+        successPools = generatePools(successPools, successPoolsLength);
+        while (count < successPoolsLength) {
+            successPools.execute(new SuccessRunner());
+            count++;
+        }
+    }
+
+    /**
+     * 生成线程池
+     * @param oldPool 老线程池
+     * @param length 线程数量
+     * @return
+     */
     public static ExecutorService generatePools(ExecutorService oldPool, int length) {
         if (oldPool != null && !oldPool.isTerminated()) {
             oldPool.shutdown();
@@ -154,6 +248,11 @@ public class StatRunner {
         return Executors.newFixedThreadPool(length);
     }
 
+    /**
+     * 生成只有一个线程的线程池
+     * @param oldPool 老线程池
+     * @return
+     */
     public static ExecutorService generateSinglePools(ExecutorService oldPool) {
         return generatePools(oldPool, 1);
     }

src/main/resources/project.properties

@@ -7,6 +7,10 @@ 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
+monitor.pool.oldUploadPoolsLength=4
 monitor.logDir=/Users/fuyu/Desktop
 monitor.archiveWay=oss
 #73090001

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

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

target/classes/project.properties

@@ -7,6 +7,10 @@ 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
+monitor.pool.oldUploadPoolsLength=4
 monitor.logDir=/Users/fuyu/Desktop
 monitor.archiveWay=oss
 #73090001