修改配置文件,忽略上传

.gitignore

@@ -0,0 +1,10 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea
+*.iml
+out
+gen
+*.log

.idea/workspace.xml

@@ -6,14 +6,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="582764bc-f4d5-49fa-89c5-ed5a1070192f" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/sys.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sys.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/Configs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/Configs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/project.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/project.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/META-INF/spring-autoconfigure-metadata.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/META-INF/spring-autoconfigure-metadata.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/config/Configs.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/config/Configs.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/schedules/InitMonitor.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/schedules/InitMonitor.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/MonitorFileUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/zskk/dicom/monitor/utils/MonitorFileUtils.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/project.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/project.properties" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
@@ -50,7 +48,7 @@
       <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="-50">
+            <state relative-caret-position="1625">
               <caret line="69" column="10" selection-start-line="69" selection-start-column="10" selection-end-line="69" selection-end-column="10" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -59,32 +57,29 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="MonitorFileUtils.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="MonitorFileUtils.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="508">
-              <caret line="70" column="45" selection-start-line="70" selection-start-column="39" selection-end-line="70" selection-end-column="45" />
+            <state relative-caret-position="1775">
+              <caret line="77" column="26" selection-start-line="77" selection-start-column="26" selection-end-line="77" selection-end-column="26" />
             </state>
           </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="NowFileChangeProc.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileChangeProc.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="449">
-              <caret line="32" column="7" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="425">
+              <caret line="23" selection-start-line="23" selection-end-line="23" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="InitMonitor.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java">
+      <file leaf-file-name="SuccessUploadQuenu.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/SuccessUploadQuenu.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="141">
-              <caret line="23" column="34" lean-forward="true" selection-start-line="23" selection-start-column="34" selection-end-line="23" selection-end-column="34" />
+            <state relative-caret-position="300">
+              <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -92,20 +87,23 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="project.properties" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/project.properties">
+      <file leaf-file-name="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>
-              <caret column="18" selection-start-column="8" selection-end-column="18" />
+            <state relative-caret-position="350">
+              <caret line="23" column="23" selection-start-line="23" selection-start-column="23" selection-end-line="23" selection-end-column="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <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">
+      <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="290">
-              <caret line="117" column="71" selection-start-line="117" selection-start-column="71" selection-end-line="117" selection-end-column="71" />
+            <state relative-caret-position="525">
+              <caret line="23" column="34" selection-start-line="23" selection-start-column="34" selection-end-line="23" selection-end-column="34" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -113,32 +111,29 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="FileMover.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileMover.java">
+      <file leaf-file-name="project.properties" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/project.properties">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="675">
-              <caret line="47" column="8" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="59" />
+            <state relative-caret-position="100">
+              <caret line="4" column="27" selection-start-line="4" selection-start-column="27" selection-end-line="4" selection-end-column="27" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="FileUploader_two.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader_two.java">
+      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/.gitignore">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="446">
-              <caret line="49" column="63" selection-start-line="49" selection-start-column="63" selection-end-line="49" selection-end-column="63" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="150">
+              <caret line="6" column="5" lean-forward="true" selection-start-line="6" selection-start-column="5" selection-end-line="6" selection-end-column="5" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="RetryUploadRunner.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/RetryUploadRunner.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="1075">
-              <caret line="43" column="37" selection-start-line="43" selection-start-column="37" selection-end-line="43" selection-end-column="37" />
+            <state relative-caret-position="2550">
+              <caret line="105" column="23" selection-start-line="105" selection-start-column="23" selection-end-line="105" selection-end-column="23" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -146,14 +141,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="HistoryFileQuenuRunner.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/HistoryFileQuenuRunner.java">
+      <file leaf-file-name="FileMover.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileMover.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="556">
-              <caret line="37" column="9" selection-start-line="37" selection-start-column="9" selection-end-line="37" selection-end-column="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="950">
+              <caret line="47" column="8" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="59" />
             </state>
           </provider>
         </entry>
@@ -198,15 +190,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/DirMonitor.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/OldFileChangeProc.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileMover.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/RetryUploadRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploadsOss.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/StatRunner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/Configs.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/project.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/UploaderZskkApplication.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/project.properties" />
+        <option value="$PROJECT_DIR$/.gitignore" />
       </list>
     </option>
   </component>
@@ -255,8 +248,8 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="136" />
-    <option name="y" value="12" />
+    <option name="x" value="47" />
+    <option name="y" value="10" />
     <option name="width" value="1719" />
     <option name="height" value="1030" />
   </component>
@@ -266,9 +259,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
-      <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -372,6 +364,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -389,7 +382,7 @@
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.0" />
-    <property name="settings.editor.selected.configurable" value="vcs.Git" />
+    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
     <property name="settings.editor.splitter.proportion" value="0.2768031" />
   </component>
   <component name="RecentsManager">
@@ -512,7 +505,9 @@
       <workItem from="1552959048285" duration="16360000" />
       <workItem from="1553046095420" duration="17775000" />
       <workItem from="1553132992622" duration="14255000" />
-      <workItem from="1553156098317" duration="6885000" />
+      <workItem from="1553156098317" duration="7211000" />
+      <workItem from="1553219266255" duration="2776000" />
+      <workItem from="1553223215863" duration="196000" />
     </task>
     <task id="LOCAL-00001" summary="new">
       <created>1553046646348</created>
@@ -556,11 +551,18 @@
       <option name="project" value="LOCAL" />
       <updated>1553159162510</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="修改创建文件路径">
+      <created>1553165101920</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1553165101920</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="97197000" />
+    <option name="totallyTimeSpent" value="100495000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -572,29 +574,28 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="136" y="12" width="1719" height="1030" extended-state="0" />
+    <frame x="47" y="10" width="1719" height="1030" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32867134" />
-      <window_info anchor="bottom" id="Messages" order="8" sideWeight="0.49856114" weight="0.3293556" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.121157326" side_tool="true" visible="true" weight="0.31042382" />
+      <window_info active="true" anchor="bottom" id="Event Log" order="7" sideWeight="0.08800482" side_tool="true" visible="true" weight="0.28522336" />
       <window_info anchor="right" id="Maven Projects" order="3" weight="0.15618336" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.87884265" visible="true" weight="0.31042382" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.9119952" weight="0.45933563" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.34498835" />
       <window_info anchor="bottom" id="Spring" order="7" weight="0.32983682" />
       <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.90777576" weight="0.096219935" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1904762" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19770946" />
       <window_info anchor="bottom" id="Problems" order="7" weight="0.32983682" />
       <window_info anchor="right" id="Database" order="3" weight="0.32995737" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="right" id="Ant Build" order="1" visible="true" weight="0.17420132" />
+      <window_info anchor="right" id="Ant Build" order="1" visible="true" weight="0.14044605" />
       <window_info id="UI Designer" order="2" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.8937628" weight="0.13915095" />
@@ -603,6 +604,7 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Messages" order="8" sideWeight="0.49856114" weight="0.3293556" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" id="CDI" order="3" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -649,7 +651,8 @@
     <MESSAGE value="提取" />
     <MESSAGE value="11111111111111111111111" />
     <MESSAGE value="测" />
-    <option name="LAST_COMMIT_MESSAGE" value="测" />
+    <MESSAGE value="修改创建文件路径" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改创建文件路径" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -661,13 +664,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://D:/Java/jdk1.8.0_121/src.zip!/java/util/concurrent/ExecutorService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="136" column="45" selection-start-line="136" selection-start-column="41" selection-end-line="136" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://D:/Java/jdk1.8.0_121/src.zip!/java/util/concurrent/Executor.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="281">
@@ -734,9 +730,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-225">
           <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -754,13 +747,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/LogEnginer.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="275">
-          <caret line="124" column="4" selection-start-line="124" selection-start-column="4" selection-end-line="124" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.6/commons-io-2.6.jar!/org/apache/commons/io/FileUtils.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="162">
@@ -799,13 +785,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileChangeProc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="424">
-          <caret line="86" column="1" lean-forward="true" selection-start-line="10" selection-end-line="86" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/FileActionCallback.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="100">
@@ -917,26 +896,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/UploadsQueue.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="505">
-          <caret line="27" column="6" selection-start-line="27" selection-start-column="6" selection-end-line="27" selection-end-column="6" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/SuccessUploadQuenu.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-514">
-          <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1500">
@@ -966,7 +925,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/RetryUploadRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1075">
+        <state relative-caret-position="950">
           <caret line="43" column="37" selection-start-line="43" selection-start-column="37" selection-end-line="43" selection-end-column="37" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -974,39 +933,47 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploadsOss.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploadsOss.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/HistoryFileQuenuRunner.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="14" column="25" lean-forward="true" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
+        <state relative-caret-position="825">
+          <caret line="37" column="9" selection-start-line="37" selection-start-column="9" selection-end-line="37" selection-end-column="9" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/HistoryFileQuenuRunner.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader_two.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="556">
-          <caret line="37" column="9" selection-start-line="37" selection-start-column="9" selection-end-line="37" selection-end-column="9" />
+        <state relative-caret-position="975">
+          <caret line="49" column="63" selection-start-line="49" selection-start-column="63" selection-end-line="49" selection-end-column="63" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileUploader_two.java">
+    <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="446">
-          <caret line="49" column="63" selection-start-line="49" selection-start-column="63" selection-end-line="49" selection-end-column="63" />
+        <state relative-caret-position="525">
+          <caret line="23" column="34" selection-start-line="23" selection-start-column="34" selection-end-line="23" selection-end-column="34" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileMover.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="950">
+          <caret line="47" column="8" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="59" />
+        </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="-50">
+        <state relative-caret-position="1625">
           <caret line="69" column="10" selection-start-line="69" selection-start-column="10" selection-end-line="69" selection-end-column="10" />
           <folding>
             <element signature="imports" expanded="true" />
@@ -1014,54 +981,78 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/config/Configs.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/LogEnginer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="290">
-          <caret line="117" column="71" selection-start-line="117" selection-start-column="71" selection-end-line="117" selection-end-column="71" />
+        <state relative-caret-position="525">
+          <caret line="121" column="29" selection-start-line="121" selection-start-column="29" selection-end-line="121" selection-end-column="29" />
+        </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="350">
+          <caret line="23" column="23" selection-start-line="23" selection-start-column="23" selection-end-line="23" selection-end-column="23" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/schedules/InitMonitor.java">
+    <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="141">
-          <caret line="23" column="34" lean-forward="true" selection-start-line="23" selection-start-column="34" selection-end-line="23" selection-end-column="34" />
+        <state relative-caret-position="2550">
+          <caret line="105" column="23" selection-start-line="105" selection-start-column="23" selection-end-line="105" selection-end-column="23" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/project.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/UploadsQueue.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="18" selection-start-column="8" selection-end-column="18" />
+        <state relative-caret-position="-245">
+          <caret line="27" column="6" selection-start-line="27" selection-start-column="6" selection-end-line="27" selection-end-column="6" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/UploaderZskkApplication.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/SuccessUploadQuenu.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="449">
-          <caret line="32" column="7" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
+        <state relative-caret-position="300">
+          <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/uploader/FileMover.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="675">
-          <caret line="47" column="8" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="59" />
+        <state relative-caret-position="1775">
+          <caret line="77" column="26" selection-start-line="77" selection-start-column="26" selection-end-line="77" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/utils/MonitorFileUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zskk/dicom/monitor/monitors/NowFileChangeProc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="425">
+          <caret line="23" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/project.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="100">
+          <caret line="4" column="27" selection-start-line="4" selection-start-column="27" selection-end-line="4" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="508">
-          <caret line="70" column="45" selection-start-line="70" selection-start-column="39" selection-end-line="70" selection-end-column="45" />
+        <state relative-caret-position="150">
+          <caret line="6" column="5" lean-forward="true" selection-start-line="6" selection-start-column="5" selection-end-line="6" selection-end-column="5" />
         </state>
       </provider>
     </entry>

logs/sys.log

@@ -3,248 +3,3 @@ Dicom dir monitor...
 Monitoring directory:D:\zskk\zskk_system
 --------------------------------------------------
 
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-
-Dicom dir monitor...
---------------------------------------------------
-Monitoring directory:D:\zskk\zskk_system
---------------------------------------------------
-

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

@@ -112,10 +112,10 @@ public class MonitorFileUtils {
 		targetFile = targetFile.replace(Configs.monitorRetryDir, "");
 		targetFile = Configs.eorrRetryDir + targetFile;
 		String targetFileDirStr = targetFile.substring(0, targetFile.lastIndexOf(File.separator));
-		Configs.sysLog.info("11-----11-----错误文件：" + targetFile + "/r/n 目录名称:" + targetFileDirStr);
+		Configs.sysLog.info("33-----33-----错误文件：" + targetFile + "/r/n 目录名称:" + targetFileDirStr);
 		File targetFileDir = new File(targetFileDirStr);
 		if (!targetFileDir.exists()) {
-			System.out.println("------------------------------------------------------------------------------------------");
+			System.out.println("@------------------------------------------------------------------------------------------");
 			Boolean cr = targetFileDir.mkdirs();
 			if (cr) {
 				Configs.sysLog.info("Create backup dir :" + targetFileDir.getAbsolutePath());

src/main/resources/project.properties

@@ -2,7 +2,8 @@ monitor.monitorDir=D:\\zskk\\zskk_system
 monitor.monitorBackDir=D:\\zskk\\zskk_system_back12
 monitor.monitorRetryDir=D:\\zskk\\zskk_system_Retry12
 monitor.eorrRetryDir=D:\\zskk\\zskk_system_eorr12
-monitor.hospitalId=73090001
+monitor.hospitalId=test_zzp
+#73090001
 monitor.postHost=api.pacsonline.cn
 monitor.postPort=80
 monitor.postUri=/upload

target/classes/project.properties

@@ -2,7 +2,8 @@ monitor.monitorDir=D:\\zskk\\zskk_system
 monitor.monitorBackDir=D:\\zskk\\zskk_system_back12
 monitor.monitorRetryDir=D:\\zskk\\zskk_system_Retry12
 monitor.eorrRetryDir=D:\\zskk\\zskk_system_eorr12
-monitor.hospitalId=73090001
+monitor.hospitalId=test_zzp
+#73090001
 monitor.postHost=api.pacsonline.cn
 monitor.postPort=80
 monitor.postUri=/upload