Reiskuchen 5 лет назад
Родитель
Сommit
362157e0e0
44 измененных файлов с 139 добавлено и 123 удалено
  1. 3 3
      fhKeeper/.idea/libraries/Maven__com_baidu_aip_java_sdk_4_2_0.xml
  2. 3 3
      fhKeeper/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml
  3. 3 3
      fhKeeper/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
  4. 3 3
      fhKeeper/.idea/libraries/Maven__io_lettuce_lettuce_core_5_1_8_RELEASE.xml
  5. 3 3
      fhKeeper/.idea/libraries/Maven__io_netty_netty_buffer_4_1_43_Final.xml
  6. 3 3
      fhKeeper/.idea/libraries/Maven__io_netty_netty_codec_4_1_43_Final.xml
  7. 3 3
      fhKeeper/.idea/libraries/Maven__io_netty_netty_common_4_1_43_Final.xml
  8. 3 3
      fhKeeper/.idea/libraries/Maven__io_netty_netty_handler_4_1_43_Final.xml
  9. 3 3
      fhKeeper/.idea/libraries/Maven__io_netty_netty_resolver_4_1_43_Final.xml
  10. 3 3
      fhKeeper/.idea/libraries/Maven__io_netty_netty_transport_4_1_43_Final.xml
  11. 3 3
      fhKeeper/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_13_RELEASE.xml
  12. 3 3
      fhKeeper/.idea/libraries/Maven__junit_junit_4_12.xml
  13. 3 3
      fhKeeper/.idea/libraries/Maven__log4j_log4j_1_2_17.xml
  14. 3 3
      fhKeeper/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_16.xml
  15. 3 3
      fhKeeper/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_16.xml
  16. 3 3
      fhKeeper/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml
  17. 3 3
      fhKeeper/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml
  18. 3 3
      fhKeeper/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml
  19. 3 3
      fhKeeper/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
  20. 3 3
      fhKeeper/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml
  21. 3 3
      fhKeeper/.idea/libraries/Maven__org_json_json_20160810.xml
  22. 3 3
      fhKeeper/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml
  23. 3 3
      fhKeeper/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml
  24. 3 3
      fhKeeper/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
  25. 3 3
      fhKeeper/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml
  26. 3 3
      fhKeeper/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
  27. 3 3
      fhKeeper/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_1_11_RELEASE.xml
  28. 3 3
      fhKeeper/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_11_RELEASE.xml
  29. 3 3
      fhKeeper/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_11_RELEASE.xml
  30. 3 3
      fhKeeper/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_11_RELEASE.xml
  31. 3 3
      fhKeeper/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_14_RELEASE.xml
  32. 3 3
      fhKeeper/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_14_RELEASE.xml
  33. 3 3
      fhKeeper/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_14_RELEASE.xml
  34. 3 3
      fhKeeper/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_12_RELEASE.xml
  35. 3 3
      fhKeeper/.idea/libraries/Maven__org_springframework_spring_oxm_5_1_12_RELEASE.xml
  36. 3 3
      fhKeeper/.idea/libraries/Maven__org_springframework_spring_test_5_1_12_RELEASE.xml
  37. 3 3
      fhKeeper/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_3.xml
  38. 0 2
      fhKeeper/.idea/modules.xml
  39. 7 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java
  40. 1 1
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Report.java
  41. 7 1
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/User.java
  42. 10 6
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java
  43. 1 1
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/CodeGenerator.java
  44. 2 1
      fhKeeper/src/main/resources/mapper/UserMapper.xml

+ 3 - 3
fhKeeper/.idea/libraries/Maven__com_baidu_aip_java_sdk_4_2_0.xml

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

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

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

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

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__io_lettuce_lettuce_core_5_1_8_RELEASE.xml

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__io_netty_netty_buffer_4_1_43_Final.xml

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__io_netty_netty_codec_4_1_43_Final.xml

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__io_netty_netty_common_4_1_43_Final.xml

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__io_netty_netty_handler_4_1_43_Final.xml

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__io_netty_netty_resolver_4_1_43_Final.xml

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__io_netty_netty_transport_4_1_43_Final.xml

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_13_RELEASE.xml

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

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

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__log4j_log4j_1_2_17.xml

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_16.xml

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_16.xml

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

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

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

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

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

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

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

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

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

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

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__org_json_json_20160810.xml

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

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

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

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

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

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

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml

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

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

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_1_11_RELEASE.xml

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_11_RELEASE.xml

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_11_RELEASE.xml

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_11_RELEASE.xml

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_14_RELEASE.xml

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_14_RELEASE.xml

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_14_RELEASE.xml

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_12_RELEASE.xml

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__org_springframework_spring_oxm_5_1_12_RELEASE.xml

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__org_springframework_spring_test_5_1_12_RELEASE.xml

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

+ 3 - 3
fhKeeper/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_3.xml

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

+ 0 - 2
fhKeeper/.idea/modules.xml

@@ -4,8 +4,6 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/fhKeeper.iml" filepath="$PROJECT_DIR$/.idea/fhKeeper.iml" />
       <module fileurl="file://$PROJECT_DIR$/formulahousekeeper/formulahousekeeper.iml" filepath="$PROJECT_DIR$/formulahousekeeper/formulahousekeeper.iml" />
-      <module fileurl="file://$PROJECT_DIR$/formulahousekeeper/formulahousekeeper.iml" filepath="$PROJECT_DIR$/formulahousekeeper/formulahousekeeper.iml" />
-      <module fileurl="file://$PROJECT_DIR$/formulahousekeeper/management-platform/management-platform.iml" filepath="$PROJECT_DIR$/formulahousekeeper/management-platform/management-platform.iml" />
       <module fileurl="file://$PROJECT_DIR$/formulahousekeeper/management-platform/management-platform.iml" filepath="$PROJECT_DIR$/formulahousekeeper/management-platform/management-platform.iml" />
     </modules>
   </component>

+ 7 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java

@@ -23,6 +23,13 @@ public class UserController {
     @Autowired
     private UserService userService;
 
+    /**
+     * 管理员登录网页端
+     *
+     * @param username  用户名
+     * @param password  密码
+     * @return
+     */
     @RequestMapping("/login")
     public HttpRespMsg login(@RequestParam String username, @RequestParam String password){
         return userService.login(username, password);

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Report.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-12-31
+ * @since 2020-01-02
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

+ 7 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/User.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-12-31
+ * @since 2020-01-02
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -61,6 +61,12 @@ public class User extends Model<User> {
     @TableField("create_time")
     private LocalDateTime createTime;
 
+    /**
+     * 角色权限 0-员工 1-管理员
+     */
+    @TableField("role")
+    private Integer role;
+
 
     @Override
     protected Serializable pkVal() {

+ 10 - 6
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -16,7 +16,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author 吴涛涛
@@ -29,17 +29,21 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     //登录
     @Override
-    public HttpRespMsg login(String username, String password){
+    public HttpRespMsg login(String username, String password) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("phone", username));
-        if(userList.size() > 0 && MD5Util.getPassword(password).equals(userList.get(0).getPassword())){
+        if (userList.size() == 0) {
+            httpRespMsg.setError("账号未注册");
+        } else if (userList.size() > 1) {
+            httpRespMsg.setError("账号重名");
+        } else if (userList.get(0).getRole().equals(1)) {
+            httpRespMsg.setError("非管理员不能登陆系统");
+        } else if (MD5Util.getPassword(password).equals(userList.get(0).getPassword())) {
             //将信息返回
             Map<String, Object> resultMap = new HashMap<>();
             resultMap.put("portraitUrl", userList.get(0).getPortraitUrl());
             httpRespMsg.data = resultMap;
-        }else if(userList.size() > 1){
-            httpRespMsg.setError("账号重名 请联系管理员");
-        }else{
+        } else {
             httpRespMsg.setError("账号不存在或密码错误");
         }
         return httpRespMsg;

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller,则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名,多个英文逗号分割
-//        strategy.setInclude("user");
+        strategy.setInclude("user");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名,多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

+ 2 - 1
fhKeeper/src/main/resources/mapper/UserMapper.xml

@@ -10,11 +10,12 @@
         <result column="password" property="password" />
         <result column="portrait_url" property="portraitUrl" />
         <result column="create_time" property="createTime" />
+        <result column="role" property="role" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, phone, password, portrait_url, create_time
+        id, name, phone, password, portrait_url, create_time, role
     </sql>
 
 </mapper>