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

.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://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar!/" />
+      <root url="jar://D:/software/repository/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-sources.jar!/" />
+      <root url="jar://D:/software/repository/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar!/" />
+      <root url="jar://D:/software/repository/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-sources.jar!/" />
+      <root url="jar://D:/software/repository/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.7/fastjson-1.2.7.jar!/" />
+      <root url="jar://D:/software/repository/com/alibaba/fastjson/1.2.7/fastjson-1.2.7.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.7/fastjson-1.2.7-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/com/alibaba/fastjson/1.2.7/fastjson-1.2.7-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.7/fastjson-1.2.7-sources.jar!/" />
+      <root url="jar://D:/software/repository/com/alibaba/fastjson/1.2.7/fastjson-1.2.7-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2.jar!/" />
+      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-sources.jar!/" />
+      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus/3.1.2/mybatis-plus-3.1.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2.jar!/" />
+      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2-sources.jar!/" />
+      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-annotation/3.1.2/mybatis-plus-annotation-3.1.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2.jar!/" />
+      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-sources.jar!/" />
+      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-boot-starter/3.1.2/mybatis-plus-boot-starter-3.1.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/" />
+      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-sources.jar!/" />
+      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/" />
+      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/" />
+      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2.jar!/" />
+      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/" />
+      <root url="jar://D:/software/repository/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.4.0/classmate-1.4.0.jar!/" />
+      <root url="jar://D:/software/repository/com/fasterxml/classmate/1.4.0/classmate-1.4.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.4.0/classmate-1.4.0-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/com/fasterxml/classmate/1.4.0/classmate-1.4.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.4.0/classmate-1.4.0-sources.jar!/" />
+      <root url="jar://D:/software/repository/com/fasterxml/classmate/1.4.0/classmate-1.4.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0.jar!/" />
+      <root url="jar://D:/software/repository/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0-sources.jar!/" />
+      <root url="jar://D:/software/repository/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9.jar!/" />
+      <root url="jar://D:/software/repository/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9-sources.jar!/" />
+      <root url="jar://D:/software/repository/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.9/jackson-databind-2.9.9.jar!/" />
+      <root url="jar://D:/software/repository/com/fasterxml/jackson/core/jackson-databind/2.9.9/jackson-databind-2.9.9.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.9/jackson-databind-2.9.9-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/com/fasterxml/jackson/core/jackson-databind/2.9.9/jackson-databind-2.9.9-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.9/jackson-databind-2.9.9-sources.jar!/" />
+      <root url="jar://D:/software/repository/com/fasterxml/jackson/core/jackson-databind/2.9.9/jackson-databind-2.9.9-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.9/jackson-datatype-jdk8-2.9.9.jar!/" />
+      <root url="jar://D:/software/repository/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.9/jackson-datatype-jdk8-2.9.9.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.9/jackson-datatype-jdk8-2.9.9-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.9/jackson-datatype-jdk8-2.9.9-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.9/jackson-datatype-jdk8-2.9.9-sources.jar!/" />
+      <root url="jar://D:/software/repository/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.9/jackson-datatype-jdk8-2.9.9-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.9/jackson-datatype-jsr310-2.9.9.jar!/" />
+      <root url="jar://D:/software/repository/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.9/jackson-datatype-jsr310-2.9.9.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.9/jackson-datatype-jsr310-2.9.9-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.9/jackson-datatype-jsr310-2.9.9-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.9/jackson-datatype-jsr310-2.9.9-sources.jar!/" />
+      <root url="jar://D:/software/repository/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.9/jackson-datatype-jsr310-2.9.9-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.9/jackson-module-parameter-names-2.9.9.jar!/" />
+      <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!/" />
     </CLASSES>
     <JAVADOC>
-      <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!/" />
+      <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!/" />
     </JAVADOC>
     <SOURCES>
-      <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!/" />
+      <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!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0.jar!/" />
+      <root url="jar://D:/software/repository/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-sources.jar!/" />
+      <root url="jar://D:/software/repository/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar!/" />
+      <root url="jar://D:/software/repository/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-sources.jar!/" />
+      <root url="jar://D:/software/repository/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0.jar!/" />
+      <root url="jar://D:/software/repository/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0-sources.jar!/" />
+      <root url="jar://D:/software/repository/com/zaxxer/HikariCP/3.2.0/HikariCP-3.2.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3.jar!/" />
+      <root url="jar://D:/software/repository/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3-sources.jar!/" />
+      <root url="jar://D:/software/repository/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2.jar!/" />
+      <root url="jar://D:/software/repository/commons-io/commons-io/2.2/commons-io-2.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/commons-io/commons-io/2.2/commons-io-2.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2-sources.jar!/" />
+      <root url="jar://D:/software/repository/commons-io/commons-io/2.2/commons-io-2.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/commons-net/commons-net/3.6/commons-net-3.6.jar!/" />
+      <root url="jar://D:/software/repository/commons-net/commons-net/3.6/commons-net-3.6.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-net/commons-net/3.6/commons-net-3.6-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/commons-net/commons-net/3.6/commons-net-3.6-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/commons-net/commons-net/3.6/commons-net-3.6-sources.jar!/" />
+      <root url="jar://D:/software/repository/commons-net/commons-net/3.6/commons-net-3.6-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.15/swagger-annotations-1.5.15.jar!/" />
+      <root url="jar://D:/software/repository/io/swagger/swagger-annotations/1.5.15/swagger-annotations-1.5.15.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.15/swagger-annotations-1.5.15-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/io/swagger/swagger-annotations/1.5.15/swagger-annotations-1.5.15-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.15/swagger-annotations-1.5.15-sources.jar!/" />
+      <root url="jar://D:/software/repository/io/swagger/swagger-annotations/1.5.15/swagger-annotations-1.5.15-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar!/" />
+      <root url="jar://D:/software/repository/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2-sources.jar!/" />
+      <root url="jar://D:/software/repository/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar!/" />
+      <root url="jar://D:/software/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final-sources.jar!/" />
+      <root url="jar://D:/software/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
+      <root url="jar://D:/software/repository/junit/junit/4.12/junit-4.12.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
+      <root url="jar://D:/software/repository/junit/junit/4.12/junit-4.12-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16.jar!/" />
+      <root url="jar://D:/software/repository/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16-sources.jar!/" />
+      <root url="jar://D:/software/repository/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.9.13/byte-buddy-1.9.13.jar!/" />
+      <root url="jar://D:/software/repository/net/bytebuddy/byte-buddy/1.9.13/byte-buddy-1.9.13.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.9.13/byte-buddy-1.9.13-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/net/bytebuddy/byte-buddy/1.9.13/byte-buddy-1.9.13-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.9.13/byte-buddy-1.9.13-sources.jar!/" />
+      <root url="jar://D:/software/repository/net/bytebuddy/byte-buddy/1.9.13/byte-buddy-1.9.13-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.9.13/byte-buddy-agent-1.9.13.jar!/" />
+      <root url="jar://D:/software/repository/net/bytebuddy/byte-buddy-agent/1.9.13/byte-buddy-agent-1.9.13.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.9.13/byte-buddy-agent-1.9.13-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/net/bytebuddy/byte-buddy-agent/1.9.13/byte-buddy-agent-1.9.13-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.9.13/byte-buddy-agent-1.9.13-sources.jar!/" />
+      <root url="jar://D:/software/repository/net/bytebuddy/byte-buddy-agent/1.9.13/byte-buddy-agent-1.9.13-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.2/accessors-smart-1.2.jar!/" />
+      <root url="jar://D:/software/repository/net/minidev/accessors-smart/1.2/accessors-smart-1.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.2/accessors-smart-1.2-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/net/minidev/accessors-smart/1.2/accessors-smart-1.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.2/accessors-smart-1.2-sources.jar!/" />
+      <root url="jar://D:/software/repository/net/minidev/accessors-smart/1.2/accessors-smart-1.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.3/json-smart-2.3.jar!/" />
+      <root url="jar://D:/software/repository/net/minidev/json-smart/2.3/json-smart-2.3.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.3/json-smart-2.3-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/net/minidev/json-smart/2.3/json-smart-2.3-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.3/json-smart-2.3-sources.jar!/" />
+      <root url="jar://D:/software/repository/net/minidev/json-smart/2.3/json-smart-2.3-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.11.2/log4j-api-2.11.2.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/logging/log4j/log4j-api/2.11.2/log4j-api-2.11.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.11.2/log4j-api-2.11.2-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/logging/log4j/log4j-api/2.11.2/log4j-api-2.11.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.11.2/log4j-api-2.11.2-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/logging/log4j/log4j-api/2.11.2/log4j-api-2.11.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.11.2/log4j-to-slf4j-2.11.2.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/logging/log4j/log4j-to-slf4j/2.11.2/log4j-to-slf4j-2.11.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.11.2/log4j-to-slf4j-2.11.2-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/logging/log4j/log4j-to-slf4j/2.11.2/log4j-to-slf4j-2.11.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.11.2/log4j-to-slf4j-2.11.2-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/logging/log4j/log4j-to-slf4j/2.11.2/log4j-to-slf4j-2.11.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.21/tomcat-embed-core-9.0.21.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.21/tomcat-embed-core-9.0.21.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.21/tomcat-embed-core-9.0.21-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.21/tomcat-embed-core-9.0.21-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.21/tomcat-embed-core-9.0.21-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/tomcat/embed/tomcat-embed-core/9.0.21/tomcat-embed-core-9.0.21-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.21/tomcat-embed-el-9.0.21.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/tomcat/embed/tomcat-embed-el/9.0.21/tomcat-embed-el-9.0.21.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.21/tomcat-embed-el-9.0.21-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/tomcat/embed/tomcat-embed-el/9.0.21/tomcat-embed-el-9.0.21-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.21/tomcat-embed-el-9.0.21-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/tomcat/embed/tomcat-embed-el/9.0.21/tomcat-embed-el-9.0.21-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.21/tomcat-embed-websocket-9.0.21.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.21/tomcat-embed-websocket-9.0.21.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.21/tomcat-embed-websocket-9.0.21-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.21/tomcat-embed-websocket-9.0.21-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.21/tomcat-embed-websocket-9.0.21-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.21/tomcat-embed-websocket-9.0.21-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/apache/velocity/velocity-engine-core/2.0/velocity-engine-core-2.0.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/velocity/velocity-engine-core/2.0/velocity-engine-core-2.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity-engine-core/2.0/velocity-engine-core-2.0-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/velocity/velocity-engine-core/2.0/velocity-engine-core-2.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity-engine-core/2.0/velocity-engine-core-2.0-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/apache/velocity/velocity-engine-core/2.0/velocity-engine-core-2.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.11.1/assertj-core-3.11.1.jar!/" />
+      <root url="jar://D:/software/repository/org/assertj/assertj-core/3.11.1/assertj-core-3.11.1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.11.1/assertj-core-3.11.1-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/assertj/assertj-core/3.11.1/assertj-core-3.11.1-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.11.1/assertj-core-3.11.1-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/assertj/assertj-core/3.11.1/assertj-core-3.11.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/attoparser/attoparser/2.0.5.RELEASE/attoparser-2.0.5.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.23/freemarker-2.3.23.jar!/" />
+      <root url="jar://D:/software/repository/org/freemarker/freemarker/2.3.23/freemarker-2.3.23.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.23/freemarker-2.3.23-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/freemarker/freemarker/2.3.23/freemarker-2.3.23-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/freemarker/freemarker/2.3.23/freemarker-2.3.23-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/freemarker/freemarker/2.3.23/freemarker-2.3.23-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+      <root url="jar://D:/software/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.jar!/" />
+      <root url="jar://D:/software/repository/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.17.Final/hibernate-validator-6.0.17.Final.jar!/" />
+      <root url="jar://D:/software/repository/org/hibernate/validator/hibernate-validator/6.0.17.Final/hibernate-validator-6.0.17.Final.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.17.Final/hibernate-validator-6.0.17.Final-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/hibernate/validator/hibernate-validator/6.0.17.Final/hibernate-validator-6.0.17.Final-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.17.Final/hibernate-validator-6.0.17.Final-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/hibernate/validator/hibernate-validator/6.0.17.Final/hibernate-validator-6.0.17.Final-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final.jar!/" />
+      <root url="jar://D:/software/repository/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/jboss/logging/jboss-logging/3.3.2.Final/jboss-logging-3.3.2.Final-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/mockito/mockito-core/2.23.4/mockito-core-2.23.4.jar!/" />
+      <root url="jar://D:/software/repository/org/mockito/mockito-core/2.23.4/mockito-core-2.23.4.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/2.23.4/mockito-core-2.23.4-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/mockito/mockito-core/2.23.4/mockito-core-2.23.4-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/2.23.4/mockito-core-2.23.4-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/mockito/mockito-core/2.23.4/mockito-core-2.23.4-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1.jar!/" />
+      <root url="jar://D:/software/repository/org/mybatis/mybatis/3.5.1/mybatis-3.5.1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/mybatis/mybatis/3.5.1/mybatis-3.5.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1.jar!/" />
+      <root url="jar://D:/software/repository/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/mybatis/mybatis-spring/2.0.1/mybatis-spring-2.0.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6.jar!/" />
+      <root url="jar://D:/software/repository/org/objenesis/objenesis/2.6/objenesis-2.6.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/objenesis/objenesis/2.6/objenesis-2.6-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/objenesis/objenesis/2.6/objenesis-2.6-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar!/" />
+      <root url="jar://D:/software/repository/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/ow2/asm/asm/5.0.4/asm-5.0.4-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/ow2/asm/asm/5.0.4/asm-5.0.4-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8.jar!/" />
+      <root url="jar://D:/software/repository/org/projectlombok/lombok/1.18.8/lombok-1.18.8.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/projectlombok/lombok/1.18.8/lombok-1.18.8-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.8/lombok-1.18.8-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/projectlombok/lombok/1.18.8/lombok-1.18.8-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0.jar!/" />
+      <root url="jar://D:/software/repository/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.26/jul-to-slf4j-1.7.26.jar!/" />
+      <root url="jar://D:/software/repository/org/slf4j/jul-to-slf4j/1.7.26/jul-to-slf4j-1.7.26.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.26/jul-to-slf4j-1.7.26-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/slf4j/jul-to-slf4j/1.7.26/jul-to-slf4j-1.7.26-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.26/jul-to-slf4j-1.7.26-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/slf4j/jul-to-slf4j/1.7.26/jul-to-slf4j-1.7.26-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar!/" />
+      <root url="jar://D:/software/repository/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.1.6.RELEASE/spring-boot-2.1.6.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot/2.1.6.RELEASE/spring-boot-2.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.1.6.RELEASE/spring-boot-2.1.6.RELEASE-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot/2.1.6.RELEASE/spring-boot-2.1.6.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.1.6.RELEASE/spring-boot-2.1.6.RELEASE-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot/2.1.6.RELEASE/spring-boot-2.1.6.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.1.6.RELEASE/spring-boot-autoconfigure-2.1.6.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-autoconfigure/2.1.6.RELEASE/spring-boot-autoconfigure-2.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.1.6.RELEASE/spring-boot-autoconfigure-2.1.6.RELEASE-javadoc.jar!/" />
+      <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!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.1.6.RELEASE/spring-boot-autoconfigure-2.1.6.RELEASE-sources.jar!/" />
+      <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!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-devtools/2.1.6.RELEASE/spring-boot-devtools-2.1.6.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-devtools/2.1.6.RELEASE/spring-boot-devtools-2.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-devtools/2.1.6.RELEASE/spring-boot-devtools-2.1.6.RELEASE-javadoc.jar!/" />
+      <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!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-devtools/2.1.6.RELEASE/spring-boot-devtools-2.1.6.RELEASE-sources.jar!/" />
+      <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!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.1.6.RELEASE/spring-boot-starter-2.1.6.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-starter/2.1.6.RELEASE/spring-boot-starter-2.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.1.6.RELEASE/spring-boot-starter-2.1.6.RELEASE-javadoc.jar!/" />
+      <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!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.1.6.RELEASE/spring-boot-starter-2.1.6.RELEASE-sources.jar!/" />
+      <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!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.1.6.RELEASE/spring-boot-starter-jdbc-2.1.6.RELEASE.jar!/" />
+      <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!/" />
     </CLASSES>
     <JAVADOC>
-      <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!/" />
+      <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!/" />
     </JAVADOC>
     <SOURCES>
-      <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!/" />
+      <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!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.1.6.RELEASE/spring-boot-starter-json-2.1.6.RELEASE.jar!/" />
+      <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!/" />
     </CLASSES>
     <JAVADOC>
-      <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!/" />
+      <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!/" />
     </JAVADOC>
     <SOURCES>
-      <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!/" />
+      <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!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.1.6.RELEASE/spring-boot-starter-logging-2.1.6.RELEASE.jar!/" />
+      <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!/" />
     </CLASSES>
     <JAVADOC>
-      <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!/" />
+      <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!/" />
     </JAVADOC>
     <SOURCES>
-      <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!/" />
+      <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!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.1.6.RELEASE/spring-boot-starter-test-2.1.6.RELEASE.jar!/" />
+      <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!/" />
     </CLASSES>
     <JAVADOC>
-      <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!/" />
+      <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!/" />
     </JAVADOC>
     <SOURCES>
-      <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!/" />
+      <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!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-thymeleaf/2.1.6.RELEASE/spring-boot-starter-thymeleaf-2.1.6.RELEASE.jar!/" />
+      <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!/" />
     </CLASSES>
     <JAVADOC>
-      <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!/" />
+      <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!/" />
     </JAVADOC>
     <SOURCES>
-      <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!/" />
+      <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!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.1.6.RELEASE/spring-boot-starter-tomcat-2.1.6.RELEASE.jar!/" />
+      <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!/" />
     </CLASSES>
     <JAVADOC>
-      <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!/" />
+      <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!/" />
     </JAVADOC>
     <SOURCES>
-      <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!/" />
+      <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!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.1.6.RELEASE/spring-boot-starter-web-2.1.6.RELEASE.jar!/" />
+      <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!/" />
     </CLASSES>
     <JAVADOC>
-      <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!/" />
+      <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!/" />
     </JAVADOC>
     <SOURCES>
-      <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!/" />
+      <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!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.1.6.RELEASE/spring-boot-test-2.1.6.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/boot/spring-boot-test/2.1.6.RELEASE/spring-boot-test-2.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.1.6.RELEASE/spring-boot-test-2.1.6.RELEASE-javadoc.jar!/" />
+      <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!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.1.6.RELEASE/spring-boot-test-2.1.6.RELEASE-sources.jar!/" />
+      <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!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.1.6.RELEASE/spring-boot-test-autoconfigure-2.1.6.RELEASE.jar!/" />
+      <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!/" />
     </CLASSES>
     <JAVADOC>
-      <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!/" />
+      <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!/" />
     </JAVADOC>
     <SOURCES>
-      <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!/" />
+      <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!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.8.RELEASE/spring-aop-5.1.8.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-aop/5.1.8.RELEASE/spring-aop-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.8.RELEASE/spring-aop-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-aop/5.1.8.RELEASE/spring-aop-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.8.RELEASE/spring-aop-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-aop/5.1.8.RELEASE/spring-aop-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.1.8.RELEASE/spring-beans-5.1.8.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-beans/5.1.8.RELEASE/spring-beans-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.1.8.RELEASE/spring-beans-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-beans/5.1.8.RELEASE/spring-beans-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.1.8.RELEASE/spring-beans-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-beans/5.1.8.RELEASE/spring-beans-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.1.8.RELEASE/spring-context-5.1.8.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-context/5.1.8.RELEASE/spring-context-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.1.8.RELEASE/spring-context-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-context/5.1.8.RELEASE/spring-context-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.1.8.RELEASE/spring-context-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-context/5.1.8.RELEASE/spring-context-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.8.RELEASE/spring-core-5.1.8.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-core/5.1.8.RELEASE/spring-core-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.8.RELEASE/spring-core-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-core/5.1.8.RELEASE/spring-core-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.8.RELEASE/spring-core-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-core/5.1.8.RELEASE/spring-core-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.1.8.RELEASE/spring-expression-5.1.8.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-expression/5.1.8.RELEASE/spring-expression-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.1.8.RELEASE/spring-expression-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-expression/5.1.8.RELEASE/spring-expression-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.1.8.RELEASE/spring-expression-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-expression/5.1.8.RELEASE/spring-expression-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.1.8.RELEASE/spring-jcl-5.1.8.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-jcl/5.1.8.RELEASE/spring-jcl-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.1.8.RELEASE/spring-jcl-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-jcl/5.1.8.RELEASE/spring-jcl-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.1.8.RELEASE/spring-jcl-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-jcl/5.1.8.RELEASE/spring-jcl-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.1.8.RELEASE/spring-jdbc-5.1.8.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-jdbc/5.1.8.RELEASE/spring-jdbc-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.1.8.RELEASE/spring-jdbc-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-jdbc/5.1.8.RELEASE/spring-jdbc-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.1.8.RELEASE/spring-jdbc-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-jdbc/5.1.8.RELEASE/spring-jdbc-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.1.8.RELEASE/spring-test-5.1.8.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-test/5.1.8.RELEASE/spring-test-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.1.8.RELEASE/spring-test-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-test/5.1.8.RELEASE/spring-test-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.1.8.RELEASE/spring-test-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-test/5.1.8.RELEASE/spring-test-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.1.8.RELEASE/spring-tx-5.1.8.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-tx/5.1.8.RELEASE/spring-tx-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.1.8.RELEASE/spring-tx-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-tx/5.1.8.RELEASE/spring-tx-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.1.8.RELEASE/spring-tx-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-tx/5.1.8.RELEASE/spring-tx-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.8.RELEASE/spring-web-5.1.8.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-web/5.1.8.RELEASE/spring-web-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.8.RELEASE/spring-web-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-web/5.1.8.RELEASE/spring-web-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.8.RELEASE/spring-web-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-web/5.1.8.RELEASE/spring-web-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.1.8.RELEASE/spring-webmvc-5.1.8.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-webmvc/5.1.8.RELEASE/spring-webmvc-5.1.8.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.1.8.RELEASE/spring-webmvc-5.1.8.RELEASE-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-webmvc/5.1.8.RELEASE/spring-webmvc-5.1.8.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.1.8.RELEASE/spring-webmvc-5.1.8.RELEASE-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/springframework/spring-webmvc/5.1.8.RELEASE/spring-webmvc-5.1.8.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE-javadoc.jar!/" />
+      <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!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/extras/thymeleaf-extras-java8time/3.0.4.RELEASE/thymeleaf-extras-java8time-3.0.4.RELEASE-sources.jar!/" />
+      <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!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/3.0.11.RELEASE/thymeleaf-3.0.11.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/thymeleaf/thymeleaf/3.0.11.RELEASE/thymeleaf-3.0.11.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/3.0.11.RELEASE/thymeleaf-3.0.11.RELEASE-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/thymeleaf/thymeleaf/3.0.11.RELEASE/thymeleaf-3.0.11.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/3.0.11.RELEASE/thymeleaf-3.0.11.RELEASE-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/thymeleaf/thymeleaf/3.0.11.RELEASE/thymeleaf-3.0.11.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-spring5/3.0.11.RELEASE/thymeleaf-spring5-3.0.11.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/thymeleaf/thymeleaf-spring5/3.0.11.RELEASE/thymeleaf-spring5-3.0.11.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-spring5/3.0.11.RELEASE/thymeleaf-spring5-3.0.11.RELEASE-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/thymeleaf/thymeleaf-spring5/3.0.11.RELEASE/thymeleaf-spring5-3.0.11.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf-spring5/3.0.11.RELEASE/thymeleaf-spring5-3.0.11.RELEASE-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/thymeleaf/thymeleaf-spring5/3.0.11.RELEASE/thymeleaf-spring5-3.0.11.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.jar!/" />
+      <root url="jar://D:/software/repository/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/unbescape/unbescape/1.1.6.RELEASE/unbescape-1.1.6.RELEASE-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.6.2/xmlunit-core-2.6.2.jar!/" />
+      <root url="jar://D:/software/repository/org/xmlunit/xmlunit-core/2.6.2/xmlunit-core-2.6.2.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.6.2/xmlunit-core-2.6.2-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/xmlunit/xmlunit-core/2.6.2/xmlunit-core-2.6.2-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.6.2/xmlunit-core-2.6.2-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/xmlunit/xmlunit-core/2.6.2/xmlunit-core-2.6.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.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://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.23/snakeyaml-1.23.jar!/" />
+      <root url="jar://D:/software/repository/org/yaml/snakeyaml/1.23/snakeyaml-1.23.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.23/snakeyaml-1.23-javadoc.jar!/" />
+      <root url="jar://D:/software/repository/org/yaml/snakeyaml/1.23/snakeyaml-1.23-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.23/snakeyaml-1.23-sources.jar!/" />
+      <root url="jar://D:/software/repository/org/yaml/snakeyaml/1.23/snakeyaml-1.23-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.idea/yunsu.iml

@@ -10,7 +10,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: net.lingala.zip4j:zip4j:1.3.2" level="project" />
     <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-starter-logging:2.1.6.RELEASE" level="project" />

cloud-model/src/main/java/com/hssx/cloudmodel/entity/Factory.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Builder;
 
 import java.io.Serializable;
 
@@ -18,6 +19,7 @@ import java.io.Serializable;
  * @author 吴涛涛
  * @since 2019-07-26
  */
+@Builder
 @TableName("tb_factory")
 public class Factory extends Model<Factory> {
 

cloud-model/src/main/java/com/hssx/cloudmodel/entity/User.java

@@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -19,6 +22,10 @@ import java.io.Serializable;
  * @since 2019-08-12
  */
 @TableName("tb_user")
+//以下注解是用于Builder对象来直接构造对象。
+//@NoArgsConstructor
+//@AllArgsConstructor
+//@Builder(toBuilder = true)
 public class User extends Model<User> {
 
     private static final long serialVersionUID=1L;

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/CompanyServiceImpl.java

@@ -205,7 +205,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         QueryWrapper<Company> qw = new QueryWrapper<>();
         qw.select("id", "company_name", "company_type");
         List<Integer> ides = new ArrayList<>();
-        if (Constant.SYS_ID == user.getParentId()) {
+        if (Constant.SYS_ID.equals(user.getParentId())) {
             //此时是admin创建用户,返回可选的生产方公司,查询出当前admin的信息并获取他的公司id
             User admin = userMapper.selectOne(new QueryWrapper<User>().eq("id", user.getId()));
             ides = assetCustomCompanyMapper.selectList(new QueryWrapper<AssetCustomCompany>()
@@ -216,7 +216,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             ides.add(admin.getCompanyId());
             ides.add(-1);
             qw.in("id", ides);
-        } else if (Constant.SYS_PARENT_ID == user.getParentId()) {
+        } else if (Constant.SYS_PARENT_ID.equals(user.getParentId())) {
             //系统管理员创建admin,返回资产方公司
             qw.eq("company_type", Constant.ASSETS_COMPANY);
         } else {
@@ -249,7 +249,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         List<Integer> mouldIds = new ArrayList<>();
         mouldIds.add(-1);
         User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
-        if (Constant.SYS_ID == currentUser.getParentId()) {
+        if (Constant.SYS_ID.equals(currentUser.getParentId())) {
             //此时是admin，可看到自己公司下的模具和交于生产的公司
             QueryWrapper<Mould> qw = new QueryWrapper<>();
             List<Mould> moulds = mouldMapper.selectList(qw.eq("company_id", currentUser.getCompanyId()));
@@ -257,7 +257,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                 mouldIds.add(mould.getId());
             }
             companyVOS = companyMapper.getListMould(mouldIds);
-        } else if (Constant.SYS_PARENT_ID == currentUser.getParentId()) {
+        } else if (Constant.SYS_PARENT_ID.equals(currentUser.getParentId())) {
             //系统管理员创建admin,返回资产方公司
             List<Mould> moulds = mouldMapper.selectList(new QueryWrapper<Mould>());
             for (Mould mould : moulds) {
@@ -334,7 +334,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             return msg;
         } else {
             Company company = companyMapper.selectById(companyVO.getId());
-            if (Constant.PRODUCER_COMPANY == company.getCompanyType()) {
+            if (Constant.PRODUCER_COMPANY .equals(company.getCompanyType())) {
                 //生产方公司，返回关联的资产方公司列表
                 ides = assetCustomCompanyMapper.selectList(new QueryWrapper<AssetCustomCompany>()
                         .eq("custom_id", company.getId()))
@@ -342,7 +342,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                         .map(AssetCustomCompany::getAssertId)
                         .collect(Collectors.toList());
                 msg.data = companyMapper.selectList(new QueryWrapper<Company>().in("id", ides));
-            } else if (Constant.ASSETS_COMPANY == company.getCompanyType()) {
+            } else if (Constant.ASSETS_COMPANY .equals(company.getCompanyType())) {
                 //资产方公司，返回关联的生产方公司列表
                 ides = assetCustomCompanyMapper.selectList(new QueryWrapper<AssetCustomCompany>()
                         .eq("assert_id", company.getId()))
@@ -385,9 +385,9 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             msg.setError("用户不存在或者未登录");
             return msg;
         } else {
-            if (Constant.SYS_PARENT_ID == currentUser.getParentId()) {
+            if (Constant.SYS_PARENT_ID .equals(currentUser.getParentId())) {
                 companies = companyMapper.selectList(new QueryWrapper<Company>());
-            } else if (Constant.SYS_ID == currentUser.getParentId()) {
+            } else if (Constant.SYS_ID .equals(currentUser.getParentId())) {
                 if (currentUser.getSubordinateType() == 0) {
                     List<Integer> customCompanyIds = assetCustomCompanyMapper.selectList(new QueryWrapper<AssetCustomCompany>().eq("assert_id", currentUser.getCompanyId())).stream().map(AssetCustomCompany::getCustomId).collect(Collectors.toList());
                     customCompanyIds.add(currentUser.getCompanyId());

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldEquipmentServiceImpl.java

@@ -123,7 +123,7 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
     public HttpRespMsg getList(User user, PageUtil page, Integer companyId, String keyName) {
         HttpRespMsg msg = new HttpRespMsg();
         if (user != null) {
-            if (Constant.SYS_PARENT_ID == user.getParentId()) {
+            if (Constant.SYS_PARENT_ID.equals(user.getParentId())) {
                 PageHelper.startPage(page.getPageNum(), page.getPageSize());
                 List<MouldEquipmentVO> mouldEquipments = mouldEquipmentMapper.getList(companyId, keyName);
                 PageInfo<MouldEquipmentVO> pageInfo = new PageInfo<>(mouldEquipments);

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

@@ -477,7 +477,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
         if(currentUser == null){
             msg.setError("用户不存在或者未登录");
         }else{
-            if(Constant.SYS_ID == currentUser.getParentId()){
+            if(Constant.SYS_ID .equals(currentUser.getParentId())){
                 //判断是不是资产方管理员
                 msg.data = mouldFileMapper.deleteById(mouldFile.getId());
             }else{
@@ -496,7 +496,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
         User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
         PageHelper.startPage(page.getPageNum(), page.getPageSize());
         if (currentUser != null) {
-            if (Constant.SYS_ID == currentUser.getParentId()) {
+            if (Constant.SYS_ID .equals(currentUser.getParentId())) {
                 //此时是admin，查询他所创建的项目
                 QueryWrapper<Project> qw = new QueryWrapper<>();
                 List<Project> projects = projectMapper.selectList(qw.eq("creator_id", currentUser.getId()));
@@ -504,7 +504,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     proIds.add(pro.getId());
                 }
                 list = mouldFileMapper.getFileListByProjectId(userVO, proIds);
-            } else if (Constant.SYS_PARENT_ID == currentUser.getParentId()) {
+            } else if (Constant.SYS_PARENT_ID .equals(currentUser.getParentId())) {
                 //系统管理员
                 List<Project> projects = projectMapper.selectList(new QueryWrapper<Project>());
                 for (Project pro : projects) {
@@ -722,7 +722,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                 newsNotice.setBelongType(1);
                 newsNotice.setProjectName(project.getProjectName() + "-" + mould.getModelName());
                 newsNotice.setNoticeType(Constant.APPROVEL_TYPE);
-                newsNotice.setContent("有新的" + content + "申请记录,待您审批。");
+                newsNotice.setContent("有新的" + content + "上传,待您审批。");
                 newsNoticeMapper.insert(newsNotice);
                 for (ProjectApprove projectApprove : projectApproves) {
                     NewsNoticeUser newsNoticeUser = new NewsNoticeUser();

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldServiceImpl.java

@@ -155,10 +155,10 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
         userVO.setProjectId(-1);
         if (userVO.getId() != null) {
             //资产方管理员，获取他公司下的所有模具
-            if (Constant.SYS_PARENT_ID == userVO.getParentId()) {
+            if (Constant.SYS_PARENT_ID.equals(userVO.getParentId())) {
                 //超级管理员，获取平台所有模具
                 moulds = mouldMapper.selectListByCondition(userVO);
-            } else if (Constant.SYS_ID == userVO.getParentId()) {
+            } else if (Constant.SYS_ID.equals(userVO.getParentId())) {
                 if (Constant.ASSETS_COMPANY == userVO.getSubordinateType()) {
                     //资产方管理员
                     moulds = mouldMapper.selectListByCondition(userVO);
@@ -214,13 +214,13 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
             } else {
                 List<CustomCompany> list = customCompanyMapper.selectList(new QueryWrapper<CustomCompany>().eq("project_id", mould.getProjectId()));
                 map.put("customCompany", list);
-                if (Constant.SYS_PARENT_ID == userVO.getParentId()) {
+                if (Constant.SYS_PARENT_ID.equals(userVO.getParentId())) {
                     //当前人超级管理员 ,对项目只可以浏览
                     map.put("update", 0);
                     map.put("download", 0);
                     map.put("view", 1);
                     map.put("approve", 0);
-                } else if (Constant.SYS_ID == userVO.getParentId()) {
+                } else if (Constant.SYS_ID.equals(userVO.getParentId())) {
                     //当前为系统管理员
                     if (Constant.ASSETS_COMPANY == userVO.getSubordinateType()) {
                         map.put("update", 1);
@@ -233,7 +233,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                         map.put("view", 1);
                         map.put("approve", 0);
                     }
-                } else if (vo.getManagerId() == userVO.getId()) {
+                } else if (vo.getManagerId().equals(userVO.getId())) {
                     //当前人是该项目的项目经理
                     Integer approve = 0;
                     if (projectApproveMapper.selectCount(new QueryWrapper<ProjectApprove>().eq("approver_id", userVO.getId())) > 0) {
@@ -443,7 +443,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
         List<Mould> moulds = new ArrayList<>();
         if (currentUser.getId() != null) {
             //资产方管理员，获取他公司下的所有模具
-            if (Constant.SYS_ID == currentUser.getParentId()) {
+            if (Constant.SYS_ID.equals(currentUser.getParentId())) {
                 List<Project> projects = projectMapper.selectList(new QueryWrapper<Project>().eq("creator_id", currentUser.getId()));
                 for (Project project : projects) {
                     set.add(project.getId());

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/PowerServiceImpl.java

@@ -57,10 +57,10 @@ public class PowerServiceImpl extends ServiceImpl<PowerMapper, Power> implements
         BeanUtils.copyProperties(user, userVO);
         System.out.println("userVO" + userVO);
         if (user != null) {
-            if (Constant.SYS_PARENT_ID == user.getParentId()) {
+            if (Constant.SYS_PARENT_ID.equals(user.getParentId())) {
                 //平台超级管理员
                 msg.setError("对不起你不具备该项权限!");
-            } else if (Constant.SYS_ID == user.getParentId()) {
+            } else if (Constant.SYS_ID.equals(user.getParentId())) {
                 //资产方管理员,展示此人创建所有项目对应的权限
                 PageHelper.startPage(page.getPageNum(), page.getPageSize());
                 list = projectMapper.selectUserPowerList(userVO, type);

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectApproveServiceImpl.java

@@ -34,7 +34,7 @@ public class ProjectApproveServiceImpl extends ServiceImpl<ProjectApproveMapper,
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
         if(user != null){
-            if(Constant.SYS_ID == user.getParentId()){
+            if(Constant.SYS_ID.equals(user.getParentId())){
                 //资产方管理员
                 User examiner = userMapper.selectById(projectApprove.getApproverId());
                 Company company = companyMapper.selectById(examiner.getCompanyId());

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectFileServiceImpl.java

@@ -225,7 +225,7 @@ public class ProjectFileServiceImpl extends ServiceImpl<ProjectFileMapper, Proje
             msg.setError("当前用户不存在或者未登录");
             return msg;
         } else {
-            if((Constant.SYS_ID == user.getParentId() && user.getSubordinateType()==0)||project.getManagerId().equals(user.getId())){
+            if((Constant.SYS_ID.equals(user.getParentId()) && user.getSubordinateType()==0)||project.getManagerId().equals(user.getId())){
                 msg.data = projectFileMapper.deleteById(projectFile.getId());
             }else{
                 msg.setError("当前用户不存在或者未登录");

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

@@ -83,9 +83,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     project.setProjectNo(Constant.PROJECT_PREFIX + seq);
                     projectMapper.insert(project);
                     //给项目经理添加一条上传权限
-                    if(null != project.getManagerId()){
+                    if (null != project.getManagerId()) {
                         Integer cot = powerMapper.selectCount(new QueryWrapper<Power>().eq("user_id", project.getManagerId()).eq("project_id", project.getId()).eq("power_type", 0));
-                        if(cot==0){
+                        if (cot == 0) {
                             Power power = new Power();
                             power.setUserId(project.getManagerId());
                             power.setProjectId(project.getId());
@@ -132,9 +132,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 //删除之前的项目经理上传权限
                 powerMapper.delete(new QueryWrapper<Power>().eq("user_id", pro.getManagerId()).eq("project_id", pro.getId()).eq("power_type", 0));
                 //重新添加项目经理上传权限
-                if(null != project.getManagerId()){
+                if (null != project.getManagerId()) {
                     Integer cot = powerMapper.selectCount(new QueryWrapper<Power>().eq("user_id", project.getManagerId()).eq("project_id", project.getId()).eq("power_type", 0));
-                    if(cot==0){
+                    if (cot == 0) {
                         Power power = new Power();
                         power.setUserId(project.getManagerId());
                         power.setProjectId(project.getId());
@@ -291,9 +291,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             List<Integer> uIds = new ArrayList<>();
             List<ProjectVO> projects = new ArrayList<>();
             List<Integer> projectIds = new ArrayList<>();
-            if (Constant.SYS_PARENT_ID == user.getParentId()) {
+            if (Constant.SYS_PARENT_ID.equals(user.getParentId())) {
                 projects = projectMapper.getProjectListByUid(keyName, user);
-            } else if (Constant.SYS_ID == user.getParentId()) {
+            } else if (Constant.SYS_ID.equals(user.getParentId())) {
                 if (user.getSubordinateType() == 0) {
                     QueryWrapper<Project> qwr = new QueryWrapper<>();
                     //资产方管理员,看到自己创建的项目
@@ -363,9 +363,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         if (user != null) {
             List<Integer> uIds = new ArrayList<>();
             List<Integer> projectIds = new ArrayList<>();
-            if (Constant.SYS_PARENT_ID == user.getParentId()) {
+            if (Constant.SYS_PARENT_ID.equals(user.getParentId())) {
                 projects = projectMapper.getProjectListByUid(keyName, user);
-            } else if (Constant.SYS_ID == user.getParentId()) {
+            } else if (Constant.SYS_ID.equals(user.getParentId())) {
                 if (user.getSubordinateType() == 0) {
                     QueryWrapper<Project> qwr = new QueryWrapper<>();
                     //资产方管理员,看到自己创建的项目
@@ -401,31 +401,31 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             msg.setError("用户不存在或者未登录");
         }
         List<Integer> pIds = projects.stream().map(Project::getId).collect(Collectors.toList());
-        if(!pIds.contains(project.getId())){
+        if (!pIds.contains(project.getId())) {
             msg.setError("您没有该权限!");
             return msg;
         }
         ProjectVO vo = projectMapper.getProjectById(project.getId());
-        if (Constant.SYS_PARENT_ID == user.getParentId()) {
+        if (Constant.SYS_PARENT_ID.equals(user.getParentId())) {
             //当前人超级管理员 ,对项目只可以浏览
             map.put("update", 0);
             map.put("download", 0);
             map.put("view", 1);
             map.put("approve", 0);
-        } else if (Constant.SYS_ID == user.getParentId()) {
+        } else if (Constant.SYS_ID.equals(user.getParentId())) {
             //当前为系统管理员
-            if (Constant.ASSETS_COMPANY == user.getSubordinateType()) {
+            if (Constant.ASSETS_COMPANY.equals(user.getSubordinateType())) {
                 map.put("update", 1);
                 map.put("download", 1);
                 map.put("view", 1);
                 map.put("approve", 0);
-            } else if (Constant.PRODUCER_COMPANY == user.getSubordinateType()) {
+            } else if (Constant.PRODUCER_COMPANY.equals(user.getSubordinateType())) {
                 map.put("update", 0);
                 map.put("download", 1);
                 map.put("view", 1);
                 map.put("approve", 0);
             }
-        } else if (vo.getManagerId() == user.getId()) {
+        } else if (vo.getManagerId().equals(user.getId())) {
             //当前人是该项目的项目经理
             Integer approve = 0;
             if (projectApproveMapper.selectCount(new QueryWrapper<ProjectApprove>().eq("approver_id", user.getId())) > 0) {
@@ -489,7 +489,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         List<User> users = projectMapper.getProjectUserById(project.getId());
         vo.setParticipateUsers(users);
         //处理users按照客户呼和供应商分组
-        System.out.println("users===>" + users);
 //        for (User user : users) {
 //            if (user.getSubordinateType() == 0) {
 //                //资产方
@@ -516,25 +515,25 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         }
         List<Integer> uids = new ArrayList<>();
         uids.add(-1);
-        if(Constant.SYS_ID == user.getParentId()){
+        if (Constant.SYS_ID.equals(user.getParentId())) {
             //资产方管理员
-            uids = userCompanyMapper.selectList(new QueryWrapper<UserCompany>().eq("cooperation_company_id", user.getCompanyId()).in("belong_company_id",ids)).stream().map(UserCompany::getUserId).collect(Collectors.toList());
-            List<Integer> userIds = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId()).ne("parent_id",1)).stream().map(User::getId).collect(Collectors.toList());
+            uids = userCompanyMapper.selectList(new QueryWrapper<UserCompany>().eq("cooperation_company_id", user.getCompanyId()).in("belong_company_id", ids)).stream().map(UserCompany::getUserId).collect(Collectors.toList());
+            List<Integer> userIds = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId()).ne("parent_id", 1)).stream().map(User::getId).collect(Collectors.toList());
             uids.addAll(userIds);
             uids.add(-1);
-        }else{
+        } else {
             //项目经理
-            if(null != projectId){
+            if (null != projectId) {
                 Project pro = projectMapper.selectById(projectId);
                 user = userMapper.selectById(pro.getCreatorId());
-                uids = userCompanyMapper.selectList(new QueryWrapper<UserCompany>().eq("cooperation_company_id", user.getCompanyId()).in("belong_company_id",ids)).stream().map(UserCompany::getUserId).collect(Collectors.toList());
-                List<Integer> userIds = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId()).ne("parent_id",1)).stream().map(User::getId).collect(Collectors.toList());
+                uids = userCompanyMapper.selectList(new QueryWrapper<UserCompany>().eq("cooperation_company_id", user.getCompanyId()).in("belong_company_id", ids)).stream().map(UserCompany::getUserId).collect(Collectors.toList());
+                List<Integer> userIds = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId()).ne("parent_id", 1)).stream().map(User::getId).collect(Collectors.toList());
                 uids.addAll(userIds);
                 uids.add(-1);
                 id = user.getId();//不能是管理员本人
             }
         }
-        List<UserVO> userVOS = userMapper.selsctUsersByUids(uids,id);
+        List<UserVO> userVOS = userMapper.selsctUsersByUids(uids, id);
         msg.data = userVOS;
         return msg;
     }
@@ -544,12 +543,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         HttpRespMsg msg = new HttpRespMsg();
         QueryWrapper<Mould> qw = new QueryWrapper<>();
         Integer companyId = -1;
-        if (Constant.SYS_ID == user.getParentId()) {
+        if (Constant.SYS_ID.equals(user.getParentId())) {
             //此时是admin
             User admin = userMapper.selectOne(new QueryWrapper<User>().eq("id", user.getId()));
             companyId = admin.getCompanyId();
 //            qw.eq("company_id", admin.getCompanyId());
-        } else if (Constant.SYS_PARENT_ID == user.getParentId()) {
+        } else if (Constant.SYS_PARENT_ID.equals(user.getParentId())) {
             //系统管理员
 //            qw.eq("company_type",Constant.ASSETS_COMPANY);
         } else {
@@ -559,7 +558,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 //            qw.eq("company_id", admin.getCompanyId());
         }
 //        List<Mould> moulds = mouldMapper.selectList(new QueryWrapper<Mould>().eq("company_id", companyId).isNull("project_id"));
-        msg.data = mouldMapper.selectListByCompanyId(companyId,null);
+        msg.data = mouldMapper.selectListByCompanyId(companyId, null);
         return msg;
     }
 
@@ -572,14 +571,14 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         if (userVO.getId() != null) {
             //资产方管理员，获取他公司下的所有模具
             PageHelper.startPage(page.getPageNum(), page.getPageSize());
-            if (Constant.SYS_PARENT_ID == userVO.getParentId()) {
+            if (Constant.SYS_PARENT_ID.equals(userVO.getParentId())) {
                 //超级管理员，获取平台所有模具
                 moulds = mouldMapper.selectListByCondition(userVO);
-            } else if (Constant.SYS_ID == userVO.getParentId()) {
-                if (Constant.ASSETS_COMPANY == userVO.getSubordinateType()) {
+            } else if (Constant.SYS_ID.equals(userVO.getParentId())) {
+                if (Constant.ASSETS_COMPANY.equals(userVO.getSubordinateType())) {
                     //资产方管理员
                     moulds = mouldMapper.selectListByCondition(userVO);
-                } else if (Constant.PRODUCER_COMPANY == userVO.getSubordinateType()) {
+                } else if (Constant.PRODUCER_COMPANY.equals(userVO.getSubordinateType())) {
                     set = customCompanyMapper.selectList(new QueryWrapper<CustomCompany>().eq("company_id", userVO.getCompanyId())).stream().map(CustomCompany::getProjectId).collect(Collectors.toList());
                     set.add(-1);
                     moulds = mouldMapper.selectListByConditionByProject(userVO, set);
@@ -636,10 +635,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         if (user != null) {
             QueryWrapper<Project> qw = new QueryWrapper<>();
             qw.select("id", "project_name");
-            if (Constant.SYS_PARENT_ID == user.getParentId()) {
+            if (Constant.SYS_PARENT_ID.equals(user.getParentId())) {
                 //系统超级管理员，可获得所有项目
                 projects = projectMapper.selectList(qw);
-            } else if (Constant.SYS_ID == user.getParentId()) {
+            } else if (Constant.SYS_ID.equals(user.getParentId())) {
                 //资产方管理员
                 qw.eq("owner_company", user.getCompanyId());
                 projects = projectMapper.selectList(qw);
@@ -679,7 +678,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             msg.setError("用户不存在或者未登录");
             return msg;
         } else {
-            if (Constant.SYS_ID == user.getParentId()) {
+            if (Constant.SYS_ID.equals(user.getParentId())) {
                 //admin创建人员,获取该公司下的所有项目
                 list = projectMapper.selectList(new QueryWrapper<Project>().eq("owner_company", user.getCompanyId()));
             } else {
@@ -701,15 +700,15 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         List<MouldVO> moulds = new ArrayList<>();
         if (userVO.getId() != null) {
             //资产方管理员，获取他公司下的所有模具
-            if (Constant.SYS_PARENT_ID == userVO.getParentId()) {
+            if (Constant.SYS_PARENT_ID.equals(userVO.getParentId())) {
                 //超级管理员，获取平台所有模具
                 moulds = mouldMapper.selectListByCondition(userVO);
-            } else if (Constant.SYS_ID == userVO.getParentId()) {
+            } else if (Constant.SYS_ID.equals(userVO.getParentId())) {
 
-                if (Constant.ASSETS_COMPANY == userVO.getSubordinateType()) {
+                if (Constant.ASSETS_COMPANY.equals(userVO.getSubordinateType())) {
                     //资产方管理员
                     moulds = mouldMapper.selectListByCondition(userVO);
-                } else if (Constant.PRODUCER_COMPANY == userVO.getSubordinateType()) {
+                } else if (Constant.PRODUCER_COMPANY.equals(userVO.getSubordinateType())) {
                     set = customCompanyMapper.selectList(new QueryWrapper<CustomCompany>().eq("company_id", userVO.getCompanyId())).stream().map(CustomCompany::getProjectId).collect(Collectors.toList());
                     set.add(-1);
                     moulds = mouldMapper.selectListByConditionByProject(userVO, set);
@@ -776,7 +775,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 //            qw.eq("company_id", admin.getCompanyId());
         }
 //        List<Mould> moulds = mouldMapper.selectList(new QueryWrapper<Mould>().eq("company_id", companyId).isNull("project_id"));
-        msg.data = mouldMapper.selectListByCompanyId(companyId,userVO.getProjectId());
+        msg.data = mouldMapper.selectListByCompanyId(companyId, userVO.getProjectId());
         return msg;
     }
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/UserServiceImpl.java

@@ -77,9 +77,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         PageHelper.startPage(page.getPageNum(), page.getPageSize());
         List<UserVO> users = new ArrayList<>();
         List<Integer> uIds = new ArrayList<>();
-        if (Constant.SYS_PARENT_ID == user.getParentId()) {
+        if (Constant.SYS_PARENT_ID.equals(user.getParentId())) {
             users = userMapper.selectListByCondition(roleType, companyId, flag, user, keyName);
-        } else if (Constant.SYS_ID == user.getParentId()) {
+        } else if (Constant.SYS_ID.equals(user.getParentId())) {
             if (user.getSubordinateType() == 0) {
                 QueryWrapper<Project> qwr = new QueryWrapper<>();
                 //资产方管理员,看到自己创建的项目下的所有人以及和自己公司建立联系的人
@@ -126,7 +126,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             if (userVO.getId() != null) {
                 QueryWrapper<Project> qw = new QueryWrapper<>();
                 //当前登录人是什么人
-                if (Constant.SYS_PARENT_ID == user.getParentId()) {
+                if (Constant.SYS_PARENT_ID.equals(user.getParentId())) {
                     //超级管理员
                     //看到该人参与的所有项目
                     QueryWrapper<Project> qwPro = new QueryWrapper<>();
@@ -148,7 +148,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     qw.in("id", set);
                     projects = projectMapper.selectList(qw);
                     userVO.setProjects(projects);
-                } else if (Constant.SYS_ID == user.getParentId()) {
+                } else if (Constant.SYS_ID.equals(user.getParentId())) {
                     List<Integer> proIds = projectMapper.selectList(new QueryWrapper<Project>().eq("creator_id", user.getId())).stream().map(Project::getId).collect(Collectors.toList());
                     if (user.getSubordinateType() == 0) {
                         //看到该人参与的所有项目
@@ -282,7 +282,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         //获取该账号的创建者
         User parentUser = userMapper.selectById(user.getParentId());
         HttpRespMsg msg = new HttpRespMsg();
-        if (Constant.SYS_PARENT_ID == parentUser.getParentId()) {
+        if (Constant.SYS_PARENT_ID.equals(parentUser.getParentId())) {
             //此时是创建admind,当前创建人是超级管理员,此时没有项目id
             int count = userMapper.selectCount(new QueryWrapper<User>().eq("company_id", user.getCompanyId()).eq("parent_id", parentUser.getId()));
             if (flag == 0) {
@@ -305,10 +305,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     user.setHeadImgurl(UUID.randomUUID().toString().replaceAll("-", ""));
                     //获取角色所属的团体
                     Company company = companyMapper.selectById(user.getCompanyId());
-                    if (Constant.ASSETS_COMPANY == company.getCompanyType()) {
+                    if (Constant.ASSETS_COMPANY.equals(company.getCompanyType())) {
                         user.setSubordinateType(Constant.ASSETS_COMPANY);
                         user.setTeamName("资产方");
-                    } else if (Constant.PRODUCER_COMPANY == company.getCompanyType()) {
+                    } else if (Constant.PRODUCER_COMPANY.equals(company.getCompanyType())) {
                         user.setSubordinateType(Constant.PRODUCER_COMPANY);
                         user.setTeamName("生产方");
                     }
@@ -335,7 +335,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 //                }
                 userMapper.updateById(user);
             }
-        } else if (Constant.SYS_ID == parentUser.getParentId()) {
+        } else if (Constant.SYS_ID.equals(parentUser.getParentId())) {
             //admin创建用户
             if (flag == 0) {
                 //添加用户
@@ -344,7 +344,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 int count = userMapper.selectCount(qw);
                 if (count > 0) {
                     User existingUser = userMapper.selectOne(qw);
-                    if(user.getCompanyId() != existingUser.getCompanyId() || existingUser.getParentId()==1){
+                    if(!user.getCompanyId().equals(existingUser.getCompanyId()) || existingUser.getParentId() == 1){
                         msg.setError("公司信息不匹配，创建账号失败");
                         return msg;
                     }
@@ -396,10 +396,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     user.setHeadImgurl(UUID.randomUUID().toString().replaceAll("-", ""));
                     //获取角色所属的团体
                     Company company = companyMapper.selectById(user.getCompanyId());
-                    if (Constant.ASSETS_COMPANY == company.getCompanyType()) {
+                    if (Constant.ASSETS_COMPANY.equals(company.getCompanyType())) {
                         user.setSubordinateType(Constant.ASSETS_COMPANY);
                         user.setTeamName("资产方");
-                    } else if (Constant.PRODUCER_COMPANY == company.getCompanyType()) {
+                    } else if (Constant.PRODUCER_COMPANY.equals(company.getCompanyType())) {
                         user.setSubordinateType(Constant.PRODUCER_COMPANY);
                         user.setTeamName("生产方");
                     }
@@ -450,7 +450,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 if (count > 0) {
                     //当前账号已被创建
                     User existingUser = userMapper.selectOne(qw);
-                    if(user.getCompanyId() != existingUser.getCompanyId() || existingUser.getParentId()==1){
+                    if(!user.getCompanyId().equals(existingUser.getCompanyId()) || existingUser.getParentId() == 1){
                         msg.setError("公司信息不匹配，创建账号失败");
                         return msg;
                     }
@@ -496,10 +496,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                     user.setHeadImgurl(UUID.randomUUID().toString().replaceAll("-", ""));
                     //获取角色所属的团体
                     Company company = companyMapper.selectById(user.getCompanyId());
-                    if (Constant.ASSETS_COMPANY == company.getCompanyType()) {
+                    if (Constant.ASSETS_COMPANY.equals(company.getCompanyType())) {
                         user.setSubordinateType(Constant.ASSETS_COMPANY);
                         user.setTeamName("资产方");
-                    } else if (Constant.PRODUCER_COMPANY == company.getCompanyType()) {
+                    } else if (Constant.PRODUCER_COMPANY.equals(company.getCompanyType())) {
                         user.setSubordinateType(Constant.PRODUCER_COMPANY);
                         user.setTeamName("生产方");
                     }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/VnoticeUserServiceImpl.java

@@ -81,7 +81,6 @@ public class VnoticeUserServiceImpl extends ServiceImpl<VnoticeUserMapper, Vnoti
     @Override
     public HttpRespMsg read(Integer id) {
         HttpRespMsg msg = new HttpRespMsg();
-        //不是保养消息才改成已读，保养消息自动忽略
         NewsNoticeUser item = new NewsNoticeUser();
         item.setId(id);
         item.setIsRead(1);

cloud-model/src/main/java/com/hssx/cloudmodel/util/MD5Util.java

@@ -43,6 +43,11 @@ public class MD5Util {
             System.out.println("用户账号===》"+user.getAccount());
         }
         System.out.println("结束了++++++++++++++");
+        Integer num = 0;
+        Integer num1 = 0;
+        if(num == num1){
+            System.out.println("xiangdeng");
+        }
 //        zip4jDemo();
 
 //        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

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/cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://118.190.47.230:3306/new_cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
 spring.datasource.password=p011430seya10
 #spring.datasource.druid.test-on-borrow=true