koul 5 tahun lalu
induk
melakukan
cdefb061e8
100 mengubah file dengan 1614 tambahan dan 326 penghapusan
  1. 16 1
      .idea/compiler.xml
  2. 1 0
      .idea/encodings.xml
  3. 73 4
      .idea/hsl.iml
  4. 13 0
      .idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml
  5. 13 0
      .idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml
  6. 13 0
      .idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml
  7. 13 0
      .idea/libraries/Maven__com_jcraft_jsch_0_1_53.xml
  8. 13 0
      .idea/libraries/Maven__com_oracle_ojdbc_ojdbc8_19_3_0_0.xml
  9. 13 0
      .idea/libraries/Maven__com_oracle_ojdbc_ons_19_3_0_0.xml
  10. 13 0
      .idea/libraries/Maven__com_oracle_ojdbc_oraclepki_19_3_0_0.xml
  11. 13 0
      .idea/libraries/Maven__com_oracle_ojdbc_osdt_cert_19_3_0_0.xml
  12. 13 0
      .idea/libraries/Maven__com_oracle_ojdbc_osdt_core_19_3_0_0.xml
  13. 13 0
      .idea/libraries/Maven__com_oracle_ojdbc_simplefan_19_3_0_0.xml
  14. 13 0
      .idea/libraries/Maven__com_oracle_ojdbc_ucp_19_3_0_0.xml
  15. 13 0
      .idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
  16. 13 0
      .idea/libraries/Maven__commons_io_commons_io_2_5.xml
  17. 13 0
      .idea/libraries/Maven__commons_net_commons_net_3_6.xml
  18. 13 0
      .idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
  19. 13 0
      .idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml
  20. 13 0
      .idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
  21. 13 0
      .idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml
  22. 13 0
      .idea/libraries/Maven__log4j_log4j_1_2_17.xml
  23. 13 0
      .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_10.xml
  24. 13 0
      .idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_10.xml
  25. 13 0
      .idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml
  26. 13 0
      .idea/libraries/Maven__net_minidev_json_smart_2_3.xml
  27. 13 0
      .idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_10.xml
  28. 13 0
      .idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_2.xml
  29. 13 0
      .idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_2.xml
  30. 13 0
      .idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
  31. 13 0
      .idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml
  32. 13 0
      .idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_13.xml
  33. 13 0
      .idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_13.xml
  34. 13 0
      .idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml
  35. 13 0
      .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml
  36. 13 0
      .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml
  37. 13 0
      .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml
  38. 13 0
      .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml
  39. 13 0
      .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml
  40. 13 0
      .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml
  41. 13 0
      .idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml
  42. 13 0
      .idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml
  43. 13 0
      .idea/libraries/Maven__org_objenesis_objenesis_2_6.xml
  44. 13 0
      .idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
  45. 13 0
      .idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
  46. 13 0
      .idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
  47. 13 0
      .idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml
  48. 13 0
      .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml
  49. 13 0
      .idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_0_RELEASE.xml
  50. 13 0
      .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_0_RELEASE.xml
  51. 13 0
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_0_RELEASE.xml
  52. 13 0
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_0_RELEASE.xml
  53. 13 0
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_0_RELEASE.xml
  54. 13 0
      .idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_0_RELEASE.xml
  55. 13 0
      .idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_0_RELEASE.xml
  56. 13 0
      .idea/libraries/Maven__org_springframework_spring_aop_5_2_6_RELEASE.xml
  57. 13 0
      .idea/libraries/Maven__org_springframework_spring_beans_5_2_6_RELEASE.xml
  58. 13 0
      .idea/libraries/Maven__org_springframework_spring_context_5_2_6_RELEASE.xml
  59. 13 0
      .idea/libraries/Maven__org_springframework_spring_core_5_2_6_RELEASE.xml
  60. 13 0
      .idea/libraries/Maven__org_springframework_spring_expression_5_2_6_RELEASE.xml
  61. 13 0
      .idea/libraries/Maven__org_springframework_spring_jcl_5_2_6_RELEASE.xml
  62. 13 0
      .idea/libraries/Maven__org_springframework_spring_test_5_2_7_RELEASE.xml
  63. 13 0
      .idea/libraries/Maven__org_springframework_spring_web_5_1_9_RELEASE.xml
  64. 13 0
      .idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml
  65. 13 0
      .idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml
  66. 13 0
      .idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml
  67. 10 1
      .idea/misc.xml
  68. 0 3
      META-INF/MANIFEST.MF
  69. TEMPAT SAMPAH
      lib/commons-csv-1.4.jar
  70. TEMPAT SAMPAH
      lib/commons-io-2.4.jar
  71. TEMPAT SAMPAH
      lib/commons-net-3.6.jar
  72. TEMPAT SAMPAH
      lib/dom4j-1.6.1.jar
  73. TEMPAT SAMPAH
      lib/flexjson-2.1.jar
  74. TEMPAT SAMPAH
      lib/httpcore-4.4.10.jar
  75. TEMPAT SAMPAH
      lib/jackson-core-asl-1.9.13.jar
  76. TEMPAT SAMPAH
      lib/jackson-mapper-asl-1.9.13.jar
  77. TEMPAT SAMPAH
      lib/javax.servlet.jar
  78. TEMPAT SAMPAH
      lib/jsch-0.1.54.jar
  79. TEMPAT SAMPAH
      lib/junit.jar
  80. TEMPAT SAMPAH
      lib/log4j-1.2.15.jar
  81. TEMPAT SAMPAH
      lib/ojdbc6-11.2.0.jar
  82. TEMPAT SAMPAH
      lib/slf4j-api-1.7.21.jar
  83. 0 2
      my.log
  84. 100 0
      pom.xml
  85. 0 51
      src/com/uas/main/Main.java
  86. 58 0
      src/main/java/com/uas/LhctApplication.java
  87. 44 53
      src/main/java/com/uas/main/Download.java
  88. 133 0
      src/main/java/com/uas/main/DownloadFilePath.java
  89. 24 39
      src/main/java/com/uas/main/Upload.java
  90. 3 3
      src/main/java/com/uas/util/BaseUtil.java
  91. 119 0
      src/main/java/com/uas/util/FileUtil.java
  92. 78 43
      src/main/java/com/uas/util/FtpUtil.java
  93. 27 29
      src/main/java/com/uas/util/JdbcUtil.java
  94. 35 3
      src/main/java/com/uas/util/SFTPUtil.java
  95. 4 0
      src/main/resources/application.yml
  96. 12 0
      src/main/resources/properties/dbconfig.properties
  97. 58 0
      src/main/resources/properties/ftpconfig.properties
  98. 0 0
      src/main/resources/properties/log4j.properties
  99. 0 67
      src/properties/dbconfig.properties
  100. 0 27
      src/properties/dbconfig3.properties

+ 16 - 1
.idea/compiler.xml

@@ -2,6 +2,21 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <option name="BUILD_PROCESS_HEAP_SIZE" value="2048" />
-    <bytecodeTargetLevel target="8" />
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="hsl" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel target="8">
+      <module name="hsl" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="hsl" options="-parameters" />
+    </option>
   </component>
 </project>

+ 1 - 0
.idea/encodings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8" addBOMForNewFiles="with NO BOM">
+    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
     <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>

+ 73 - 4
.idea/hsl.iml

@@ -1,16 +1,85 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager">
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/properties" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="commons-csv-1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.oracle.ojdbc:ojdbc8:19.3.0.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.oracle.ojdbc:ucp:19.3.0.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.oracle.ojdbc:oraclepki:19.3.0.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.oracle.ojdbc:osdt_cert:19.3.0.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.oracle.ojdbc:osdt_core:19.3.0.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.oracle.ojdbc:simplefan:19.3.0.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.oracle.ojdbc:ons:19.3.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.0.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.16.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.3.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.10.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.3.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
+    <orderEntry type="library" name="Maven: commons-net:commons-net:3.6" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.2.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.6.RELEASE" level="project" />
   </component>
 </module>

+ 13 - 0
.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: ch.qos.logback:logback-classic:1.2.3">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: ch.qos.logback:logback-core:1.2.3">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.jayway.jsonpath:json-path:2.4.0">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__com_jcraft_jsch_0_1_53.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.jcraft:jsch:0.1.53">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/com/jcraft/jsch/0.1.53/jsch-0.1.53.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/com/jcraft/jsch/0.1.53/jsch-0.1.53-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/com/jcraft/jsch/0.1.53/jsch-0.1.53-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__com_oracle_ojdbc_ojdbc8_19_3_0_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.oracle.ojdbc:ojdbc8:19.3.0.0">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/ojdbc8/19.3.0.0/ojdbc8-19.3.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/ojdbc8/19.3.0.0/ojdbc8-19.3.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/ojdbc8/19.3.0.0/ojdbc8-19.3.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__com_oracle_ojdbc_ons_19_3_0_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.oracle.ojdbc:ons:19.3.0.0">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/ons/19.3.0.0/ons-19.3.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/ons/19.3.0.0/ons-19.3.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/ons/19.3.0.0/ons-19.3.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__com_oracle_ojdbc_oraclepki_19_3_0_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.oracle.ojdbc:oraclepki:19.3.0.0">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/oraclepki/19.3.0.0/oraclepki-19.3.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/oraclepki/19.3.0.0/oraclepki-19.3.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/oraclepki/19.3.0.0/oraclepki-19.3.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__com_oracle_ojdbc_osdt_cert_19_3_0_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.oracle.ojdbc:osdt_cert:19.3.0.0">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/osdt_cert/19.3.0.0/osdt_cert-19.3.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/osdt_cert/19.3.0.0/osdt_cert-19.3.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/osdt_cert/19.3.0.0/osdt_cert-19.3.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__com_oracle_ojdbc_osdt_core_19_3_0_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.oracle.ojdbc:osdt_core:19.3.0.0">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/osdt_core/19.3.0.0/osdt_core-19.3.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/osdt_core/19.3.0.0/osdt_core-19.3.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/osdt_core/19.3.0.0/osdt_core-19.3.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__com_oracle_ojdbc_simplefan_19_3_0_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.oracle.ojdbc:simplefan:19.3.0.0">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/simplefan/19.3.0.0/simplefan-19.3.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/simplefan/19.3.0.0/simplefan-19.3.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/simplefan/19.3.0.0/simplefan-19.3.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__com_oracle_ojdbc_ucp_19_3_0_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.oracle.ojdbc:ucp:19.3.0.0">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/ucp/19.3.0.0/ucp-19.3.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/ucp/19.3.0.0/ucp-19.3.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/com/oracle/ojdbc/ucp/19.3.0.0/ucp-19.3.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__commons_io_commons_io_2_5.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-io:commons-io:2.5">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/commons-io/commons-io/2.5/commons-io-2.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/commons-io/commons-io/2.5/commons-io-2.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/commons-io/commons-io/2.5/commons-io-2.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__commons_net_commons_net_3_6.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-net:commons-net:3.6">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/commons-net/commons-net/3.6/commons-net-3.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/commons-net/commons-net/3.6/commons-net-3.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/commons-net/commons-net/3.6/commons-net-3.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: dom4j:dom4j:1.6.1">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: jakarta.activation:jakarta.activation-api:1.2.2">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__log4j_log4j_1_2_17.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: log4j:log4j:1.2.17">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/log4j/log4j/1.2.17/log4j-1.2.17.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/log4j/log4j/1.2.17/log4j-1.2.17-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/log4j/log4j/1.2.17/log4j-1.2.17-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_10.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.bytebuddy:byte-buddy:1.10.10">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/net/bytebuddy/byte-buddy/1.10.10/byte-buddy-1.10.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/net/bytebuddy/byte-buddy/1.10.10/byte-buddy-1.10.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/net/bytebuddy/byte-buddy/1.10.10/byte-buddy-1.10.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_10.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.bytebuddy:byte-buddy-agent:1.10.10">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/net/bytebuddy/byte-buddy-agent/1.10.10/byte-buddy-agent-1.10.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/net/bytebuddy/byte-buddy-agent/1.10.10/byte-buddy-agent-1.10.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/net/bytebuddy/byte-buddy-agent/1.10.10/byte-buddy-agent-1.10.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.minidev:accessors-smart:1.2">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/net/minidev/accessors-smart/1.2/accessors-smart-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/net/minidev/accessors-smart/1.2/accessors-smart-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/net/minidev/accessors-smart/1.2/accessors-smart-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__net_minidev_json_smart_2_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.minidev:json-smart:2.3">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/net/minidev/json-smart/2.3/json-smart-2.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/net/minidev/json-smart/2.3/json-smart-2.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/net/minidev/json-smart/2.3/json-smart-2.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_10.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.httpcomponents:httpcore:4.4.10">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/apache/httpcomponents/httpcore/4.4.10/httpcore-4.4.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/apache/httpcomponents/httpcore/4.4.10/httpcore-4.4.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/apache/httpcomponents/httpcore/4.4.10/httpcore-4.4.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.logging.log4j:log4j-api:2.13.2">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/apache/logging/log4j/log4j-api/2.13.2/log4j-api-2.13.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/apache/logging/log4j/log4j-api/2.13.2/log4j-api-2.13.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/apache/logging/log4j/log4j-api/2.13.2/log4j-api-2.13.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.2">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/apache/logging/log4j/log4j-to-slf4j/2.13.2/log4j-to-slf4j-2.13.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/apache/logging/log4j/log4j-to-slf4j/2.13.2/log4j-to-slf4j-2.13.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/apache/logging/log4j/log4j-to-slf4j/2.13.2/log4j-to-slf4j-2.13.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apiguardian:apiguardian-api:1.1.0">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.assertj:assertj-core:3.16.1">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/assertj/assertj-core/3.16.1/assertj-core-3.16.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/assertj/assertj-core/3.16.1/assertj-core-3.16.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/assertj/assertj-core/3.16.1/assertj-core-3.16.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_13.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/codehaus/jackson/jackson-core-asl/1.9.13/jackson-core-asl-1.9.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/codehaus/jackson/jackson-core-asl/1.9.13/jackson-core-asl-1.9.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/codehaus/jackson/jackson-core-asl/1.9.13/jackson-core-asl-1.9.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_13.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/codehaus/jackson/jackson-mapper-asl/1.9.13/jackson-mapper-asl-1.9.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/codehaus/jackson/jackson-mapper-asl/1.9.13/jackson-mapper-asl-1.9.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/codehaus/jackson/jackson-mapper-asl/1.9.13/jackson-mapper-asl-1.9.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hamcrest:hamcrest:2.2">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/hamcrest/hamcrest/2.2/hamcrest-2.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/hamcrest/hamcrest/2.2/hamcrest-2.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.junit.jupiter:junit-jupiter:5.6.2">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/junit/jupiter/junit-jupiter/5.6.2/junit-jupiter-5.6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/junit/jupiter/junit-jupiter/5.6.2/junit-jupiter-5.6.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/junit/jupiter/junit-jupiter/5.6.2/junit-jupiter-5.6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/junit/jupiter/junit-jupiter-api/5.6.2/junit-jupiter-api-5.6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/junit/jupiter/junit-jupiter-api/5.6.2/junit-jupiter-api-5.6.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/junit/jupiter/junit-jupiter-api/5.6.2/junit-jupiter-api-5.6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/junit/jupiter/junit-jupiter-engine/5.6.2/junit-jupiter-engine-5.6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/junit/jupiter/junit-jupiter-engine/5.6.2/junit-jupiter-engine-5.6.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/junit/jupiter/junit-jupiter-engine/5.6.2/junit-jupiter-engine-5.6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/junit/jupiter/junit-jupiter-params/5.6.2/junit-jupiter-params-5.6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/junit/jupiter/junit-jupiter-params/5.6.2/junit-jupiter-params-5.6.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/junit/jupiter/junit-jupiter-params/5.6.2/junit-jupiter-params-5.6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.junit.platform:junit-platform-commons:1.6.2">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/junit/platform/junit-platform-commons/1.6.2/junit-platform-commons-1.6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/junit/platform/junit-platform-commons/1.6.2/junit-platform-commons-1.6.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/junit/platform/junit-platform-commons/1.6.2/junit-platform-commons-1.6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.junit.platform:junit-platform-engine:1.6.2">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/junit/platform/junit-platform-engine/1.6.2/junit-platform-engine-1.6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/junit/platform/junit-platform-engine/1.6.2/junit-platform-engine-1.6.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/junit/platform/junit-platform-engine/1.6.2/junit-platform-engine-1.6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mockito:mockito-core:3.3.3">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/mockito/mockito-core/3.3.3/mockito-core-3.3.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/mockito/mockito-core/3.3.3/mockito-core-3.3.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/mockito/mockito-core/3.3.3/mockito-core-3.3.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mockito:mockito-junit-jupiter:3.3.3">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/mockito/mockito-junit-jupiter/3.3.3/mockito-junit-jupiter-3.3.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/mockito/mockito-junit-jupiter/3.3.3/mockito-junit-jupiter-3.3.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/mockito/mockito-junit-jupiter/3.3.3/mockito-junit-jupiter-3.3.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.objenesis:objenesis:2.6">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/objenesis/objenesis/2.6/objenesis-2.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/objenesis/objenesis/2.6/objenesis-2.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/objenesis/objenesis/2.6/objenesis-2.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.opentest4j:opentest4j:1.2.0">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.ow2.asm:asm:5.0.4">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/ow2/asm/asm/5.0.4/asm-5.0.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/ow2/asm/asm/5.0.4/asm-5.0.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.skyscreamer:jsonassert:1.5.0">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:jul-to-slf4j:1.7.30">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:slf4j-api:1.7.30">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_0_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot:2.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot/2.3.0.RELEASE/spring-boot-2.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot/2.3.0.RELEASE/spring-boot-2.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot/2.3.0.RELEASE/spring-boot-2.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_0_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot-autoconfigure/2.3.0.RELEASE/spring-boot-autoconfigure-2.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot-autoconfigure/2.3.0.RELEASE/spring-boot-autoconfigure-2.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot-autoconfigure/2.3.0.RELEASE/spring-boot-autoconfigure-2.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_0_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter:2.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot-starter/2.3.0.RELEASE/spring-boot-starter-2.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot-starter/2.3.0.RELEASE/spring-boot-starter-2.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot-starter/2.3.0.RELEASE/spring-boot-starter-2.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_0_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot-starter-logging/2.3.0.RELEASE/spring-boot-starter-logging-2.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot-starter-logging/2.3.0.RELEASE/spring-boot-starter-logging-2.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot-starter-logging/2.3.0.RELEASE/spring-boot-starter-logging-2.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_0_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot-starter-test/2.3.0.RELEASE/spring-boot-starter-test-2.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot-starter-test/2.3.0.RELEASE/spring-boot-starter-test-2.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot-starter-test/2.3.0.RELEASE/spring-boot-starter-test-2.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_0_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-test:2.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot-test/2.3.0.RELEASE/spring-boot-test-2.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot-test/2.3.0.RELEASE/spring-boot-test-2.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot-test/2.3.0.RELEASE/spring-boot-test-2.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_0_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.0.RELEASE">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot-test-autoconfigure/2.3.0.RELEASE/spring-boot-test-autoconfigure-2.3.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot-test-autoconfigure/2.3.0.RELEASE/spring-boot-test-autoconfigure-2.3.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/springframework/boot/spring-boot-test-autoconfigure/2.3.0.RELEASE/spring-boot-test-autoconfigure-2.3.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_aop_5_2_6_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-aop:5.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-aop/5.2.6.RELEASE/spring-aop-5.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-aop/5.2.6.RELEASE/spring-aop-5.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-aop/5.2.6.RELEASE/spring-aop-5.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_beans_5_2_6_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-beans:5.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-beans/5.2.6.RELEASE/spring-beans-5.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-beans/5.2.6.RELEASE/spring-beans-5.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-beans/5.2.6.RELEASE/spring-beans-5.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_context_5_2_6_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-context:5.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-context/5.2.6.RELEASE/spring-context-5.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-context/5.2.6.RELEASE/spring-context-5.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-context/5.2.6.RELEASE/spring-context-5.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_core_5_2_6_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-core:5.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-core/5.2.6.RELEASE/spring-core-5.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-core/5.2.6.RELEASE/spring-core-5.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-core/5.2.6.RELEASE/spring-core-5.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_expression_5_2_6_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-expression:5.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-expression/5.2.6.RELEASE/spring-expression-5.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-expression/5.2.6.RELEASE/spring-expression-5.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-expression/5.2.6.RELEASE/spring-expression-5.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_jcl_5_2_6_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-jcl:5.2.6.RELEASE">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-jcl/5.2.6.RELEASE/spring-jcl-5.2.6.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-jcl/5.2.6.RELEASE/spring-jcl-5.2.6.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-jcl/5.2.6.RELEASE/spring-jcl-5.2.6.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_test_5_2_7_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-test:5.2.7.RELEASE">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-test/5.2.7.RELEASE/spring-test-5.2.7.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-test/5.2.7.RELEASE/spring-test-5.2.7.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-test/5.2.7.RELEASE/spring-test-5.2.7.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_springframework_spring_web_5_1_9_RELEASE.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-web:5.1.9.RELEASE">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-web/5.1.9.RELEASE/spring-web-5.1.9.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-web/5.1.9.RELEASE/spring-web-5.1.9.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/springframework/spring-web/5.1.9.RELEASE/spring-web-5.1.9.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.xmlunit:xmlunit-core:2.7.0">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/xmlunit/xmlunit-core/2.7.0/xmlunit-core-2.7.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/xmlunit/xmlunit-core/2.7.0/xmlunit-core-2.7.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/xmlunit/xmlunit-core/2.7.0/xmlunit-core-2.7.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.yaml:snakeyaml:1.26">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/org/yaml/snakeyaml/1.26/snakeyaml-1.26.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/org/yaml/snakeyaml/1.26/snakeyaml-1.26-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/org/yaml/snakeyaml/1.26/snakeyaml-1.26-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/Maven__xml_apis_xml_apis_1_0_b2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: xml-apis:xml-apis:1.0.b2">
+    <CLASSES>
+      <root url="jar://C:/Tools/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://C:/Tools/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://C:/Tools/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 10 - 1
.idea/misc.xml

@@ -9,6 +9,13 @@
   <component name="Kotlin2JsCompilerArguments">
     <option name="sourceMapEmbedSources" />
   </component>
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
       <profile-state>
@@ -66,5 +73,7 @@
       </profile-state>
     </entry>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/bin" />
+  </component>
 </project>

+ 0 - 3
META-INF/MANIFEST.MF

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: com.uas.main.Main
-

TEMPAT SAMPAH
lib/commons-csv-1.4.jar


TEMPAT SAMPAH
lib/commons-io-2.4.jar


TEMPAT SAMPAH
lib/commons-net-3.6.jar


TEMPAT SAMPAH
lib/dom4j-1.6.1.jar


TEMPAT SAMPAH
lib/flexjson-2.1.jar


TEMPAT SAMPAH
lib/httpcore-4.4.10.jar


TEMPAT SAMPAH
lib/jackson-core-asl-1.9.13.jar


TEMPAT SAMPAH
lib/jackson-mapper-asl-1.9.13.jar


TEMPAT SAMPAH
lib/javax.servlet.jar


TEMPAT SAMPAH
lib/jsch-0.1.54.jar


TEMPAT SAMPAH
lib/junit.jar


TEMPAT SAMPAH
lib/log4j-1.2.15.jar


TEMPAT SAMPAH
lib/ojdbc6-11.2.0.jar


TEMPAT SAMPAH
lib/slf4j-api-1.7.21.jar


File diff ditekan karena terlalu besar
+ 0 - 2
my.log


+ 100 - 0
pom.xml

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.3.0.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <groupId>com.uas</groupId>
+    <artifactId>lhct</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>lhct</name>
+    <description>Demo project for Spring Boot</description>
+
+    <properties>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.oracle.ojdbc</groupId>
+            <artifactId>ojdbc8</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+        </dependency>
+        <dependency>
+            <groupId>com.jcraft</groupId>
+            <artifactId>jsch</artifactId>
+            <version>0.1.53</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>3.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>1.9.13</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>5.2.7.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.10</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>5.1.9.RELEASE</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

+ 0 - 51
src/com/uas/main/Main.java

@@ -1,51 +0,0 @@
-package com.uas.main;
-import com.uas.util.BaseUtil;
-import com.uas.util.JdbcUtil;
-
-import static com.uas.main.Upload.*;
-
-public class Main {
-	
-	public static void main(String[] args) {
-		 
-	  final long timeInterval =5*60*1000;
-	        Runnable runnable = new Runnable() {  
-	            @Override
-				public void run() {
-	                while (true) {
-	                    // ------- code for task to run  
-	                    a();
-	                    // ------- ends here  
-	                    try {
-	                        Thread.sleep(timeInterval);  
-	                    } catch (InterruptedException e) {  
-	                        e.printStackTrace();  
-	                    }  
-	                }  
-	            }  
-	        };  
-	        Thread thread = new Thread(runnable);  
-	        thread.start();
-    }
-	
-	
-	
-	public static  void a() {
-		run();
-		System.out.println("begin");
-		com.uas.main.Download.run();
-		
-		try{ //关闭数据库连接
-			if(JdbcUtil.connection!=null){
-				JdbcUtil.connection.close();
-			}
-		}catch(Exception e){
-			BaseUtil.getLogger().error(e.toString());
-			e.printStackTrace();
-		}finally{
-			JdbcUtil.connection = null;
-		}
-		System.out.println("run over!");
-	}
-
-}

+ 58 - 0
src/main/java/com/uas/LhctApplication.java

@@ -0,0 +1,58 @@
+package com.uas;
+
+import com.uas.util.BaseUtil;
+import com.uas.util.JdbcUtil;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import java.util.Date;
+
+import static com.uas.main.Download.downloadRun;
+import static com.uas.main.DownloadFilePath.runDownloadFilePath;
+import static com.uas.main.Upload.uploadRun;
+
+/**
+ * @author koul
+ * @date 2020-05-26
+ */
+
+@SpringBootApplication
+@EnableScheduling
+public class LhctApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(LhctApplication.class, args);
+    }
+
+    @Scheduled(fixedRate=1000*60*5)
+    public void ediSendAndReceive() {
+        uploadRun();
+        System.out.println("begin"+new Date());
+        downloadRun();
+        closeJdbc();
+        System.out.println("run over!");
+    }
+
+    @Scheduled(fixedRate=1000*60*60)
+    public void downloadFile() {
+        System.out.println("begin download"+new Date());
+        runDownloadFilePath();
+        closeJdbc();
+        System.out.println("download over!");
+    }
+    private void closeJdbc(){
+        //关闭数据库连接
+        try{
+            if(JdbcUtil.connection!=null){
+                JdbcUtil.connection.close();
+            }
+        }catch(Exception e){
+            BaseUtil.getLogger().error(e.toString());
+            e.printStackTrace();
+        }finally{
+            JdbcUtil.connection = null;
+        }
+    }
+}

+ 44 - 53
src/com/uas/main/Download.java → src/main/java/com/uas/main/Download.java

@@ -1,5 +1,16 @@
 package com.uas.main;
 
+import com.jcraft.jsch.JSchException;
+import com.uas.util.BaseUtil;
+import com.uas.util.FtpUtil;
+import com.uas.util.JdbcUtil;
+import com.uas.util.SFTPUtil;
+import org.apache.commons.net.ftp.FTPClient;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.dom4j.Document;
+import org.dom4j.Element;
+import org.dom4j.io.SAXReader;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -8,15 +19,10 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.*;
-
-import com.jcraft.jsch.JSchException;
-import com.uas.util.*;
-import org.apache.commons.net.ftp.FTPClient;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.dom4j.Document;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class Download{
 
@@ -70,13 +76,12 @@ public class Download{
             }
 			}
 		
-		String updateMainConditon = getUpdateMainCondtion(mainData,xmlConfig);
-        updateMainConditon = updateMainConditon.replace(" pi_inoutno='' and ","");
+		String updateMainConditon = getUpdateMainCondtion(mainData,xmlConfig); //主表更新条件
+		updateMainConditon = updateMainConditon.replace(" pi_inoutno='' and ","");//主表更新条件
 		String maincode = mainData.get(xmlConfig.get("xd_main_conditiontag"));
 		if(mainXmlConfig.size()>0){
 			mainTableUpdateSql = getUpdateMainFields(mainData,xmlConfig,mainXmlConfig); //主表更新字段
 			mainTableUpdateSql += " where " + updateMainConditon;
-
 			sqls.add(mainTableUpdateSql);
 		}
 		if(detailXmlConfig!=null&&detailXmlConfig.size()>0){
@@ -427,41 +432,23 @@ public class Download{
     	}
 		return data;
 	}			
-    public static void run(){
-		downloadByDepotAndSob("N_YITOA_LHCT-SF","N_YITOA_LHCT","聯合創泰科技有限公司"); //联合创泰-顺丰
-		//downloadByDepotAndSob("N_YITOA_LHCT-QF","N_YITOA_LHCT","聯合創泰科技有限公司"); //联合创泰-旗丰
-		downloadByDepotAndSob("N_YITOA_LHCT-FS","N_YITOA_LHCT","聯合創泰科技有限公司"); //联合创泰-富森
-        downloadByDepotAndSob("N_YITOA_LHCT-SLC","N_YITOA_LHCT","聯合創泰科技有限公司"); //联合创泰-SLC上海保税仓
-        downloadByDepotAndSob("N_YITOA_LHCT-ZSD","N_YITOA_LHCT","聯合創泰科技有限公司"); //联合创泰-准时达
-		downloadByDepotAndSob("N_YITOA_LHCT_HK-FS","N_YITOA_LHCT_HK","英唐創泰香港科技有限公司");//英唐创泰香港-富森
-		downloadByDepotAndSob("N_HUASL-FS","N_HUASL","香港华商龙"); //华商龙-富森
-    	downloadByDepotAndSob("N_HUASL-XN","N_HUASL","香港华商龙"); //华商龙-新宁
-    	//downloadByDepotAndSob("N_HUASL-QF","N_HUASL","香港华商龙");//华商龙-旗丰
-    	downloadByDepotAndSob("N_WILICHK-QF","N_WILICHK","(华商龙)威尔电子");//威尔电子-旗丰
-		downloadByDepotAndSob("N_WILICHK-FS","N_WILICHK","(华商龙)威尔电子");//威尔电子-富森
-    	//downloadByDepotAndSob("N_BJKG-QF","N_BJKG","柏建控股");//柏建控股-旗丰
-		downloadByDepotAndSob("N_BJKG-FS","N_BJKG","柏建控股"); //柏建控股-富森
-		//深圳华商龙-准时达
-		downloadByDepotAndSob("N_HUASL_SZ-DRD","N_HUASL_SZ","深圳华商龙");
-		//上海宇声-准时达
-		downloadByDepotAndSob("N_E_SHINE_SH-DRD","N_E_SHINE_SH","上海宇声");
-		//重庆华商龙-准时达
-		downloadByDepotAndSob("HSL_CQ-DRD","HSL_CQ","重庆华商龙");
-		//北京华商龙-准时达
-		downloadByDepotAndSob("HSL_BJ-DRD","HSL_BJ","北京华商龙");
-		//青岛华商龙-准时达
-		downloadByDepotAndSob("N_HUASL_QD-DRD","N_HUASL_QD","青岛华商龙");
-    	
-    	
-    	
-//    	downloadByDepotAndSob("N_HUASL-JS","N_HUASL"); //华商龙-嘉晟
-//    	downloadByDepotAndSob("N_WILICHK-JS","N_WILICHK"); //威尔电子-嘉晟
-//    	downloadByDepotAndSob("N_BJKG-JS","N_BJKG"); //柏建控股-嘉晟
-//    	downloadByDepotAndSob("USOFT_MALL_HK-JS","USOFT_MALL_HK"); //优软商城香港-嘉晟
-//    	downloadByDepotAndSob("t_n_huasl-QF","t_n_huasl");
+    public static void downloadRun(){
+		//联合创泰-顺丰
+		//downloadByDepotAndSob("N_YITOA_LHCT-SF","N_YITOA_LHCT","聯合創泰科技有限公司");
+		//联合创泰-富森
+		downloadByDepotAndSob("N_YITOA_LHCT-FS","N_YITOA_LHCT","聯合創泰科技有限公司");
+		//联合创泰-准时达
+		//downloadByDepotAndSob("N_YITOA_LHCT-ZSD","N_YITOA_LHCT","聯合創泰科技有限公司");
+		//联合创泰-SLC上海保税仓
+        downloadByDepotAndSob("N_YITOA_LHCT-SLC","N_YITOA_LHCT","聯合創泰科技有限公司");
+		//联合创泰-中芯
+		downloadByDepotAndSob("N_YITOA_LHCT-ZX","N_YITOA_LHCT","聯合創泰科技有限公司");
+		//英唐创泰香港-富森
+		//downloadByDepotAndSob("N_YITOA_LHCT_HK-FS","N_YITOA_LHCT_HK","英唐創泰香港科技有限公司");
+
 
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	public static void downloadByDepotAndSob(String depot,String sob,String enterprise){
 		FTPClient client = null;
@@ -469,11 +456,11 @@ public class Download{
 		List<String> sqls = new ArrayList<String>();
 		boolean executeRes = false;
 		Connection connect = null;
-		
-    	try {
-    		Map<String,Object> servMap = JdbcUtil.getFtpConfigs();
+
+		try {
+			Map<String,Object> servMap = JdbcUtil.getFtpConfigs();
 			Map<String,Object> ftpMap = (Map<String,Object>)servMap.get(depot);
-			if ("N_YITOA_LHCT-SF".equals(depot)){
+			if ("N_YITOA_LHCT-SF".equals(depot)||"N_YITOA_LHCT-ZX".equals(depot)){
 				sftp = new SFTPUtil(ftpMap.get("user").toString(),ftpMap.get("password").toString(),
 						ftpMap.get("ip").toString(),
 						Integer.parseInt(ftpMap.get("port").toString()));
@@ -487,7 +474,7 @@ public class Download{
 			}
 			if(client!=null||sftp!=null) {
 				List<File> files = null;
-				if ("N_YITOA_LHCT-SF".equals(depot)) {
+				if ("N_YITOA_LHCT-SF".equals(depot)||"N_YITOA_LHCT-ZX".equals(depot)) {
 					files = sftp.download(ftpMap.get("downloadpath").toString());
 
 				}else if("N_YITOA_LHCT-SLC".equals(depot)){
@@ -521,6 +508,10 @@ public class Download{
 										String s = file.getName().substring(0, file.getName().indexOf(".")) + ".xml";
 										Boolean rename = sftp.rename(ftpMap.get("downloadpath").toString() + "/" + s, "goodsreceipt/backup/" + s);
 										System.err.println(rename);
+									}else if("N_YITOA_LHCT-ZX".equals(depot)){
+										String s = file.getName().substring(0, file.getName().indexOf(".")) + ".xml";
+										Boolean rename = sftp.rename(ftpMap.get("downloadpath").toString() + "/" + s,ftpMap.get("downloadpath").toString() + "/bak/" + s);
+										System.err.println(rename);
 									} else {
 										//移动处理完的文件到bak文件夹下
 										client.rename(file.getName(), "bak/" + file.getName());
@@ -540,12 +531,12 @@ public class Download{
 					}
 				}
 			}
-    	} catch (Exception e) {
-    		BaseUtil.getLogger().error(e.toString());
+		} catch (Exception e) {
+			BaseUtil.getLogger().error(e.toString());
 			e.printStackTrace();
 		}finally{
 			if(client!=null){
-				FtpUtil.closeFtpClient(client);		
+				FtpUtil.closeFtpClient(client);
 				client = null;
 			}
 			if (sftp!=null){

+ 133 - 0
src/main/java/com/uas/main/DownloadFilePath.java

@@ -0,0 +1,133 @@
+package com.uas.main;
+
+import com.uas.util.*;
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.http.entity.ContentType;
+
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author koul
+ */
+public class DownloadFilePath {
+
+    public static void runDownloadFilePath(){
+		//联合创泰-顺丰
+        //downloadFilePath("N_YITOA_LHCT-SFFILE","N_YITOA_LHCT");
+		//联合创泰-富森
+        //downloadFilePath("N_YITOA_LHCT-FSFILE","N_YITOA_LHCT");
+        //联合创泰-中芯
+        downloadFilePath("N_YITOA_LHCT-ZXFILE","N_YITOA_LHCT");
+
+	}
+	
+	@SuppressWarnings("unchecked")
+	public static void downloadFilePath(String depot,String sob){
+		FTPClient client = null;
+		SFTPUtil sftp = null;
+		Connection connect = null;
+    	try {
+    		Map<String,Object> servMap = JdbcUtil.getFtpConfigs();
+			Map<String,Object> ftpMap = (Map<String,Object>)servMap.get(depot);
+			String fileName = "";
+			if ("N_YITOA_LHCT-SFFILE".equals(depot)||"N_YITOA_LHCT-ZXFILE".equals(depot)){
+				sftp = new SFTPUtil(ftpMap.get("user").toString(),ftpMap.get("password").toString(),
+						ftpMap.get("ip").toString(),
+						Integer.parseInt(ftpMap.get("port").toString()));
+				if(sftp!=null){
+					sftp.login();
+					List<MultipartFile> files = sftp.downloadMultipartFile(ftpMap.get("downloadpath").toString());
+					if(files!=null&&files.size()>0){
+						connect = JdbcUtil.getConnectBySob(sob);
+						if(connect!=null){
+							for (MultipartFile file:files) {
+								try {
+									Statement statement = connect.createStatement();
+									fileName += "," + file.getOriginalFilename().replaceAll(",", ",");
+									boolean bol = FileUtil.fileUp(statement, file, sob);
+									if (bol) {
+                                        if ("N_YITOA_LHCT-SFFILE".equals(depot)) {
+                                            Boolean rename =
+                                                    sftp.rename("/" + ftpMap.get("downloadpath").toString() + "/" + file.getName(),
+                                                            "/outbounddeliverydetails/backup/" + file.getName());
+                                        }else if ("N_YITOA_LHCT-ZXFILE".equals(depot)){
+                                            Boolean rename =
+                                                    sftp.rename("/" + ftpMap.get("downloadpath").toString() + "/" + file.getName(),
+                                                            ftpMap.get("downloadpath").toString()+"/bak/" + file.getName());
+                                        }
+									}
+								} catch (Exception e) {
+									e.printStackTrace();
+									BaseUtil.getLogger().error(e.toString());
+									continue;
+								}
+							}
+						}
+					}
+				}
+			}else {
+				client = FtpUtil.connect(ftpMap);
+				if(client!=null){
+					List<File> files = FtpUtil.downloadAllFileByType(client);
+					if(files!=null&&files.size()>0){
+						connect = JdbcUtil.getConnectBySob(sob);
+						if(connect!=null){
+
+							for (File file:files) {
+								try {
+									Statement statement = connect.createStatement();
+									fileName += "," + file.getName();
+									FileInputStream fileInputStream = new FileInputStream(file);
+									MultipartFile file1 = new MockMultipartFile(file.getName(), file.getName(),
+											ContentType.APPLICATION_OCTET_STREAM.toString(), fileInputStream);
+									boolean bol = FileUtil.fileUp(statement, file1, sob);
+									if (bol) {
+										//移动处理完的文件到bak文件夹下
+										client.rename(file.getName(), "bak/" + file.getName());
+									}
+								} catch (Exception e) {
+									e.printStackTrace();
+									BaseUtil.getLogger().error(e.toString());
+									continue;
+								}
+							}
+						}
+					}
+				}
+			}
+			if(!"".equals(fileName)){
+				BaseUtil.logDownload(fileName.substring(1),ftpMap.get("ip").toString(),ftpMap.get("downloadpath").toString());
+			}
+    	} catch (Exception e) {
+    		BaseUtil.getLogger().error(e.toString());
+			e.printStackTrace();
+		}finally{
+			if(client!=null){
+				FtpUtil.closeFtpClient(client);
+				client = null;
+			}
+			if (sftp!=null){
+				sftp.logout();
+			}
+			//把当前的连接关闭
+			try {
+				if(connect!=null){
+					connect.close();
+				}
+			} catch (SQLException e) {
+				e.printStackTrace();
+			}finally{
+				connect = null;
+			}
+		}
+	}
+ }

+ 24 - 39
src/com/uas/main/Upload.java → src/main/java/com/uas/main/Upload.java

@@ -1,5 +1,12 @@
 package com.uas.main;
 
+import com.jcraft.jsch.JSchException;
+import com.uas.util.BaseUtil;
+import com.uas.util.FtpUtil;
+import com.uas.util.JdbcUtil;
+import com.uas.util.SFTPUtil;
+import org.apache.commons.net.ftp.FTPClient;
+
 import java.io.*;
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -8,15 +15,6 @@ import java.sql.Statement;
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import com.jcraft.jsch.JSchException;
-import com.uas.util.SFTPUtil;
-import org.apache.commons.net.ftp.FTPClient;
-import org.codehaus.jackson.map.ObjectMapper;
-
-import com.uas.util.BaseUtil;
-import com.uas.util.FtpUtil;
-import com.uas.util.JdbcUtil;
-
 public class Upload {
 	public static Pattern pat = Pattern.compile("\\{(.*?)\\}");	
 	
@@ -81,7 +79,7 @@ public class Upload {
 		if(client!=null){
 			flag = FtpUtil.uploadFile(client, folder,file);
 		}
-		BaseUtil.getLogger().info("upload " + file.getName() + " to " + ip + ":" + folder + " " + (flag?"success":"fail")+"");	
+		BaseUtil.getLogger().info("upload " + file.getName() + " to " + ip + ":" + folder + " " + (flag?"success":"fail")+"");
 		return flag;
 	}
 	
@@ -89,29 +87,11 @@ public class Upload {
 		return statement.executeQuery("select xl_id,xl_data,xl_fileprefix,to_char(xl_date,'yyyymmddhh24miss') xl_date,xl_depot from xmldatalogtemp where xl_data is not null order by xl_depot desc");
 	}
 	
-	public static void run() {
-        //华商龙
-		uploadBySob("N_HUASL");
+	public static void uploadRun() {
         //联合创泰
 		uploadBySob("N_YITOA_LHCT");
-        //威尔电子
-		uploadBySob("N_WILICHK");
-        //柏建控股
-		uploadBySob("N_BJKG");
         //联合创泰香港
-		uploadBySob("N_YITOA_LHCT_HK");
-		//深圳华商龙
-		uploadBySob("N_HUASL_SZ");
-		//上海宇声
-		uploadBySob("N_E_SHINE_SH");
-		//青岛华商龙
-		uploadBySob("N_HUASL_QD");
-		//重庆华商龙
-		uploadBySob("HSL_CQ");
-		//北京华商龙
-		uploadBySob("HSL_BJ");
-
-		//uploadBySob("USOFT_MALL_HK"); //优软商城香港
+		//uploadBySob("N_YITOA_LHCT_HK");
 	}
 	
 	@SuppressWarnings({ "unchecked"})
@@ -124,7 +104,7 @@ public class Upload {
 		String xldate = null;
 		String xlid = null;
 		String xldepot = null;
-		Map<String,Object> ftpConfig = JdbcUtil.getFtpConfigs();			
+		Map<String,Object> ftpConfig = JdbcUtil.getFtpConfigs();
 		Map<String,Object> config = null;
 		Connection connect = null;
 		try{
@@ -142,17 +122,19 @@ public class Upload {
 						xldepot = rs.getString("xl_depot");
 
 						if(xldata!=null&&xldate!=null){
-							if(!depot.equals(xldepot)){ //连接ftp站点
+							//连接ftp站点
+							if(!depot.equals(xldepot)){
 								if(client!=null){
 									FtpUtil.closeFtpClient(client);
 								}
 								depot = xldepot;
-								config = (Map<String,Object>)ftpConfig.get(sob + "-" + depot); //注意上传位置是数据库名+xl_depot
+								//注意上传位置是数据库名+xl_depot
+								config = (Map<String,Object>)ftpConfig.get(sob + "-" + depot);
 								if(config==null){
 									continue;
 								}
 								System.out.println(config);
-								if ("SF".equals(depot)){
+								if ("SF".equals(depot)||"ZX".equals(depot)){
 									sftp = new SFTPUtil(config.get("user").toString(),config.get("password").toString(),config.get("ip").toString(),
 											Integer.parseInt(config.get("port").toString()));
 									try {
@@ -178,7 +160,8 @@ public class Upload {
 							}
 
 							boolean uploadSuccess = false;
-							File file = createXmlFile(xldata,xlid,folder,fileprefix,xldate); //生成文件
+							//生成文件
+							File file = createXmlFile(xldata,xlid,folder,fileprefix,xldate);
 							if (client!=null) {
 								uploadSuccess = upload(client, config.get("ip").toString(), folder, file);
 							}
@@ -186,8 +169,10 @@ public class Upload {
 								InputStream is = new FileInputStream(file);
 								uploadSuccess = sftp.upload("/", folder, file.getName(), is);
 							}
-							if(uploadSuccess){ //如果文件上传成功,则转入正式数据记录表
-								turnToFormal(JdbcUtil.getConnect(),xlid,file.getName()); //转入正式
+							//如果文件上传成功,则转入正式数据记录表
+							if(uploadSuccess){
+								//转入正式
+								turnToFormal(JdbcUtil.getConnect(),xlid,file.getName());
 							}														
 						}						
 					}catch(Exception e){
@@ -211,9 +196,9 @@ public class Upload {
 				}
 				statement = null;				
 			}
-			/*if(client!=null){
+			if(client!=null){
 				FtpUtil.closeFtpClient(client);
-			}*/
+			}
 			//把当前的连接关闭
 			try {
 				if(connect!=null){

+ 3 - 3
src/com/uas/util/BaseUtil.java → src/main/java/com/uas/util/BaseUtil.java

@@ -1,11 +1,11 @@
 package com.uas.util;
 
-import java.io.IOException;
-import java.util.Properties;
-
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 
+import java.io.IOException;
+import java.util.Properties;
+
 
 public class BaseUtil {
 	public static Logger logger;

+ 119 - 0
src/main/java/com/uas/util/FileUtil.java

@@ -0,0 +1,119 @@
+package com.uas.util;
+
+import org.apache.commons.io.FileUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
+
+
+/**
+ * @author koul
+ *
+ */
+public class FileUtil {
+
+	/**
+	 * 保存文件
+	 * 
+	 * <pre>
+	 * 优先判断是否设置了指定的文件系统,否则保存到本地
+	 * </pre>
+	 * 
+	 * @param file
+	 * @return
+	 */
+	public static String saveFile(MultipartFile file, String em_code) {
+		String path = uploadToLocal(file, em_code);
+		if(path.contains("\\")){//上传到本地返回路径修改
+			path=path.replace("\\", "/");
+		}
+		return path;
+	}
+
+	/**
+	 * 上传到本地磁盘
+	 * 
+	 * @return
+	 */
+	private static String uploadToLocal(MultipartFile file, String em_code) {
+		String path =getFilePath(file.getOriginalFilename(), em_code);
+		try {
+			FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path));
+			return path;
+		} catch (IOException e1) {
+			e1.printStackTrace();
+		}
+		return null;
+	}
+
+	/**
+	 * 生成文件实际存放的硬盘唯一路径
+	 * 
+	 * @param fileName
+	 * @return
+	 */
+	private static String getFilePath(String fileName, String em_code) {
+		String uuid = UUID.randomUUID().toString().replaceAll("\\-", "");
+		String suffix = fileName.indexOf(".") != -1 ? fileName.substring(fileName.lastIndexOf("."), fileName.length()) : "";
+		String path = "/usr/local/uas/tomcat/webapps/postattach";
+		File file = new File(path);
+		if (!file.isDirectory()) {
+			file.mkdir();
+			path = path + File.separator + em_code;
+			new File(path).mkdir();
+		} else {
+			path = path + File.separator + em_code;
+			file = new File(path);
+			if (!file.isDirectory()) {
+				file.mkdir();
+			}
+		}
+		return path + File.separator + uuid + suffix;
+	}
+
+	public static Boolean fileUp(Statement statement, MultipartFile file, String sob){
+		boolean result = false;
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		String path = saveFile(file, "ADMIN");
+		String filename = file.getOriginalFilename().replaceAll(",", ",");
+        String originalFilename = file.getOriginalFilename();
+		int size = (int) file.getSize();
+		if(size>0) {
+			try {
+				String sql = "select " + sob + ".EMAILFILEPATH.nextval from dual";
+				ResultSet resultSet = statement.executeQuery(sql);
+				if (resultSet.next()) {
+					int id = resultSet.getInt(1);
+					String sql1 =
+							"INSERT INTO " + sob + ".filepath(fp_id,fp_path,fp_size,fp_man,fp_date,fp_name) values(" + id + ",'" + path +
+									"'," + size + ",'" + "管理员" + "'," + "to_date('" + format.format(new Date()) + "','yyyy-mm-dd HH24:mi:ss')" + ",'" + filename + "')";
+					int i = statement.executeUpdate(sql1);
+					if (i > 0) {
+						String substring = null;
+						if (filename.indexOf("-") != -1) {
+							substring = filename.substring(4, filename.indexOf("-"));
+						} else {
+							substring = filename.substring(4, filename.indexOf("."));
+						}
+						String sql3 = "INSERT INTO " + sob + ".FTPATTCHTEMP(FT_ID,FT_ATTCH,FT_PIINOUTNO,FT_STATUS,FT_INSERTDATE,FT_FILENAME,FT_SOB)values(" + sob + ".FTPATTCHTEMP_SEQ.nextval,'" + id + ";','" + substring + "','GET',to_date('" + format.format(new Date()) + "','yyyy-mm-dd HH24:mi:ss')" + ",'" + filename + "','" + sob + "')";
+						int i1 = statement.executeUpdate(sql3);
+						if (i1 > 0) {
+							result = true;
+						}
+					}
+				}
+				statement.close();
+				return result;
+			} catch (SQLException e) {
+				e.printStackTrace();
+			}
+		}
+		return result;
+	}
+}

+ 78 - 43
src/com/uas/util/FtpUtil.java → src/main/java/com/uas/util/FtpUtil.java

@@ -1,20 +1,13 @@
 package com.uas.util;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.SocketException;
-import java.util.*;
-
 import com.jcraft.jsch.JSchException;
-import org.apache.commons.net.ftp.FTP;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPFile;
 import org.apache.commons.net.ftp.FTPReply;
 
+import java.io.*;
+import java.util.*;
+
 public class FtpUtil {
 	/**
 	 * 连接到ftp站点,判断是否可以连接
@@ -163,32 +156,32 @@ public class FtpUtil {
 		try {
 			ftpClient.enterLocalPassiveMode();
 			FTPFile[] ftpFiles = ftpClient.listFiles();
-            if (ftpFiles != null && ftpFiles.length > 0) {
-                ArrayList<FTPFile> list = new ArrayList<FTPFile>(Arrays.asList(ftpFiles));
-                Collections.sort(list, new Comparator<FTPFile>() {
-                    @Override
-                    public int compare(FTPFile o1, FTPFile o2) {
-                        long time = o1.getTimestamp().getTime().getTime();
-                        long time1 = o2.getTimestamp().getTime().getTime();
-                        if (time > time1) {
-                            return 1;
-                        }
-                        if (time == time1) {
-                            return 0;
-                        }
-                        return -1;
-                    }
-                });
-                for (FTPFile file : list) {
-                    if (file.getName().toUpperCase().endsWith("." + fileType)) {
-                        File localFile = new File(System.getProperty("java.io.tmpdir") + File.separator + file.getName());
-                        OutputStream os = new FileOutputStream(localFile);
-                        ftpClient.retrieveFile(file.getName(), os);
-                        os.close();
-                        files.add(localFile);
-                    }
-                }
-            }
+			if (ftpFiles != null && ftpFiles.length > 0) {
+				ArrayList<FTPFile> list = new ArrayList<FTPFile>(Arrays.asList(ftpFiles)) ;
+				Collections.sort(list, new Comparator<FTPFile>() {
+					@Override
+					public int compare(FTPFile o1, FTPFile o2) {
+						long time = o1.getTimestamp().getTime().getTime();
+						long time1 = o2.getTimestamp().getTime().getTime();
+						if ( time>time1 ) {
+							return 1;
+						}
+						if (time == time1) {
+							return 0;
+						}
+						return -1;
+					}
+				});
+				for (FTPFile file : list) {
+					if(file.getName().toUpperCase().endsWith("." + fileType)){
+						File localFile = new File(System.getProperty("java.io.tmpdir") + File.separator + file.getName());
+						OutputStream os = new FileOutputStream(localFile);
+						ftpClient.retrieveFile(file.getName(), os);
+						os.close();
+						files.add(localFile);
+					}
+				}
+			}
 		} catch (Exception e) {
 			BaseUtil.getLogger().error(e.toString());
 			e.printStackTrace();
@@ -200,16 +193,15 @@ public class FtpUtil {
 	 *
 	 * @param ftpClient
 	 * fileType 需要下载的文件类型
-	 * @return 获取连接到的ftp站点下的指定文件夹所有文件
+	 * @return 获取连接到的ftp站点下的文件夹所有文件
 	 */
-	public static List<File> downloadDirFileByType(FTPClient ftpClient,String fileType,String dir) {
+	public static List<File> downloadAllFileByType(FTPClient ftpClient) {
 		List<File> files = new ArrayList<File>();
 		try {
 			ftpClient.enterLocalPassiveMode();
-			ftpClient.changeWorkingDirectory("/"+dir+"/");
-			FTPFile[] ftpFiles = ftpClient.listFiles("/"+dir+"/");
+			FTPFile[] ftpFiles = ftpClient.listFiles();
 			for (FTPFile file : ftpFiles) {
-				if(file.getName().toUpperCase().endsWith("." + fileType)){
+				if(!".".equals(file.getName()) && !"..".equals(file.getName())&& !"bak".equals(file.getName())){
 					File localFile = new File(System.getProperty("java.io.tmpdir") + File.separator + file.getName());
 					OutputStream os = new FileOutputStream(localFile);
 					ftpClient.retrieveFile(file.getName(), os);
@@ -224,8 +216,51 @@ public class FtpUtil {
 		return files;
 	}
 
-
-
+	/**
+	 *
+	 * @param ftpClient
+	 * fileType 需要下载的文件类型
+	 * @return 获取连接到的ftp站点下的指定文件夹所有文件
+	 */
+	public static List<File> downloadDirFileByType(FTPClient ftpClient,String fileType,String dir) {
+		List<File> files = new ArrayList<File>();
+		try {
+			ftpClient.enterLocalPassiveMode();
+			ftpClient.changeWorkingDirectory("/"+dir+"/");
+			FTPFile[] ftpFiles = ftpClient.listFiles("/"+dir+"/");
+			if (ftpFiles != null && ftpFiles.length > 0) {
+				ArrayList<FTPFile> list = new ArrayList<FTPFile>(Arrays.asList(ftpFiles));
+				Collections.sort(list, new Comparator<FTPFile>() {
+					@Override
+					public int compare(FTPFile o1, FTPFile o2) {
+						long time = o1.getTimestamp().getTime().getTime();
+						long time1 = o2.getTimestamp().getTime().getTime();
+						if (time > time1) {
+							return 1;
+						}
+						if (time == time1) {
+							return 0;
+						}
+						return -1;
+					}
+				});
+				for (FTPFile file : list) {
+					if (file.getName().toUpperCase().endsWith("." + fileType)) {
+						File localFile = new File(System.getProperty("java.io.tmpdir") + File.separator + file.getName());
+						OutputStream os = new FileOutputStream(localFile);
+						ftpClient.retrieveFile(file.getName(), os);
+						os.close();
+						files.add(localFile);
+					}
+				}
+			}
+		} catch (Exception e) {
+			BaseUtil.getLogger().error(e.toString());
+			e.printStackTrace();
+		}
+		return files;
+	}
+	
 	/**
 	 * 关闭ftp连接
 	 * @param ftpClient

+ 27 - 29
src/com/uas/util/JdbcUtil.java → src/main/java/com/uas/util/JdbcUtil.java

@@ -1,20 +1,15 @@
 package com.uas.util;
 
+import org.codehaus.jackson.map.ObjectMapper;
+
 import java.io.IOException;
 import java.io.InputStream;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.sql.*;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import org.codehaus.jackson.map.ObjectMapper;
-
 public class JdbcUtil {
 	public static Map<String,Object> ftpConfigs;
 	public static Map<String,Object> dbConfigs;
@@ -30,7 +25,7 @@ public class JdbcUtil {
 			try {
 				ftpConfigs = new ObjectMapper().readValue(JdbcUtil.class.getResourceAsStream("/properties/ftpconfig.properties"), HashMap.class);
 			}catch (Exception e) {
-				com.uas.util.BaseUtil.getLogger().error(e.toString());
+				BaseUtil.getLogger().error(e.toString());
 				e.printStackTrace();
 			}			
 		}
@@ -47,7 +42,7 @@ public class JdbcUtil {
 			try {
 				dbConfigs = new ObjectMapper().readValue(JdbcUtil.class.getResourceAsStream("/properties/dbconfig.properties"), HashMap.class);
 			}catch (Exception e) {
-				com.uas.util.BaseUtil.getLogger().error(e.toString());
+				BaseUtil.getLogger().error(e.toString());
 				e.printStackTrace();
 			}			
 		}
@@ -86,13 +81,13 @@ public class JdbcUtil {
 					// TODO Auto-generated catch block
 					e2.printStackTrace();
 				}
-		    	com.uas.util.BaseUtil.getLogger().error(e.toString());
+		    	BaseUtil.getLogger().error(e.toString());
 		    	try {
 		    		if(connection!=null){
 		    			connection.close();
 		    		}				
 				} catch (SQLException e1) {
-					com.uas.util.BaseUtil.getLogger().error(e1.toString());
+					BaseUtil.getLogger().error(e1.toString());
 					e1.printStackTrace();
 				}finally{
 					connection = null;
@@ -132,13 +127,13 @@ public class JdbcUtil {
 				// TODO Auto-generated catch block
 				e2.printStackTrace();
 			}
-	    	com.uas.util.BaseUtil.getLogger().error(e.toString());
+	    	BaseUtil.getLogger().error(e.toString());
 	    	try {
 	    		if(connection!=null){
 	    			connection.close();
 	    		}				
 			} catch (SQLException e1) {
-				com.uas.util.BaseUtil.getLogger().error(e1.toString());
+				BaseUtil.getLogger().error(e1.toString());
 				e1.printStackTrace();
 			}finally{
 				connection = null;
@@ -158,17 +153,20 @@ public class JdbcUtil {
 	 */
 	public static boolean closeCn(Connection con,PreparedStatement pre,ResultSet result){
         try{
-            if (result != null)
-                result.close();
-            	result = null;
-            if (pre != null)
-                pre.close();
-            	pre = null;
-            if (con != null)
-                con.close();
+            if (result != null) {
+				result.close();
+				result = null;
+			}
+            if (pre != null) {
+				pre.close();
+				pre = null;
+			}
+            if (con != null) {
+				con.close();
+			}
         }
         catch (Exception e){
-        	com.uas.util.BaseUtil.getLogger().error(e.toString());
+        	BaseUtil.getLogger().error(e.toString());
             e.printStackTrace();
         }
 		return true;
@@ -194,11 +192,11 @@ public class JdbcUtil {
 				statement.executeBatch();
 			} catch (SQLException e) {
 				bol = false;
-				com.uas.util.BaseUtil.getLogger().error(e.toString());
+				BaseUtil.getLogger().error(e.toString());
 				try {
 					statement.close();
 				} catch (SQLException e1) {
-					com.uas.util.BaseUtil.getLogger().error(e1.toString());
+					BaseUtil.getLogger().error(e1.toString());
 					e1.printStackTrace();
 				}
 				e.printStackTrace();
@@ -206,13 +204,13 @@ public class JdbcUtil {
 			statement.close();
 		}catch(Exception e){
 			bol = false;
-			com.uas.util.BaseUtil.getLogger().error(e.toString());
+			BaseUtil.getLogger().error(e.toString());
 			try {
 				if(connection!=null){
 					connection.rollback();
 				}				
 			} catch (SQLException e1) {
-				com.uas.util.BaseUtil.getLogger().error(e1.toString());
+				BaseUtil.getLogger().error(e1.toString());
 				e1.printStackTrace();
 			}
 			e.printStackTrace();
@@ -237,13 +235,13 @@ public class JdbcUtil {
 				rs.close();
 				statement.close();
 			}catch(Exception e){
-				com.uas.util.BaseUtil.getLogger().error(e.toString());
+				BaseUtil.getLogger().error(e.toString());
 				try {
 					if(connection!=null){
 						connection.rollback();
 					}				
 				} catch (SQLException e1) {
-					com.uas.util.BaseUtil.getLogger().error(e1.toString());
+					BaseUtil.getLogger().error(e1.toString());
 					e1.printStackTrace();
 				}
 				e.printStackTrace();

+ 35 - 3
src/com/uas/util/SFTPUtil.java → src/main/java/com/uas/util/SFTPUtil.java

@@ -1,12 +1,15 @@
 package com.uas.util;
 
-import java.io.*;
-import java.util.*;
-
 import com.jcraft.jsch.*;
 import org.apache.commons.io.IOUtils;
+import org.apache.http.entity.ContentType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+import java.util.*;
 
 
 /**
@@ -228,6 +231,35 @@ public class SFTPUtil {
         }
         return null;
     }
+    /**
+     * 下载流
+     * @param
+     * @param directory 下载目录
+     */
+    public List<MultipartFile> downloadMultipartFile(String directory) {
+        try {
+            Vector<ChannelSftp.LsEntry> list = sftp.ls(directory);
+            List<MultipartFile> ls = new ArrayList<MultipartFile>();
+            if (list.size()>0&&list!=null) {
+                for (ChannelSftp.LsEntry entry : list) {
+                    String filename = entry.getFilename();
+                    if (!".".equals(filename) && !"..".equals(filename)&& !"bak".equals(filename)) {
+                        if (!filename.endsWith(".xml")) {
+                            InputStream is = sftp.get(directory+"/"+filename);
+                            MultipartFile file = new MockMultipartFile(filename, filename,
+                                    ContentType.APPLICATION_OCTET_STREAM.toString(), is);
+                            ls.add(file);
+                            is.close();
+                        }
+                    }
+                }
+            }
+            return ls;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 
     /**
      * 根目录

+ 4 - 0
src/main/resources/application.yml

@@ -0,0 +1,4 @@
+server:
+  port: 10086
+  tomcat:
+    uri-encoding: UTF-8

+ 12 - 0
src/main/resources/properties/dbconfig.properties

@@ -0,0 +1,12 @@
+{
+	"N_YITOA_LHCT":{
+		"url":"jdbc:oracle:thin:@10.1.80.128:1521:orcl",
+		"user":"N_YITOA_LHCT",
+		"password":"select!#%*("
+	},
+	"N_YITOA_LHCT_HK":{
+		"url":"jdbc:oracle:thin:@10.1.80.128:1521:orcl",
+		"user":"N_YITOA_LHCT_HK",
+		"password":"select!#%*("
+	}
+}

+ 58 - 0
src/main/resources/properties/ftpconfig.properties

@@ -0,0 +1,58 @@
+{
+    "N_YITOA_LHCT-SLC":{
+        "ip":"101.231.34.92",
+        "port":21,
+        "user":"yitoa",
+        "password":"Slc%YiToa",
+        "downloadpath":"YITOA/chuangt_postback",
+        "in":"YITOA/chuangt_normal"
+    },
+	"N_YITOA_LHCT-ZSD":{
+		"ip":"47.106.234.187",
+		"port":21,
+		"user":"lhct",
+		"password":"bE!8M3#5y0",
+		"downloadpath":"LHCT/reply",
+		"in":"LHCT/appointment_in"
+	},
+    "N_YITOA_LHCT-FS":{
+        "ip":"113.100.137.106",
+        "port":21,
+        "user":"chenb",
+        "password":"4BlZZ9tK",
+        "downloadpath":"chuangt_postback",
+        "in":"chuangt_normal"
+    },
+    "N_YITOA_LHCT-ZX":{
+        "ip":"sftp.cicsc.com",
+        "port":8022,
+        "user":"test",
+        "password":"Zx200610",
+        "downloadpath":"upload/TEST/LHCT/postback",
+        "in":"upload/TEST/LHCT/normal"
+    },
+    "N_YITOA_LHCT-SFFILE":{
+        "ip":"mcs-cas-api-sftp.sf-express.com",
+        "port":3022,
+        "user":"wms_ufct",
+        "password":"g9Y0Op7K",
+        "downloadpath":"outbounddeliverydetails/data",
+        "in":""
+    },
+    "N_YITOA_LHCT-FSFILE":{
+        "ip":"113.100.137.106",
+        "port":21,
+        "user":"b2b_ftp",
+        "password":"24g777sW",
+        "downloadpath":"chuangt_signback",
+        "in":""
+    },
+    "N_YITOA_LHCT-ZXFILE":{
+        "ip":"sftp.cicsc.com",
+        "port":8022,
+        "user":"test",
+        "password":"Zx200610",
+        "downloadpath":"upload/TEST/LHCT/attach",
+        "in":""
+    }
+}

+ 0 - 0
src/properties/log4j.properties → src/main/resources/properties/log4j.properties


+ 0 - 67
src/properties/dbconfig.properties

@@ -1,67 +0,0 @@
-{
-	"N_YITOA_LHCT":{
-		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
-		"user":"N_YITOA_LHCT",
-		"password":"select!#%*("
-	},
-	"N_YITOA_LHCT_HK":{
-		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
-		"user":"N_YITOA_LHCT_HK",
-		"password":"select!#%*("
-	},
-	"N_E_SHINE_SH":{
-		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
-		"user":"N_E_SHINE_SH",
-		"password":"select!#%*("
-	},
-	"HSL_BJ":{
-		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
-		"user":"HSL_BJ",
-		"password":"select!#%*("
-	},
-	"HSL_CQ":{
-		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
-		"user":"HSL_CQ",
-		"password":"select!#%*("
-	},
-	"N_HUASL_QD":{
-		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
-		"user":"N_HUASL_QD",
-		"password":"select!#%*("
-	},
-    "t_n_huasl":{
-		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
-		"user":"t_n_huasl",
-		"password":"select!#%*("
-    },
-	"N_HUASL":{
-		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
-		"user":"N_HUASL",
-		"password":"select!#%*("
-	},
-	"N_HUASL_SZ":{
-		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
-		"user":"N_HUASL_SZ",
-		"password":"select!#%*("
-	},
-	"N_WILICHK":{
-		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
-		"user":"N_WILICHK",
-		"password":"select!#%*("
-	},
-	"N_BJKG":{
-		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
-		"user":"N_BJKG",
-		"password":"select!#%*("
-	},
-	"USOFT_MALL_HK":{
-		"url":"jdbc:oracle:thin:@10.1.1.168:1521:orcl",
-		"user":"USOFT_MALL_HK",
-		"password":"select!#%*("
-	},
-	"UAS_DEV":{
-		"url":"jdbc:oracle:thin:@192.168.253.6:1521:orcl",
-		"user":"UAS_DEV",
-		"password":"select!#%*("
-	}
-}

+ 0 - 27
src/properties/dbconfig3.properties

@@ -1,27 +0,0 @@
-{
-    "t_n_huasl":{
-		"url":"jdbc:oracle:thin:@127.0.0.1:1521:orcl",
-		"user":"t_n_huasl",
-		"password":"select!#%*("    
-    },
-	"N_HUASL":{
-		"url":"jdbc:oracle:thin:@127.0.0.1:1521:orcl",
-		"user":"N_HUASL",
-		"password":"select!#%*("
-	},
-	"N_WILICHK":{
-		"url":"jdbc:oracle:thin:@127.0.0.1:1521:orcl",
-		"user":"N_WILICHK",
-		"password":"select!#%*("
-	},
-	"N_BJKG":{
-		"url":"jdbc:oracle:thin:@127.0.0.1:1521:orcl",
-		"user":"N_BJKG",
-		"password":"select!#%*("
-	},
-	"USOFT_MALL_HK":{
-		"url":"jdbc:oracle:thin:@127.0.0.1:1521:orcl",
-		"user":"USOFT_MALL_HK",
-		"password":"select!#%*("
-	}
-}

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini