Ver código fonte

Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java
5 anos atrás
pai
commit
421897e2c8
93 arquivos alterados com 426 adições e 274 exclusões
  1. 3 3
      .idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml
  2. 3 3
      .idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml
  3. 3 3
      .idea/libraries/Maven__com_alibaba_fastjson_1_2_7.xml
  4. 3 3
      .idea/libraries/Maven__com_baomidou_mybatis_plus_3_1_2.xml
  5. 3 3
      .idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_1_2.xml
  6. 3 3
      .idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_1_2.xml
  7. 3 3
      .idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_1_2.xml
  8. 3 3
      .idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_1_2.xml
  9. 3 3
      .idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_1_2.xml
  10. 3 3
      .idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml
  11. 3 3
      .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml
  12. 3 3
      .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_9.xml
  13. 3 3
      .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_9.xml
  14. 3 3
      .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_9.xml
  15. 3 3
      .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_9.xml
  16. 3 3
      .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_9.xml
  17. 3 3
      .idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml
  18. 3 3
      .idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
  19. 3 3
      .idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml
  20. 3 3
      .idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml
  21. 3 3
      .idea/libraries/Maven__commons_io_commons_io_2_2.xml
  22. 3 3
      .idea/libraries/Maven__commons_net_commons_net_3_6.xml
  23. 3 3
      .idea/libraries/Maven__io_swagger_swagger_annotations_1_5_15.xml
  24. 3 3
      .idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml
  25. 3 3
      .idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml
  26. 3 3
      .idea/libraries/Maven__junit_junit_4_12.xml
  27. 3 3
      .idea/libraries/Maven__mysql_mysql_connector_java_8_0_16.xml
  28. 3 3
      .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_13.xml
  29. 3 3
      .idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_13.xml
  30. 3 3
      .idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml
  31. 3 3
      .idea/libraries/Maven__net_minidev_json_smart_2_3.xml
  32. 3 3
      .idea/libraries/Maven__org_apache_commons_commons_lang3_3_8_1.xml
  33. 3 3
      .idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml
  34. 3 3
      .idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml
  35. 3 3
      .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_21.xml
  36. 3 3
      .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_21.xml
  37. 3 3
      .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_21.xml
  38. 3 3
      .idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_0.xml
  39. 3 3
      .idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml
  40. 3 3
      .idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml
  41. 3 3
      .idea/libraries/Maven__org_freemarker_freemarker_2_3_23.xml
  42. 3 3
      .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
  43. 3 3
      .idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml
  44. 3 3
      .idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_17_Final.xml
  45. 3 3
      .idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml
  46. 3 3
      .idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml
  47. 3 3
      .idea/libraries/Maven__org_mybatis_mybatis_3_5_1.xml
  48. 3 3
      .idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_1.xml
  49. 3 3
      .idea/libraries/Maven__org_objenesis_objenesis_2_6.xml
  50. 3 3
      .idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
  51. 3 3
      .idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml
  52. 3 3
      .idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
  53. 3 3
      .idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_26.xml
  54. 3 3
      .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_26.xml
  55. 3 3
      .idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_6_RELEASE.xml
  56. 3 3
      .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_6_RELEASE.xml
  57. 3 3
      .idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_6_RELEASE.xml
  58. 3 3
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_6_RELEASE.xml
  59. 3 3
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_6_RELEASE.xml
  60. 3 3
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_6_RELEASE.xml
  61. 3 3
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_6_RELEASE.xml
  62. 3 3
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_6_RELEASE.xml
  63. 3 3
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_1_6_RELEASE.xml
  64. 3 3
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_6_RELEASE.xml
  65. 3 3
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_6_RELEASE.xml
  66. 3 3
      .idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_6_RELEASE.xml
  67. 3 3
      .idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_6_RELEASE.xml
  68. 3 3
      .idea/libraries/Maven__org_springframework_spring_aop_5_1_8_RELEASE.xml
  69. 3 3
      .idea/libraries/Maven__org_springframework_spring_beans_5_1_8_RELEASE.xml
  70. 3 3
      .idea/libraries/Maven__org_springframework_spring_context_5_1_8_RELEASE.xml
  71. 3 3
      .idea/libraries/Maven__org_springframework_spring_core_5_1_8_RELEASE.xml
  72. 3 3
      .idea/libraries/Maven__org_springframework_spring_expression_5_1_8_RELEASE.xml
  73. 3 3
      .idea/libraries/Maven__org_springframework_spring_jcl_5_1_8_RELEASE.xml
  74. 3 3
      .idea/libraries/Maven__org_springframework_spring_jdbc_5_1_8_RELEASE.xml
  75. 3 3
      .idea/libraries/Maven__org_springframework_spring_test_5_1_8_RELEASE.xml
  76. 3 3
      .idea/libraries/Maven__org_springframework_spring_tx_5_1_8_RELEASE.xml
  77. 3 3
      .idea/libraries/Maven__org_springframework_spring_web_5_1_8_RELEASE.xml
  78. 3 3
      .idea/libraries/Maven__org_springframework_spring_webmvc_5_1_8_RELEASE.xml
  79. 3 3
      .idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml
  80. 3 3
      .idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_11_RELEASE.xml
  81. 3 3
      .idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_11_RELEASE.xml
  82. 3 3
      .idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml
  83. 3 3
      .idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml
  84. 3 3
      .idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml
  85. 29 11
      .idea/yunsu.iml
  86. 17 3
      cloud-model/pom.xml
  87. 1 1
      cloud-model/src/main/java/com/hssx/cloudmodel/entity/Mould.java
  88. 6 4
      cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectServiceImpl.java
  89. 117 0
      cloud-model/src/main/java/com/hssx/cloudmodel/util/OpenOfficeService.java
  90. 1 1
      cloud-model/src/main/resources/application-prod.properties
  91. BIN
      cloud-model/src/main/resources/lib/jodconverter-core-3.0.jar
  92. 1 1
      cloud-model/src/main/resources/mapper/MouldMapper.xml
  93. 2 1
      cloud-model/src/main/resources/mapper/ProjectMapper.xml

+ 3 - 3
.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml

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

+ 3 - 3
.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml

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

+ 3 - 3
.idea/libraries/Maven__com_alibaba_fastjson_1_2_7.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: com.alibaba:fastjson:1.2.7">
     <CLASSES>
-      <root url="jar://D:/software/repository/com/alibaba/fastjson/1.2.7/fastjson-1.2.7.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.7/fastjson-1.2.7.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/com/alibaba/fastjson/1.2.7/fastjson-1.2.7-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.7/fastjson-1.2.7-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/com/alibaba/fastjson/1.2.7/fastjson-1.2.7-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.7/fastjson-1.2.7-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__com_baomidou_mybatis_plus_3_1_2.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: com.baomidou:mybatis-plus:3.1.2">
     <CLASSES>
-      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_1_2.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: com.baomidou:mybatis-plus-annotation:3.1.2">
     <CLASSES>
-      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_1_2.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: com.baomidou:mybatis-plus-boot-starter:3.1.2">
     <CLASSES>
-      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_1_2.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: com.baomidou:mybatis-plus-core:3.1.2">
     <CLASSES>
-      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_1_2.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: com.baomidou:mybatis-plus-extension:3.1.2">
     <CLASSES>
-      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_1_2.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: com.baomidou:mybatis-plus-generator:3.1.2">
     <CLASSES>
-      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: com.fasterxml:classmate:1.4.0">
     <CLASSES>
-      <root url="jar://D:/software/repository/com/fasterxml/classmate/1.4.0/classmate-1.4.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.4.0/classmate-1.4.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/com/fasterxml/classmate/1.4.0/classmate-1.4.0-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.4.0/classmate-1.4.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/com/fasterxml/classmate/1.4.0/classmate-1.4.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.4.0/classmate-1.4.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0">
     <CLASSES>
-      <root url="jar://D:/software/repository/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_9.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.9">
     <CLASSES>
-      <root url="jar://D:/software/repository/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_9.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.9">
     <CLASSES>
-      <root url="jar://D:/software/repository/com/fasterxml/jackson/core/jackson-databind/2.9.9/jackson-databind-2.9.9.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.9/jackson-databind-2.9.9.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/com/fasterxml/jackson/core/jackson-databind/2.9.9/jackson-databind-2.9.9-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.9/jackson-databind-2.9.9-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/com/fasterxml/jackson/core/jackson-databind/2.9.9/jackson-databind-2.9.9-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.9/jackson-databind-2.9.9-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_9.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.9">
     <CLASSES>
-      <root url="jar://D:/software/repository/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.9/jackson-datatype-jdk8-2.9.9.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.9/jackson-datatype-jdk8-2.9.9.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.9/jackson-datatype-jdk8-2.9.9-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.9/jackson-datatype-jdk8-2.9.9-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.9/jackson-datatype-jdk8-2.9.9-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.9/jackson-datatype-jdk8-2.9.9-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_9.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.9">
     <CLASSES>
-      <root url="jar://D:/software/repository/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.9/jackson-datatype-jsr310-2.9.9.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.9/jackson-datatype-jsr310-2.9.9.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.9/jackson-datatype-jsr310-2.9.9-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.9/jackson-datatype-jsr310-2.9.9-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.9/jackson-datatype-jsr310-2.9.9-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.9/jackson-datatype-jsr310-2.9.9-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_9.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.9">
     <CLASSES>
-      <root url="jar://D:/software/repository/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.9/jackson-module-parameter-names-2.9.9.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.9/jackson-module-parameter-names-2.9.9.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.9/jackson-module-parameter-names-2.9.9-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.9/jackson-module-parameter-names-2.9.9-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.9/jackson-module-parameter-names-2.9.9-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.9/jackson-module-parameter-names-2.9.9-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml

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

+ 3 - 3
.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml

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

+ 3 - 3
.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: com.zaxxer:HikariCP:3.2.0">
     <CLASSES>
-      <root url="jar://D:/software/repository/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: commons-fileupload:commons-fileupload:1.3.3">
     <CLASSES>
-      <root url="jar://D:/software/repository/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__commons_io_commons_io_2_2.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: commons-io:commons-io:2.2">
     <CLASSES>
-      <root url="jar://D:/software/repository/commons-io/commons-io/2.2/commons-io-2.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/commons-io/commons-io/2.2/commons-io-2.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/commons-io/commons-io/2.2/commons-io-2.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__commons_net_commons_net_3_6.xml

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

+ 3 - 3
.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_15.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: io.swagger:swagger-annotations:1.5.15">
     <CLASSES>
-      <root url="jar://D:/software/repository/io/swagger/swagger-annotations/1.5.15/swagger-annotations-1.5.15.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.15/swagger-annotations-1.5.15.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/io/swagger/swagger-annotations/1.5.15/swagger-annotations-1.5.15-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.15/swagger-annotations-1.5.15-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/io/swagger/swagger-annotations/1.5.15/swagger-annotations-1.5.15-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.15/swagger-annotations-1.5.15-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: javax.annotation:javax.annotation-api:1.3.2">
     <CLASSES>
-      <root url="jar://D:/software/repository/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: javax.validation:validation-api:2.0.1.Final">
     <CLASSES>
-      <root url="jar://D:/software/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__junit_junit_4_12.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: junit:junit:4.12">
     <CLASSES>
-      <root url="jar://D:/software/repository/junit/junit/4.12/junit-4.12.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/junit/junit/4.12/junit-4.12-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__mysql_mysql_connector_java_8_0_16.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: mysql:mysql-connector-java:8.0.16">
     <CLASSES>
-      <root url="jar://D:/software/repository/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_13.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: net.bytebuddy:byte-buddy:1.9.13">
     <CLASSES>
-      <root url="jar://D:/software/repository/net/bytebuddy/byte-buddy/1.9.13/byte-buddy-1.9.13.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.9.13/byte-buddy-1.9.13.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/net/bytebuddy/byte-buddy/1.9.13/byte-buddy-1.9.13-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.9.13/byte-buddy-1.9.13-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/net/bytebuddy/byte-buddy/1.9.13/byte-buddy-1.9.13-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.9.13/byte-buddy-1.9.13-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_13.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: net.bytebuddy:byte-buddy-agent:1.9.13">
     <CLASSES>
-      <root url="jar://D:/software/repository/net/bytebuddy/byte-buddy-agent/1.9.13/byte-buddy-agent-1.9.13.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.9.13/byte-buddy-agent-1.9.13.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/net/bytebuddy/byte-buddy-agent/1.9.13/byte-buddy-agent-1.9.13-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.9.13/byte-buddy-agent-1.9.13-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/net/bytebuddy/byte-buddy-agent/1.9.13/byte-buddy-agent-1.9.13-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.9.13/byte-buddy-agent-1.9.13-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml

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

+ 3 - 3
.idea/libraries/Maven__net_minidev_json_smart_2_3.xml

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

+ 3 - 3
.idea/libraries/Maven__org_apache_commons_commons_lang3_3_8_1.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.apache.commons:commons-lang3:3.8.1">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.apache.logging.log4j:log4j-api:2.11.2">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/apache/logging/log4j/log4j-api/2.11.2/log4j-api-2.11.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.11.2/log4j-api-2.11.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/apache/logging/log4j/log4j-api/2.11.2/log4j-api-2.11.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.11.2/log4j-api-2.11.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/apache/logging/log4j/log4j-api/2.11.2/log4j-api-2.11.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.11.2/log4j-api-2.11.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/apache/logging/log4j/log4j-to-slf4j/2.11.2/log4j-to-slf4j-2.11.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.11.2/log4j-to-slf4j-2.11.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/apache/logging/log4j/log4j-to-slf4j/2.11.2/log4j-to-slf4j-2.11.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.11.2/log4j-to-slf4j-2.11.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/apache/logging/log4j/log4j-to-slf4j/2.11.2/log4j-to-slf4j-2.11.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.11.2/log4j-to-slf4j-2.11.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_21.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.21">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.21/tomcat-embed-core-9.0.21.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.21/tomcat-embed-core-9.0.21.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.21/tomcat-embed-core-9.0.21-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.21/tomcat-embed-core-9.0.21-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.21/tomcat-embed-core-9.0.21-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.21/tomcat-embed-core-9.0.21-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_21.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.21">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/apache/tomcat/embed/tomcat-embed-el/9.0.21/tomcat-embed-el-9.0.21.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.21/tomcat-embed-el-9.0.21.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/apache/tomcat/embed/tomcat-embed-el/9.0.21/tomcat-embed-el-9.0.21-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.21/tomcat-embed-el-9.0.21-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/apache/tomcat/embed/tomcat-embed-el/9.0.21/tomcat-embed-el-9.0.21-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.21/tomcat-embed-el-9.0.21-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_21.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.21">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.21/tomcat-embed-websocket-9.0.21.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.21/tomcat-embed-websocket-9.0.21.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.21/tomcat-embed-websocket-9.0.21-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.21/tomcat-embed-websocket-9.0.21-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.21/tomcat-embed-websocket-9.0.21-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.21/tomcat-embed-websocket-9.0.21-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_0.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.apache.velocity:velocity-engine-core:2.0">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/apache/velocity/velocity-engine-core/2.0/velocity-engine-core-2.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity-engine-core/2.0/velocity-engine-core-2.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/apache/velocity/velocity-engine-core/2.0/velocity-engine-core-2.0-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity-engine-core/2.0/velocity-engine-core-2.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/apache/velocity/velocity-engine-core/2.0/velocity-engine-core-2.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity-engine-core/2.0/velocity-engine-core-2.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.assertj:assertj-core:3.11.1">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/assertj/assertj-core/3.11.1/assertj-core-3.11.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.11.1/assertj-core-3.11.1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/assertj/assertj-core/3.11.1/assertj-core-3.11.1-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.11.1/assertj-core-3.11.1-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/assertj/assertj-core/3.11.1/assertj-core-3.11.1-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.11.1/assertj-core-3.11.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.attoparser:attoparser:2.0.5.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_freemarker_freemarker_2_3_23.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.freemarker:freemarker:2.3.23">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/freemarker/freemarker/2.3.23/freemarker-2.3.23.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.23/freemarker-2.3.23.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/freemarker/freemarker/2.3.23/freemarker-2.3.23-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.23/freemarker-2.3.23-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/freemarker/freemarker/2.3.23/freemarker-2.3.23-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.23/freemarker-2.3.23-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.hamcrest:hamcrest-core:1.3">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.hamcrest:hamcrest-library:1.3">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_17_Final.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.hibernate.validator:hibernate-validator:6.0.17.Final">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/hibernate/validator/hibernate-validator/6.0.17.Final/hibernate-validator-6.0.17.Final.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.17.Final/hibernate-validator-6.0.17.Final.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/hibernate/validator/hibernate-validator/6.0.17.Final/hibernate-validator-6.0.17.Final-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.17.Final/hibernate-validator-6.0.17.Final-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/hibernate/validator/hibernate-validator/6.0.17.Final/hibernate-validator-6.0.17.Final-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.17.Final/hibernate-validator-6.0.17.Final-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.mockito:mockito-core:2.23.4">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/mockito/mockito-core/2.23.4/mockito-core-2.23.4.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/2.23.4/mockito-core-2.23.4.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/mockito/mockito-core/2.23.4/mockito-core-2.23.4-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/2.23.4/mockito-core-2.23.4-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/mockito/mockito-core/2.23.4/mockito-core-2.23.4-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/2.23.4/mockito-core-2.23.4-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_mybatis_mybatis_3_5_1.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.mybatis:mybatis:3.5.1">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/mybatis/mybatis/3.5.1/mybatis-3.5.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_1.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.mybatis:mybatis-spring:2.0.1">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml

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

+ 3 - 3
.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml

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

+ 3 - 3
.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.projectlombok:lombok:1.18.8">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/projectlombok/lombok/1.18.8/lombok-1.18.8.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/projectlombok/lombok/1.18.8/lombok-1.18.8-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/projectlombok/lombok/1.18.8/lombok-1.18.8-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml

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

+ 3 - 3
.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_26.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.slf4j:jul-to-slf4j:1.7.26">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/slf4j/jul-to-slf4j/1.7.26/jul-to-slf4j-1.7.26.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.26/jul-to-slf4j-1.7.26.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/slf4j/jul-to-slf4j/1.7.26/jul-to-slf4j-1.7.26-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.26/jul-to-slf4j-1.7.26-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/slf4j/jul-to-slf4j/1.7.26/jul-to-slf4j-1.7.26-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.26/jul-to-slf4j-1.7.26-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_26.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.slf4j:slf4j-api:1.7.26">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_6_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework.boot:spring-boot:2.1.6.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot/2.1.6.RELEASE/spring-boot-2.1.6.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.1.6.RELEASE/spring-boot-2.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot/2.1.6.RELEASE/spring-boot-2.1.6.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.1.6.RELEASE/spring-boot-2.1.6.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot/2.1.6.RELEASE/spring-boot-2.1.6.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.1.6.RELEASE/spring-boot-2.1.6.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_6_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.6.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-autoconfigure/2.1.6.RELEASE/spring-boot-autoconfigure-2.1.6.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.1.6.RELEASE/spring-boot-autoconfigure-2.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-autoconfigure/2.1.6.RELEASE/spring-boot-autoconfigure-2.1.6.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.1.6.RELEASE/spring-boot-autoconfigure-2.1.6.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-autoconfigure/2.1.6.RELEASE/spring-boot-autoconfigure-2.1.6.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.1.6.RELEASE/spring-boot-autoconfigure-2.1.6.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_6_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework.boot:spring-boot-devtools:2.1.6.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-devtools/2.1.6.RELEASE/spring-boot-devtools-2.1.6.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-devtools/2.1.6.RELEASE/spring-boot-devtools-2.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-devtools/2.1.6.RELEASE/spring-boot-devtools-2.1.6.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-devtools/2.1.6.RELEASE/spring-boot-devtools-2.1.6.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-devtools/2.1.6.RELEASE/spring-boot-devtools-2.1.6.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-devtools/2.1.6.RELEASE/spring-boot-devtools-2.1.6.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_6_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework.boot:spring-boot-starter:2.1.6.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter/2.1.6.RELEASE/spring-boot-starter-2.1.6.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.1.6.RELEASE/spring-boot-starter-2.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter/2.1.6.RELEASE/spring-boot-starter-2.1.6.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.1.6.RELEASE/spring-boot-starter-2.1.6.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter/2.1.6.RELEASE/spring-boot-starter-2.1.6.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.1.6.RELEASE/spring-boot-starter-2.1.6.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_6_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.6.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-jdbc/2.1.6.RELEASE/spring-boot-starter-jdbc-2.1.6.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.1.6.RELEASE/spring-boot-starter-jdbc-2.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-jdbc/2.1.6.RELEASE/spring-boot-starter-jdbc-2.1.6.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.1.6.RELEASE/spring-boot-starter-jdbc-2.1.6.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-jdbc/2.1.6.RELEASE/spring-boot-starter-jdbc-2.1.6.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.1.6.RELEASE/spring-boot-starter-jdbc-2.1.6.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_6_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.6.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-json/2.1.6.RELEASE/spring-boot-starter-json-2.1.6.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.1.6.RELEASE/spring-boot-starter-json-2.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-json/2.1.6.RELEASE/spring-boot-starter-json-2.1.6.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.1.6.RELEASE/spring-boot-starter-json-2.1.6.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-json/2.1.6.RELEASE/spring-boot-starter-json-2.1.6.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.1.6.RELEASE/spring-boot-starter-json-2.1.6.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_6_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.6.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-logging/2.1.6.RELEASE/spring-boot-starter-logging-2.1.6.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.1.6.RELEASE/spring-boot-starter-logging-2.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-logging/2.1.6.RELEASE/spring-boot-starter-logging-2.1.6.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.1.6.RELEASE/spring-boot-starter-logging-2.1.6.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-logging/2.1.6.RELEASE/spring-boot-starter-logging-2.1.6.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.1.6.RELEASE/spring-boot-starter-logging-2.1.6.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_6_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.6.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-test/2.1.6.RELEASE/spring-boot-starter-test-2.1.6.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.1.6.RELEASE/spring-boot-starter-test-2.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-test/2.1.6.RELEASE/spring-boot-starter-test-2.1.6.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.1.6.RELEASE/spring-boot-starter-test-2.1.6.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-test/2.1.6.RELEASE/spring-boot-starter-test-2.1.6.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.1.6.RELEASE/spring-boot-starter-test-2.1.6.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_1_6_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.1.6.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-thymeleaf/2.1.6.RELEASE/spring-boot-starter-thymeleaf-2.1.6.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-thymeleaf/2.1.6.RELEASE/spring-boot-starter-thymeleaf-2.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-thymeleaf/2.1.6.RELEASE/spring-boot-starter-thymeleaf-2.1.6.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-thymeleaf/2.1.6.RELEASE/spring-boot-starter-thymeleaf-2.1.6.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-thymeleaf/2.1.6.RELEASE/spring-boot-starter-thymeleaf-2.1.6.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-thymeleaf/2.1.6.RELEASE/spring-boot-starter-thymeleaf-2.1.6.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_6_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.6.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-tomcat/2.1.6.RELEASE/spring-boot-starter-tomcat-2.1.6.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.1.6.RELEASE/spring-boot-starter-tomcat-2.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-tomcat/2.1.6.RELEASE/spring-boot-starter-tomcat-2.1.6.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.1.6.RELEASE/spring-boot-starter-tomcat-2.1.6.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-tomcat/2.1.6.RELEASE/spring-boot-starter-tomcat-2.1.6.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.1.6.RELEASE/spring-boot-starter-tomcat-2.1.6.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_6_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.6.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-web/2.1.6.RELEASE/spring-boot-starter-web-2.1.6.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.1.6.RELEASE/spring-boot-starter-web-2.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-web/2.1.6.RELEASE/spring-boot-starter-web-2.1.6.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.1.6.RELEASE/spring-boot-starter-web-2.1.6.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter-web/2.1.6.RELEASE/spring-boot-starter-web-2.1.6.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.1.6.RELEASE/spring-boot-starter-web-2.1.6.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_6_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework.boot:spring-boot-test:2.1.6.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-test/2.1.6.RELEASE/spring-boot-test-2.1.6.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.1.6.RELEASE/spring-boot-test-2.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-test/2.1.6.RELEASE/spring-boot-test-2.1.6.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.1.6.RELEASE/spring-boot-test-2.1.6.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-test/2.1.6.RELEASE/spring-boot-test-2.1.6.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.1.6.RELEASE/spring-boot-test-2.1.6.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_6_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.6.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-test-autoconfigure/2.1.6.RELEASE/spring-boot-test-autoconfigure-2.1.6.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.1.6.RELEASE/spring-boot-test-autoconfigure-2.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-test-autoconfigure/2.1.6.RELEASE/spring-boot-test-autoconfigure-2.1.6.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.1.6.RELEASE/spring-boot-test-autoconfigure-2.1.6.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-test-autoconfigure/2.1.6.RELEASE/spring-boot-test-autoconfigure-2.1.6.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.1.6.RELEASE/spring-boot-test-autoconfigure-2.1.6.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_spring_aop_5_1_8_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework:spring-aop:5.1.8.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/spring-aop/5.1.8.RELEASE/spring-aop-5.1.8.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.8.RELEASE/spring-aop-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/spring-aop/5.1.8.RELEASE/spring-aop-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.8.RELEASE/spring-aop-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/spring-aop/5.1.8.RELEASE/spring-aop-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.8.RELEASE/spring-aop-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_spring_beans_5_1_8_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework:spring-beans:5.1.8.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/spring-beans/5.1.8.RELEASE/spring-beans-5.1.8.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.1.8.RELEASE/spring-beans-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/spring-beans/5.1.8.RELEASE/spring-beans-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.1.8.RELEASE/spring-beans-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/spring-beans/5.1.8.RELEASE/spring-beans-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.1.8.RELEASE/spring-beans-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_spring_context_5_1_8_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework:spring-context:5.1.8.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/spring-context/5.1.8.RELEASE/spring-context-5.1.8.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.1.8.RELEASE/spring-context-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/spring-context/5.1.8.RELEASE/spring-context-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.1.8.RELEASE/spring-context-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/spring-context/5.1.8.RELEASE/spring-context-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.1.8.RELEASE/spring-context-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_spring_core_5_1_8_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework:spring-core:5.1.8.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/spring-core/5.1.8.RELEASE/spring-core-5.1.8.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.8.RELEASE/spring-core-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/spring-core/5.1.8.RELEASE/spring-core-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.8.RELEASE/spring-core-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/spring-core/5.1.8.RELEASE/spring-core-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.8.RELEASE/spring-core-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_spring_expression_5_1_8_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework:spring-expression:5.1.8.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/spring-expression/5.1.8.RELEASE/spring-expression-5.1.8.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.1.8.RELEASE/spring-expression-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/spring-expression/5.1.8.RELEASE/spring-expression-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.1.8.RELEASE/spring-expression-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/spring-expression/5.1.8.RELEASE/spring-expression-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.1.8.RELEASE/spring-expression-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_spring_jcl_5_1_8_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework:spring-jcl:5.1.8.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/spring-jcl/5.1.8.RELEASE/spring-jcl-5.1.8.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.1.8.RELEASE/spring-jcl-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/spring-jcl/5.1.8.RELEASE/spring-jcl-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.1.8.RELEASE/spring-jcl-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/spring-jcl/5.1.8.RELEASE/spring-jcl-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.1.8.RELEASE/spring-jcl-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_8_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework:spring-jdbc:5.1.8.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/spring-jdbc/5.1.8.RELEASE/spring-jdbc-5.1.8.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.1.8.RELEASE/spring-jdbc-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/spring-jdbc/5.1.8.RELEASE/spring-jdbc-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.1.8.RELEASE/spring-jdbc-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/spring-jdbc/5.1.8.RELEASE/spring-jdbc-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.1.8.RELEASE/spring-jdbc-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_spring_test_5_1_8_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework:spring-test:5.1.8.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/spring-test/5.1.8.RELEASE/spring-test-5.1.8.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.1.8.RELEASE/spring-test-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/spring-test/5.1.8.RELEASE/spring-test-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.1.8.RELEASE/spring-test-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/spring-test/5.1.8.RELEASE/spring-test-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.1.8.RELEASE/spring-test-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_spring_tx_5_1_8_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework:spring-tx:5.1.8.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/spring-tx/5.1.8.RELEASE/spring-tx-5.1.8.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.1.8.RELEASE/spring-tx-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/spring-tx/5.1.8.RELEASE/spring-tx-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.1.8.RELEASE/spring-tx-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/spring-tx/5.1.8.RELEASE/spring-tx-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.1.8.RELEASE/spring-tx-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_spring_web_5_1_8_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework:spring-web:5.1.8.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/spring-web/5.1.8.RELEASE/spring-web-5.1.8.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.8.RELEASE/spring-web-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/spring-web/5.1.8.RELEASE/spring-web-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.8.RELEASE/spring-web-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/spring-web/5.1.8.RELEASE/spring-web-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.8.RELEASE/spring-web-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_8_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.springframework:spring-webmvc:5.1.8.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/springframework/spring-webmvc/5.1.8.RELEASE/spring-webmvc-5.1.8.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.1.8.RELEASE/spring-webmvc-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/springframework/spring-webmvc/5.1.8.RELEASE/spring-webmvc-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.1.8.RELEASE/spring-webmvc-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/springframework/spring-webmvc/5.1.8.RELEASE/spring-webmvc-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.1.8.RELEASE/spring-webmvc-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.4.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_11_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.thymeleaf:thymeleaf:3.0.11.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/thymeleaf/thymeleaf/3.0.11.RELEASE/thymeleaf-3.0.11.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/3.0.11.RELEASE/thymeleaf-3.0.11.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/thymeleaf/thymeleaf/3.0.11.RELEASE/thymeleaf-3.0.11.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/3.0.11.RELEASE/thymeleaf-3.0.11.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/thymeleaf/thymeleaf/3.0.11.RELEASE/thymeleaf-3.0.11.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/3.0.11.RELEASE/thymeleaf-3.0.11.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_11_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/thymeleaf/thymeleaf-spring5/3.0.11.RELEASE/thymeleaf-spring5-3.0.11.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-spring5/3.0.11.RELEASE/thymeleaf-spring5-3.0.11.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/thymeleaf/thymeleaf-spring5/3.0.11.RELEASE/thymeleaf-spring5-3.0.11.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-spring5/3.0.11.RELEASE/thymeleaf-spring5-3.0.11.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/thymeleaf/thymeleaf-spring5/3.0.11.RELEASE/thymeleaf-spring5-3.0.11.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-spring5/3.0.11.RELEASE/thymeleaf-spring5-3.0.11.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.unbescape:unbescape:1.1.6.RELEASE">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.xmlunit:xmlunit-core:2.6.2">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/xmlunit/xmlunit-core/2.6.2/xmlunit-core-2.6.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.6.2/xmlunit-core-2.6.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/xmlunit/xmlunit-core/2.6.2/xmlunit-core-2.6.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.6.2/xmlunit-core-2.6.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/xmlunit/xmlunit-core/2.6.2/xmlunit-core-2.6.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.6.2/xmlunit-core-2.6.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 3 - 3
.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="Maven: org.yaml:snakeyaml:1.23">
     <CLASSES>
-      <root url="jar://D:/software/repository/org/yaml/snakeyaml/1.23/snakeyaml-1.23.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.23/snakeyaml-1.23.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://D:/software/repository/org/yaml/snakeyaml/1.23/snakeyaml-1.23-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.23/snakeyaml-1.23-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://D:/software/repository/org/yaml/snakeyaml/1.23/snakeyaml-1.23-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.23/snakeyaml-1.23-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

+ 29 - 11
.idea/yunsu.iml

@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="kotlin-language" name="Kotlin">
+      <configuration version="3" platform="JVM 1.8" useProjectSettings="false">
+        <compilerSettings />
+        <compilerArguments>
+          <option name="jvmTarget" value="1.8" />
+          <option name="languageVersion" value="1.2" />
+          <option name="apiVersion" value="1.2" />
+          <option name="pluginOptions">
+            <array />
+          </option>
+          <option name="pluginClasspaths">
+            <array />
+          </option>
+        </compilerArguments>
+      </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" />
@@ -12,9 +30,18 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.1.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.6.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.slf4j:slf4j-api:1.7.26" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.26" level="project" />
@@ -24,10 +51,10 @@
     <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:3.0.11.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.attoparser:attoparser:2.0.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
     <orderEntry type="library" name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.6.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.9" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.9" level="project" />
@@ -42,16 +69,9 @@
     <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: net.lingala.zip4j:zip4j:1.3.2" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.springframework.boot:spring-boot-devtools:2.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.6.RELEASE" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.8" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.6.RELEASE" level="project" />
@@ -62,17 +82,15 @@
     <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" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.9.13" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.13" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.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" name="Maven: org.springframework:spring-core:5.1.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.8.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.8.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.15" level="project" />

+ 17 - 3
cloud-model/pom.xml

@@ -96,6 +96,13 @@
             <artifactId>poi</artifactId>
             <version>3.17</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.artofsolving.jodconverter/jodconverter-core -->
+        <dependency>
+            <groupId>com.artofsolving</groupId>
+            <artifactId>jodconverter</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
@@ -103,10 +110,17 @@
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
         <!--<dependency>-->
-            <!--<groupId>org.apache.poi</groupId>-->
-            <!--<artifactId>poi</artifactId>-->
-            <!--<version>4.0.1</version>-->
+        <!--<groupId>org.apache.poi</groupId>-->
+        <!--<artifactId>poi</artifactId>-->
+        <!--<version>4.0.1</version>-->
         <!--</dependency>-->
+        <dependency>
+            <groupId>org.artofsolving</groupId>
+            <artifactId>jodconverter-core-3.0.jar</artifactId>
+            <version>1.0</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/src/main/resources/lib/jodconverter-core-3.0.jar</systemPath>
+        </dependency>
 
     </dependencies>
 

+ 1 - 1
cloud-model/src/main/java/com/hssx/cloudmodel/entity/Mould.java

@@ -136,7 +136,7 @@ public class Mould extends Model<Mould> {
     private Integer equipmentId;
 
     /**
-     * 在项目中所属的部分如:1/10
+     * 在项目中所属的部分如:1
      */
     @TableField("belong_project_grade")
     private String belongProjectGrade;

+ 6 - 4
cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectServiceImpl.java

@@ -110,13 +110,14 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     //添加模具
                     if (modelIds != null && !"".equals(modelIds)) {
                         List<Integer> modelList = ListUtil.convertIntegerIdsArrayToList(modelIds);
-                        int index = 1;
+                        int num = 1;
                         if (modelList.size() > 0) {
                             for (Integer id : modelList) {
                                 Mould mould = new Mould();
                                 mould.setId(id);
                                 mould.setProjectId(project.getId());
-                                mould.setBelongProjectGrade(index / modelList.size() + "");
+                                mould.setBelongProjectGrade(num+"");
+                                num++;
                                 mouldMapper.updateById(mould);
                             }
                         }
@@ -242,14 +243,15 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 //再次模具的分配
                 if (modelIds != null && !"".equals(modelIds)) {
                     List<Integer> modelList = ListUtil.convertIntegerIdsArrayToList(modelIds);
-                    int index = 1;
+                    int sum = 1;
                     if (modelList.size() > 0) {
                         for (Integer id : modelList) {
                             Mould mould = new Mould();
                             mould.setId(id);
                             mould.setProjectId(project.getId());
-                            mould.setBelongProjectGrade(index / modelList.size() + "");
+                            mould.setBelongProjectGrade(sum + "");
                             mouldMapper.updateById(mould);
+                            sum++;
                         }
                     }
                 }

+ 117 - 0
cloud-model/src/main/java/com/hssx/cloudmodel/util/OpenOfficeService.java

@@ -0,0 +1,117 @@
+package com.hssx.cloudmodel.util;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Random;
+import java.util.regex.Pattern;
+
+import lombok.extern.slf4j.Slf4j;
+import org.artofsolving.jodconverter.OfficeDocumentConverter;
+import org.artofsolving.jodconverter.office.DefaultOfficeManagerConfiguration;
+import org.artofsolving.jodconverter.office.OfficeManager;
+import org.springframework.stereotype.Service;
+@Slf4j
+@Service("openOfficeService")
+public class OpenOfficeService {
+	//64位windows系统默认安装路径
+	public static String OpenOffice_HOME_64 = "C://Program Files (x86)/OpenOffice 4/";
+	//32位windows系统默认安装路径
+	public static String OpenOffice_HOME_32 = "C://Program Files/OpenOffice 4/";
+	public static String OpenOffice_HOME_UNIX = "/opt/openoffice4/";
+
+	private static OfficeManager officeManager;
+
+	/**
+	 * 启动openoffice服务
+	 */
+	public void start() {
+		try {
+			log.info("===Openoffice实例启动中...");
+			DefaultOfficeManagerConfiguration config = new DefaultOfficeManagerConfiguration();
+	        String officeHome = getOfficeHome();
+			log.info("officeHome====="+officeHome);
+	        config.setOfficeHome(officeHome);
+	        int randomPort = new Random().nextInt(1000);
+	        randomPort += 8000;
+	        config.setPortNumber(randomPort);
+	        officeManager = config.buildOfficeManager();
+	        officeManager.start();
+			log.info("Openoffice实例启动成功!");
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.info("OpenOffice启动失败:"+e.getMessage());
+		}
+	}
+
+	public static String getOfficeHome() {
+        String osName = System.getProperty("os.name");
+        if (Pattern.matches("Linux.*", osName)) {
+            return OpenOffice_HOME_UNIX;
+        } else if (Pattern.matches("Windows.*", osName)) {
+        	String arch = System.getProperty("os.arch");
+        	boolean is64bit = (System.getenv("ProgramFiles(x86)") != null);
+        	if (is64bit) {
+        		return OpenOffice_HOME_64;
+        	} else {
+        		return OpenOffice_HOME_32;
+        	}
+        } else if (Pattern.matches("Mac.*", osName)) {
+            return "/Application/OpenOffice.org.app/Contents";
+        }
+        return null;
+    }
+
+	/**
+	 * 文档转换
+	 * @param inputFilePath
+	 * @param destFile
+	 * @return 0-转换成,-1转换失败
+	 */
+	public static int office2PDF(String inputFilePath, String destFile) {
+		//txt后缀需要改成odt再进行转换
+		if (inputFilePath.endsWith(".txt")) {
+			String tempFilePath = inputFilePath.replaceAll(".txt", ".odt");
+			try {
+				org.apache.commons.io.FileUtils.copyFile(new File(inputFilePath), new File(tempFilePath));
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+			inputFilePath = tempFilePath;
+		}
+		OfficeDocumentConverter converter = new OfficeDocumentConverter(officeManager);
+		File outputFile = new File(destFile);
+		if (!outputFile.getParentFile().exists()) {
+			outputFile.getParentFile().mkdirs();
+		}
+        File inputFile = new File(inputFilePath);
+        if (inputFile.exists()) {// 找不到源文件, 则返回
+            converter.convert(inputFile, outputFile);
+        } else {
+        	System.out.println("转换失败,目标文件不存在");
+        	return -1;
+        }
+        System.out.println("转换成功");
+        return 0;
+	}
+
+	/**
+	 * 停止服务
+	 */
+	public void shutdown() {
+		if (officeManager != null) {
+			officeManager.stop();
+			System.out.println("Openoffice实例停止!");
+		}
+
+	}
+
+
+	public static void main(String[] args) {
+		OpenOfficeService service = new OpenOfficeService();
+		String sFile = "D:\\wttxls.xls";
+		String dFile = "D:\\wttxls555.pdf";
+		service.start();
+		service.office2PDF(sFile,dFile);
+		service.shutdown();
+	}
+}

+ 1 - 1
cloud-model/src/main/resources/application-prod.properties

@@ -13,7 +13,7 @@ spring.thymeleaf.jackson.date-format=yyyy-MM-dd HH:mm:ss
 # ####################################################################################################
 # Êý¾ÝÔ´ÅäÖÃ
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://118.190.47.230:3306/new_cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
 spring.datasource.password=p011430seya10
 #spring.datasource.druid.test-on-borrow=true

BIN
cloud-model/src/main/resources/lib/jodconverter-core-3.0.jar


+ 1 - 1
cloud-model/src/main/resources/mapper/MouldMapper.xml

@@ -78,7 +78,7 @@
     </resultMap>
 
     <update id="updateMouldByProjectId">
-        update tb_mould set project_id = null where project_id = #{project.id}
+        update tb_mould set project_id = null ,belong_project_grade = 0 where project_id = #{project.id}
     </update>
 
     <select id="selectListByCondition" resultMap="BaseResultMapVO">

+ 2 - 1
cloud-model/src/main/resources/mapper/ProjectMapper.xml

@@ -127,6 +127,7 @@
             <result column="model_no" property="modelNo" />
             <result column="model_name" property="modelName" />
             <result column="produce_company_id" property="produceCompanyId" />
+            <result column="belong_project_grade" property="belongProjectGrade" />
             <result column="produce_company_name" property="produceCompanyName" />
         </collection>
         <collection property="approves" ofType="com.hssx.cloudmodel.entity.ProjectApprove">
@@ -146,7 +147,7 @@
     <select id="getProjectById" resultMap="BaseResultMapVO">
     select
         p.id id, p.project_name project_name, p.project_no project_no, p.creator_id creator_id,p.manager_id manager_id,p.manager manager,
-        p.creator creator, p.owner_company owner_company,p.owner_company_name owner_company_name,p.indate pindate,
+        p.creator creator, p.owner_company owner_company,p.owner_company_name owner_company_name,p.indate pindate,m.belong_project_grade
         m.id model_id, m.model_no model_no,m.model_name model_name,a.approver_id approver_id,a.approver_name approver_name,a.subordinate_type subordinate_type,
         c.company_id companyid,c.company_name companyname,tbc.company_name produce_company_name,tbc.id produce_company_id
     from