diff --git a/.gitignore b/.gitignore
index 838e520..f56704b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
# IntelliJ project files .gitignore
.idea
+idea/*.xml
*.iml
out
gen
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 8c9324c..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 0f9ce45..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml
deleted file mode 100644
index b8d93d8..0000000
--- a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_8.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_8.xml
deleted file mode 100644
index 9b223e0..0000000
--- a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml
deleted file mode 100644
index 33c30b4..0000000
--- a/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml
deleted file mode 100644
index 06441f4..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml
deleted file mode 100644
index eebe10d..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml
deleted file mode 100644
index 51087da..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_6.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_6.xml
deleted file mode 100644
index fa50d95..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_6.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_6.xml
deleted file mode 100644
index 7e20e35..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_6.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_6.xml
deleted file mode 100644
index 345adf8..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_guava_20_0.xml b/.idea/libraries/Maven__com_google_guava_guava_20_0.xml
deleted file mode 100644
index c5bd322..0000000
--- a/.idea/libraries/Maven__com_google_guava_guava_20_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml
deleted file mode 100644
index f19f6eb..0000000
--- a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_11.xml b/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_11.xml
deleted file mode 100644
index dbd8483..0000000
--- a/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_11.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_1_2.xml b/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_1_2.xml
deleted file mode 100644
index ea07fce..0000000
--- a/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
deleted file mode 100644
index b8581a6..0000000
--- a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml
deleted file mode 100644
index 6d6865c..0000000
--- a/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml
deleted file mode 100644
index 687a60e..0000000
--- a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml
deleted file mode 100644
index 4c8ff54..0000000
--- a/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
deleted file mode 100644
index 13afda2..0000000
--- a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
deleted file mode 100644
index 14681ee..0000000
--- a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__i3plus_platform_i3plus_platform_common_1_0_SNAPSHOT.xml b/.idea/libraries/Maven__i3plus_platform_i3plus_platform_common_1_0_SNAPSHOT.xml
deleted file mode 100644
index 7b3d4d2..0000000
--- a/.idea/libraries/Maven__i3plus_platform_i3plus_platform_common_1_0_SNAPSHOT.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_base_1_0_SNAPSHOT.xml b/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_base_1_0_SNAPSHOT.xml
deleted file mode 100644
index 1807124..0000000
--- a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_base_1_0_SNAPSHOT.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_mes_1_0_SNAPSHOT.xml b/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_mes_1_0_SNAPSHOT.xml
deleted file mode 100644
index 66115c3..0000000
--- a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_mes_1_0_SNAPSHOT.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_model_1_0_SNAPSHOT.xml b/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_model_1_0_SNAPSHOT.xml
deleted file mode 100644
index 875e7c3..0000000
--- a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_model_1_0_SNAPSHOT.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_platform_1_0_SNAPSHOT.xml b/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_platform_1_0_SNAPSHOT.xml
deleted file mode 100644
index 262a850..0000000
--- a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_platform_1_0_SNAPSHOT.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_wms_1_0_SNAPSHOT.xml b/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_wms_1_0_SNAPSHOT.xml
deleted file mode 100644
index c6cd544..0000000
--- a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_wms_1_0_SNAPSHOT.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__impp_framework_impp_framework_boot_1_0_SNAPSHOT.xml b/.idea/libraries/Maven__impp_framework_impp_framework_boot_1_0_SNAPSHOT.xml
deleted file mode 100644
index c5ed4d7..0000000
--- a/.idea/libraries/Maven__impp_framework_impp_framework_boot_1_0_SNAPSHOT.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_lettuce_lettuce_core_5_0_4_RELEASE.xml b/.idea/libraries/Maven__io_lettuce_lettuce_core_5_0_4_RELEASE.xml
deleted file mode 100644
index 4b5e592..0000000
--- a/.idea/libraries/Maven__io_lettuce_lettuce_core_5_0_4_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_25_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_25_Final.xml
deleted file mode 100644
index 8174ce4..0000000
--- a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_25_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_codec_4_1_25_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_1_25_Final.xml
deleted file mode 100644
index 72440e7..0000000
--- a/.idea/libraries/Maven__io_netty_netty_codec_4_1_25_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_common_4_1_25_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_1_25_Final.xml
deleted file mode 100644
index 9bf4c51..0000000
--- a/.idea/libraries/Maven__io_netty_netty_common_4_1_25_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_handler_4_1_25_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_4_1_25_Final.xml
deleted file mode 100644
index 747450b..0000000
--- a/.idea/libraries/Maven__io_netty_netty_handler_4_1_25_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_25_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_25_Final.xml
deleted file mode 100644
index 34d4fb3..0000000
--- a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_25_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_transport_4_1_25_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_1_25_Final.xml
deleted file mode 100644
index 2a0e6a1..0000000
--- a/.idea/libraries/Maven__io_netty_netty_transport_4_1_25_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_1_8_RELEASE.xml b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_1_8_RELEASE.xml
deleted file mode 100644
index 683cbec..0000000
--- a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_1_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml
deleted file mode 100644
index 03588dc..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml
deleted file mode 100644
index 4a47148..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml
deleted file mode 100644
index f934649..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml
deleted file mode 100644
index 7898a19..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml
deleted file mode 100644
index 4ed7d0d..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml
deleted file mode 100644
index c40ef9f..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml
deleted file mode 100644
index 0700f01..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml
deleted file mode 100644
index 1c4a621..0000000
--- a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml
deleted file mode 100644
index 395508f..0000000
--- a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml
deleted file mode 100644
index e74f3ab..0000000
--- a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml b/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml
deleted file mode 100644
index 5f032d2..0000000
--- a/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml
deleted file mode 100644
index 6978c0b..0000000
--- a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml
deleted file mode 100644
index d411041..0000000
--- a/.idea/libraries/Maven__junit_junit_4_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml
deleted file mode 100644
index 18e6ec9..0000000
--- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml
deleted file mode 100644
index ee623f1..0000000
--- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml
deleted file mode 100644
index a72c9a3..0000000
--- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml
deleted file mode 100644
index b3d3858..0000000
--- a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml
deleted file mode 100644
index 1083023..0000000
--- a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml b/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml
deleted file mode 100644
index 1c71163..0000000
--- a/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_8_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_8_1.xml
deleted file mode 100644
index 33b78e9..0000000
--- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_8_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_0.xml b/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_0.xml
deleted file mode 100644
index 440e770..0000000
--- a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_5.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_5.xml
deleted file mode 100644
index e4eb38b..0000000
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_9.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_9.xml
deleted file mode 100644
index 7f14d45..0000000
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml
deleted file mode 100644
index cbe5ca7..0000000
--- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_10_0.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_10_0.xml
deleted file mode 100644
index f061a60..0000000
--- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_10_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_10_0.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_10_0.xml
deleted file mode 100644
index b6e0a9e..0000000
--- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_10_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_10_0.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_10_0.xml
deleted file mode 100644
index 9a53275..0000000
--- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_10_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_4_0.xml
deleted file mode 100644
index ec3b15e..0000000
--- a/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_4_0.xml
deleted file mode 100644
index c460aba..0000000
--- a/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_4_0.xml
deleted file mode 100644
index 1e28543..0000000
--- a/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_4_0.xml
deleted file mode 100644
index 19c39a1..0000000
--- a/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_4_0.xml
deleted file mode 100644
index c0b1b53..0000000
--- a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_4_0.xml
deleted file mode 100644
index d7da59e..0000000
--- a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_4_0.xml
deleted file mode 100644
index 3e3feaf..0000000
--- a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_4_0.xml
deleted file mode 100644
index 5137263..0000000
--- a/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_4_0.xml
deleted file mode 100644
index 0c26d31..0000000
--- a/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_4_0.xml
deleted file mode 100644
index d50067f..0000000
--- a/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_4_0.xml
deleted file mode 100644
index e6235dc..0000000
--- a/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_4_0.xml
deleted file mode 100644
index 9f0fcf1..0000000
--- a/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_31.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_31.xml
deleted file mode 100644
index a6693a2..0000000
--- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_31.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_31.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_31.xml
deleted file mode 100644
index bc00163..0000000
--- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_31.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_jasper_8_5_31.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_jasper_8_5_31.xml
deleted file mode 100644
index 02ac6c9..0000000
--- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_jasper_8_5_31.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_31.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_31.xml
deleted file mode 100644
index a47a3be..0000000
--- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_31.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_8_5_31.xml b/.idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_8_5_31.xml
deleted file mode 100644
index 3a59079..0000000
--- a/.idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_8_5_31.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml
deleted file mode 100644
index d46e30a..0000000
--- a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml
deleted file mode 100644
index 40adaaa..0000000
--- a/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_csource_fastdfs_client_java_1_27.xml b/.idea/libraries/Maven__org_csource_fastdfs_client_java_1_27.xml
deleted file mode 100644
index 976841b..0000000
--- a/.idea/libraries/Maven__org_csource_fastdfs_client_java_1_27.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jdt_ecj_3_12_3.xml b/.idea/libraries/Maven__org_eclipse_jdt_ecj_3_12_3.xml
deleted file mode 100644
index 96c4694..0000000
--- a/.idea/libraries/Maven__org_eclipse_jdt_ecj_3_12_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
deleted file mode 100644
index f58bbc1..0000000
--- a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml
deleted file mode 100644
index 78dbe45..0000000
--- a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml
deleted file mode 100644
index ce34f42..0000000
--- a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_5_2_17_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_5_2_17_Final.xml
deleted file mode 100644
index 4f3cc1a..0000000
--- a/.idea/libraries/Maven__org_hibernate_hibernate_core_5_2_17_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_2_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_2_Final.xml
deleted file mode 100644
index 1d8ce40..0000000
--- a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_2_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_10_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_10_Final.xml
deleted file mode 100644
index 1e98da0..0000000
--- a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_10_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_22_0_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_22_0_GA.xml
deleted file mode 100644
index ad65915..0000000
--- a/.idea/libraries/Maven__org_javassist_javassist_3_22_0_GA.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jboss_jandex_2_0_3_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_2_0_3_Final.xml
deleted file mode 100644
index b841e21..0000000
--- a/.idea/libraries/Maven__org_jboss_jandex_2_0_3_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml
deleted file mode 100644
index 5f7dd01..0000000
--- a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml
deleted file mode 100644
index 87cb599..0000000
--- a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml b/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml
deleted file mode 100644
index a742a6d..0000000
--- a/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mongodb_bson_3_6_4.xml b/.idea/libraries/Maven__org_mongodb_bson_3_6_4.xml
deleted file mode 100644
index 50bf633..0000000
--- a/.idea/libraries/Maven__org_mongodb_bson_3_6_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mongodb_mongodb_driver_3_6_4.xml b/.idea/libraries/Maven__org_mongodb_mongodb_driver_3_6_4.xml
deleted file mode 100644
index 95a778a..0000000
--- a/.idea/libraries/Maven__org_mongodb_mongodb_driver_3_6_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_6_4.xml b/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_6_4.xml
deleted file mode 100644
index 4eab0d2..0000000
--- a/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_6_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml
deleted file mode 100644
index af41e3b..0000000
--- a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
deleted file mode 100644
index 0bf8cf2..0000000
--- a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_16_22.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_16_22.xml
deleted file mode 100644
index 763e50d..0000000
--- a/.idea/libraries/Maven__org_projectlombok_lombok_1_16_22.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_0.xml b/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_0.xml
deleted file mode 100644
index 678f5ce..0000000
--- a/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_quartz_scheduler_quartz_jobs_2_3_0.xml b/.idea/libraries/Maven__org_quartz_scheduler_quartz_jobs_2_3_0.xml
deleted file mode 100644
index 79cda67..0000000
--- a/.idea/libraries/Maven__org_quartz_scheduler_quartz_jobs_2_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml
deleted file mode 100644
index 457c7b7..0000000
--- a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
deleted file mode 100644
index c4c54d6..0000000
--- a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml
deleted file mode 100644
index 6073e53..0000000
--- a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml
deleted file mode 100644
index 20e8163..0000000
--- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_0_4_RELEASE.xml
deleted file mode 100644
index 1b88378..0000000
--- a/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_0_4_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_0_4_RELEASE.xml
deleted file mode 100644
index 85633b0..0000000
--- a/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_0_4_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_3_RELEASE.xml
deleted file mode 100644
index c1bd1b7..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_3_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_3_RELEASE.xml
deleted file mode 100644
index aef774c..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_3_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_3_RELEASE.xml
deleted file mode 100644
index f4db168..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_3_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_0_3_RELEASE.xml
deleted file mode 100644
index a1f8d87..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_0_3_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_3_RELEASE.xml
deleted file mode 100644
index c155662..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_3_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_3_RELEASE.xml
deleted file mode 100644
index aef3a3b..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_3_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_0_3_RELEASE.xml
deleted file mode 100644
index 2345242..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_0_3_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_0_3_RELEASE.xml
deleted file mode 100644
index de4a803..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_0_3_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_3_RELEASE.xml
deleted file mode 100644
index 52f6b1b..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_3_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_3_RELEASE.xml
deleted file mode 100644
index 42841e5..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_3_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_0_3_RELEASE.xml
deleted file mode 100644
index 7258373..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_0_3_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_3_RELEASE.xml
deleted file mode 100644
index 2817f37..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_3_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_3_RELEASE.xml
deleted file mode 100644
index f6daaf6..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_3_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_3_RELEASE.xml
deleted file mode 100644
index 614aadf..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_3_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_3_RELEASE.xml
deleted file mode 100644
index b631dbd..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_3_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_3_RELEASE.xml
deleted file mode 100644
index 53d3728..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_3_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_8_RELEASE.xml
deleted file mode 100644
index b56afb7..0000000
--- a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_8_RELEASE.xml
deleted file mode 100644
index fb677d1..0000000
--- a/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_0_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_0_8_RELEASE.xml
deleted file mode 100644
index c2324f8..0000000
--- a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_0_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_mongodb_2_0_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_mongodb_2_0_8_RELEASE.xml
deleted file mode 100644
index f4fc5bc..0000000
--- a/.idea/libraries/Maven__org_springframework_data_spring_data_mongodb_2_0_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_0_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_0_8_RELEASE.xml
deleted file mode 100644
index dae62ec..0000000
--- a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_0_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
deleted file mode 100644
index fbc0452..0000000
--- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml
deleted file mode 100644
index 7e6f096..0000000
--- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_2_RELEASE.xml
deleted file mode 100644
index 1b2836b..0000000
--- a/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_0_7_RELEASE.xml
deleted file mode 100644
index 290a80e..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_aop_5_0_7_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_aspects_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aspects_5_0_7_RELEASE.xml
deleted file mode 100644
index 001bcb6..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_aspects_5_0_7_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_0_7_RELEASE.xml
deleted file mode 100644
index 6a2d57b..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_beans_5_0_7_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_0_7_RELEASE.xml
deleted file mode 100644
index 56b0f1f..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_context_5_0_7_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_7_RELEASE.xml
deleted file mode 100644
index 62ed4fa..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_7_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_0_7_RELEASE.xml
deleted file mode 100644
index 3b157db..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_core_5_0_7_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_0_7_RELEASE.xml
deleted file mode 100644
index aaef8a8..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_expression_5_0_7_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_7_RELEASE.xml
deleted file mode 100644
index b5651f7..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_7_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_7_RELEASE.xml
deleted file mode 100644
index 2b485a8..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_7_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_messaging_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_messaging_5_0_7_RELEASE.xml
deleted file mode 100644
index 4348e5e..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_messaging_5_0_7_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_5_0_7_RELEASE.xml
deleted file mode 100644
index 879f168..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_orm_5_0_7_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_oxm_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_oxm_5_0_7_RELEASE.xml
deleted file mode 100644
index 233390a..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_oxm_5_0_7_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_0_7_RELEASE.xml
deleted file mode 100644
index bc90aff..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_test_5_0_7_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_0_7_RELEASE.xml
deleted file mode 100644
index 1f348ed..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_tx_5_0_7_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_0_7_RELEASE.xml
deleted file mode 100644
index 816c219..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_web_5_0_7_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_7_RELEASE.xml
deleted file mode 100644
index d4df107..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_7_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_websocket_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_websocket_5_0_7_RELEASE.xml
deleted file mode 100644
index e6b5115..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_websocket_5_0_7_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml
deleted file mode 100644
index 474c910..0000000
--- a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml
deleted file mode 100644
index 33ccf19..0000000
--- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml b/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml
deleted file mode 100644
index 77144ff..0000000
--- a/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index d077d81..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 2041e86..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 49655e2..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,2677 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- logging
- spring-boot-starter-logging
- exclu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
- DEFINITION_ORDER
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1538274878308
-
-
- 1538274878308
-
-
-
-
-
-
-
- 1540305641918
-
-
-
- 1540305641918
-
-
- 1540305744442
-
-
-
- 1540305744442
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- MAVEN
- i3plus.core:i3plus-core-apiservice:1.0-SNAPSHOT
-
- i3plus.core:i3plus-core-apiservice:1.0-SNAPSHOT
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/com.fasterxml.jackson.core:jackson-databind:jar:2.9.6
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/com.fasterxml.jackson.core:jackson-databind:jar:2.9.6/com.fasterxml.jackson.core:jackson-annotations:jar:2.9.0
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/com.fasterxml.jackson.core:jackson-databind:jar:2.9.6/com.fasterxml.jackson.core:jackson-core:jar:2.9.6
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/i3plus.pojo:i3plus-pojo-platform:jar:1.0-SNAPSHOT
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter:jar:2.0.3.RELEASE
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter:jar:2.0.3.RELEASE/javax.annotation:javax.annotation-api:jar:1.3.2
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter:jar:2.0.3.RELEASE/org.yaml:snakeyaml:jar:1.19
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-aop:jar:2.0.3.RELEASE
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-aop:jar:2.0.3.RELEASE/org.springframework:spring-aop:jar:5.0.7.RELEASE
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-aop:jar:2.0.3.RELEASE/org.aspectj:aspectjweaver:jar:1.8.13
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-jdbc:jar:2.0.3.RELEASE
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-jdbc:jar:2.0.3.RELEASE/com.zaxxer:HikariCP:jar:2.7.9
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-jdbc:jar:2.0.3.RELEASE/org.springframework:spring-jdbc:jar:5.0.7.RELEASE
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.hibernate:hibernate-core:jar:5.2.17.Final
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.hibernate:hibernate-core:jar:5.2.17.Final/org.jboss.logging:jboss-logging:jar:3.3.2.Final
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.hibernate:hibernate-core:jar:5.2.17.Final/org.hibernate.javax.persistence:hibernate-jpa-2.1-api:jar:1.0.2.Final
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.hibernate:hibernate-core:jar:5.2.17.Final/org.javassist:javassist:jar:3.22.0-GA
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.hibernate:hibernate-core:jar:5.2.17.Final/antlr:antlr:jar:2.7.7
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.hibernate:hibernate-core:jar:5.2.17.Final/org.jboss:jandex:jar:2.0.3.Final
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.hibernate:hibernate-core:jar:5.2.17.Final/dom4j:dom4j:jar:1.6.1
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.hibernate:hibernate-core:jar:5.2.17.Final/org.hibernate.common:hibernate-commons-annotations:jar:5.0.1.Final
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/javax.transaction:javax.transaction-api:jar:1.2
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.data:spring-data-jpa:jar:2.0.8.RELEASE
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.data:spring-data-jpa:jar:2.0.8.RELEASE/org.springframework:spring-orm:jar:5.0.7.RELEASE
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.data:spring-data-jpa:jar:2.0.8.RELEASE/org.springframework:spring-tx:jar:5.0.7.RELEASE
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework:spring-aspects:jar:5.0.7.RELEASE
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/io.swagger:swagger-annotations:jar:1.5.20
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/io.swagger:swagger-models:jar:1.5.20
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/io.springfox:springfox-spi:jar:2.9.2
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/io.springfox:springfox-spi:jar:2.9.2/io.springfox:springfox-core:jar:2.9.2
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/io.springfox:springfox-spi:jar:2.9.2/io.springfox:springfox-core:jar:2.9.2/net.bytebuddy:byte-buddy:jar:1.7.11
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/io.springfox:springfox-schema:jar:2.9.2
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/io.springfox:springfox-swagger-common:jar:2.9.2
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/io.springfox:springfox-spring-web:jar:2.9.2
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/com.google.guava:guava:jar:20.0
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/com.fasterxml:classmate:jar:1.3.4
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/org.slf4j:slf4j-api:jar:1.7.25
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/org.springframework.plugin:spring-plugin-core:jar:1.2.0.RELEASE
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/org.springframework.plugin:spring-plugin-metadata:jar:1.2.0.RELEASE
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/org.mapstruct:mapstruct:jar:1.2.0.Final
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger-ui:jar:2.9.2
- i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.projectlombok:lombok:jar:1.16.22
- i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT
- i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0
- i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-lang:jar:1.4.0
- i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-cache:jar:1.4.0
- i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-crypto-hash:jar:1.4.0
- i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-crypto-hash:jar:1.4.0/org.apache.shiro:shiro-crypto-core:jar:1.4.0
- i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-crypto-cipher:jar:1.4.0
- i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-config-core:jar:1.4.0
- i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-config-ogdl:jar:1.4.0
- i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-config-ogdl:jar:1.4.0/commons-beanutils:commons-beanutils:jar:1.9.3
- i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-config-ogdl:jar:1.4.0/commons-beanutils:commons-beanutils:jar:1.9.3/commons-collections:commons-collections:jar:3.2.2
- i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-event:jar:1.4.0
- i3plus.pojo:i3plus-pojo-wms:jar:1.0-SNAPSHOT
- i3plus.core:i3plus-core-api:jar:1.0-SNAPSHOT
- i3plus.core:i3plus-core-api:jar:1.0-SNAPSHOT/i3plus.pojo:i3plus-pojo-mes:jar:1.0-SNAPSHOT
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-json:jar:2.0.3.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-json:jar:2.0.3.RELEASE/com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar:2.9.6
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-json:jar:2.0.3.RELEASE/com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.9.6
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-json:jar:2.0.3.RELEASE/com.fasterxml.jackson.module:jackson-module-parameter-names:jar:2.9.6
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-tomcat:jar:2.0.3.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-tomcat:jar:2.0.3.RELEASE/org.apache.tomcat.embed:tomcat-embed-websocket:jar:8.5.31
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.hibernate.validator:hibernate-validator:jar:6.0.10.Final
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.hibernate.validator:hibernate-validator:jar:6.0.10.Final/javax.validation:validation-api:jar:2.0.1.Final
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.springframework:spring-web:jar:5.0.7.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.springframework:spring-webmvc:jar:5.0.7.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.springframework:spring-webmvc:jar:5.0.7.RELEASE/org.springframework:spring-expression:jar:5.0.7.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-autoconfigure:jar:2.0.3.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-autoconfigure:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot:jar:2.0.3.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-log4j2:jar:2.0.3.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-log4j2:jar:2.0.3.RELEASE/org.apache.logging.log4j:log4j-slf4j-impl:jar:2.10.0
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-log4j2:jar:2.0.3.RELEASE/org.apache.logging.log4j:log4j-slf4j-impl:jar:2.10.0/org.apache.logging.log4j:log4j-api:jar:2.10.0
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-log4j2:jar:2.0.3.RELEASE/org.apache.logging.log4j:log4j-core:jar:2.10.0
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-log4j2:jar:2.0.3.RELEASE/org.apache.logging.log4j:log4j-jul:jar:2.10.0
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-log4j2:jar:2.0.3.RELEASE/org.slf4j:jul-to-slf4j:jar:1.7.25
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework:spring-websocket:jar:5.0.7.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework:spring-websocket:jar:5.0.7.RELEASE/org.springframework:spring-context:jar:5.0.7.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework:spring-websocket:jar:5.0.7.RELEASE/org.springframework:spring-core:jar:5.0.7.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework:spring-websocket:jar:5.0.7.RELEASE/org.springframework:spring-core:jar:5.0.7.RELEASE/org.springframework:spring-jcl:jar:5.0.7.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.data:spring-data-commons:jar:2.0.8.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.data:spring-data-commons:jar:2.0.8.RELEASE/org.springframework:spring-beans:jar:5.0.7.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/org.springframework.data:spring-data-redis:jar:2.0.8.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/org.springframework.data:spring-data-redis:jar:2.0.8.RELEASE/org.springframework.data:spring-data-keyvalue:jar:2.0.8.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/org.springframework.data:spring-data-redis:jar:2.0.8.RELEASE/org.springframework:spring-oxm:jar:5.0.7.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/io.lettuce:lettuce-core:jar:5.0.4.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/io.lettuce:lettuce-core:jar:5.0.4.RELEASE/io.projectreactor:reactor-core:jar:3.1.8.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/io.lettuce:lettuce-core:jar:5.0.4.RELEASE/io.projectreactor:reactor-core:jar:3.1.8.RELEASE/org.reactivestreams:reactive-streams:jar:1.0.2
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/io.lettuce:lettuce-core:jar:5.0.4.RELEASE/io.netty:netty-common:jar:4.1.25.Final
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/io.lettuce:lettuce-core:jar:5.0.4.RELEASE/io.netty:netty-transport:jar:4.1.25.Final
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/io.lettuce:lettuce-core:jar:5.0.4.RELEASE/io.netty:netty-transport:jar:4.1.25.Final/io.netty:netty-buffer:jar:4.1.25.Final
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/io.lettuce:lettuce-core:jar:5.0.4.RELEASE/io.netty:netty-transport:jar:4.1.25.Final/io.netty:netty-resolver:jar:4.1.25.Final
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/io.lettuce:lettuce-core:jar:5.0.4.RELEASE/io.netty:netty-handler:jar:4.1.25.Final
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/io.lettuce:lettuce-core:jar:5.0.4.RELEASE/io.netty:netty-handler:jar:4.1.25.Final/io.netty:netty-codec:jar:4.1.25.Final
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/redis.clients:jedis:jar:2.9.0
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/redis.clients:jedis:jar:2.9.0/org.apache.commons:commons-pool2:jar:2.5.0
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-amqp:jar:2.0.3.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-amqp:jar:2.0.3.RELEASE/org.springframework:spring-messaging:jar:5.0.7.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-amqp:jar:2.0.3.RELEASE/org.springframework.amqp:spring-rabbit:jar:2.0.4.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-amqp:jar:2.0.3.RELEASE/org.springframework.amqp:spring-rabbit:jar:2.0.4.RELEASE/org.springframework.amqp:spring-amqp:jar:2.0.4.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-amqp:jar:2.0.3.RELEASE/org.springframework.amqp:spring-rabbit:jar:2.0.4.RELEASE/com.rabbitmq:amqp-client:jar:5.1.2
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-amqp:jar:2.0.3.RELEASE/org.springframework.amqp:spring-rabbit:jar:2.0.4.RELEASE/org.springframework.retry:spring-retry:jar:1.2.2.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.csource:fastdfs-client-java:jar:1.27
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.quartz-scheduler:quartz:jar:2.3.0
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.quartz-scheduler:quartz:jar:2.3.0/com.mchange:mchange-commons-java:jar:0.2.11
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.quartz-scheduler:quartz-jobs:jar:2.3.0
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework:spring-context-support:jar:5.0.7.RELEASE
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-spring:jar:1.4.0
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-web:jar:1.4.0
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-ehcache:jar:1.4.0
- impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/net.sf.ehcache:ehcache-core:jar:2.6.11
- i3plus.platform:i3plus-platform-common:jar:1.0-SNAPSHOT
- i3plus.platform:i3plus-platform-common:jar:1.0-SNAPSHOT/org.apache.tomcat.embed:tomcat-embed-core:jar:8.5.31
- i3plus.platform:i3plus-platform-common:jar:1.0-SNAPSHOT/org.apache.tomcat.embed:tomcat-embed-core:jar:8.5.31/org.apache.tomcat:tomcat-annotations-api:jar:8.5.31
- i3plus.platform:i3plus-platform-common:jar:1.0-SNAPSHOT/org.apache.httpcomponents:httpclient:jar:4.5.5
- i3plus.platform:i3plus-platform-common:jar:1.0-SNAPSHOT/org.apache.httpcomponents:httpclient:jar:4.5.5/org.apache.httpcomponents:httpcore:jar:4.4.9
- i3plus.platform:i3plus-platform-common:jar:1.0-SNAPSHOT/org.apache.httpcomponents:httpclient:jar:4.5.5/commons-codec:commons-codec:jar:1.11
- mysql:mysql-connector-java:jar:5.1.39
- org.apache.tomcat.embed:tomcat-embed-jasper:jar:8.5.31
- org.apache.tomcat.embed:tomcat-embed-jasper:jar:8.5.31/org.apache.tomcat.embed:tomcat-embed-el:jar:8.5.31
- org.apache.tomcat.embed:tomcat-embed-jasper:jar:8.5.31/org.eclipse.jdt:ecj:jar:3.12.3
- org.apache.commons:commons-lang3:jar:3.8.1
- com.alibaba:fastjson:jar:1.2.8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- All
- All
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 32jdk1.8
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/i3plus-core.iml b/i3plus-core.iml
deleted file mode 100644
index a0d4a1e..0000000
--- a/i3plus-core.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/i3plus-core-api/i3plus-core-api.iml b/modules/i3plus-core-api/i3plus-core-api.iml
deleted file mode 100644
index b27d1a0..0000000
--- a/modules/i3plus-core-api/i3plus-core-api.iml
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java
index 00bb5a7..83f4827 100644
--- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java
+++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java
@@ -2,9 +2,7 @@ package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
-import cn.estsh.i3plus.pojo.platform.bean.SysUser;
-import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
+import cn.estsh.i3plus.pojo.platform.bean.*;
import io.swagger.annotations.ApiOperation;
import java.util.List;
@@ -97,4 +95,36 @@ public interface ISysUserInfoService {
@ApiOperation(value = "查询用户信息",notes = "根据复杂查询条件查询用户信息(分页信息)")
ListPager querySysUserInfo(SysUserInfo userInfo, Pager pager);
+ /**
+ * 用户唯一校验
+ * @param userInfo
+ */
+ @ApiOperation(value = "用户唯一校验",notes = "校验用户信息唯一性")
+ void checkSysUserInfoOnly(SysUserInfo userInfo);
+
+ /**
+ * 查询用户部门关系
+ * @param userId
+ * @return
+ */
+ @ApiOperation(value = "关系查询-用户部门",notes = "查询用户部门关系")
+ List findRefUserDepartmentByUserId(Long userId);
+
+ /**
+ * 查询用户岗位关系
+ * @param userId
+ * @return
+ */
+ @ApiOperation(value = "关系查询-用户岗位",notes = "查询用户岗位关系")
+ List findSysRefUserPositionByUserId(Long userId);
+
+ /**
+ * 用户唯一校验 用户工号
+ * @param no
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "用户唯一校验 用户工号",notes = "用户唯一校验 用户工号")
+ boolean checkUserInfoByUserEmpNo(String no,long id);
+
}
diff --git a/modules/i3plus-core-apiservice/i3plus-core-apiservice.iml b/modules/i3plus-core-apiservice/i3plus-core-apiservice.iml
deleted file mode 100644
index 6628966..0000000
--- a/modules/i3plus-core-apiservice/i3plus-core-apiservice.iml
+++ /dev/null
@@ -1,294 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java
index 9c3f2ba..1482bfa 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java
@@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysDepartmentService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysPositionService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService;
import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.SysOrganizeService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
@@ -11,9 +12,7 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
-import cn.estsh.i3plus.pojo.platform.bean.SysDepartment;
-import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
+import cn.estsh.i3plus.pojo.platform.bean.*;
import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
@@ -57,6 +56,9 @@ public class SysUserInfoController extends CoreBaseController{
@Autowired
private ISysFileService sysFileService;
+ @Autowired
+ private ISysPositionService sysPositionService;
+
@PostMapping(value="/insert")
@ApiOperation(value="添加用户信息",notes="返回内容添加用户信息")
public ResultBean insertSysUserInfo(SysUserInfo userInfo){
@@ -64,33 +66,24 @@ public class SysUserInfoController extends CoreBaseController{
//登陆用户
SessionUser user = AuthUtil.getSessionUser();
- //条件验证
- ValidatorBean.beginValid(userInfo)
- .notNull("name",userInfo.getName())
- .notNull("userEmpNo",userInfo.getUserEmpNo())
- .checkNotZero("departmentId",userInfo.getDepartmentId())
- .checkNotZero("departmentIdList",userInfo.getDepartmentIdList())
- .checkNotZero("positionId",userInfo.getPositionId());
+ checkSysUserInfo(userInfo,false);
ConvertBean.modelInitialize(userInfo,user);
userInfo.setUserInfoStatus(CommonEnumUtil.USER_STATUS.ENABLE.getValue());
- SysUserInfo pos = sysUserInfoService.insertSysUserInfo(userInfo);
- sysUserInfoService.refreshRefUserDepartment(pos.getId(),
+ SysUserInfo info = sysUserInfoService.insertSysUserInfo(userInfo);
+
+ sysUserInfoService.refreshRefUserDepartment(info.getId(),
StringTool.getArrayLong(userInfo.getDepartmentIdList()),
user.getUserName());
- sysUserInfoService.refreshRefUserPosition(pos.getId(),
- new Long[]{userInfo.getPositionId()},
+ sysUserInfoService.refreshRefUserPosition(info.getId(),
+ StringTool.getArrayLong(userInfo.getPositionIdList()),
user.getUserName());
- SysDepartment department = departmentService.getSysDepartmentById(userInfo.getDepartmentId());
- if(department != null){
- sysUserInfoService.refreshRefUserOrganize(pos.getId(),
- department.getOrganizeId(),user.getUserName());
- }
+ sysUserInfoService.refreshRefUserOrganize(info.getId(), userInfo.getDepartment().getOrganizeId(),user.getUserName());
- return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(pos);
+ return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(info);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + ":{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep);
@@ -107,13 +100,7 @@ public class SysUserInfoController extends CoreBaseController{
//登陆用户
SessionUser user = AuthUtil.getSessionUser();
- //条件验证
- ValidatorBean.beginValid(userInfo)
- .notNull("id",userInfo.getId())
- .notNull("name",userInfo.getName())
- .notNull("userEmpNo",userInfo.getUserEmpNo())
- .checkNotZero("departmentId",userInfo.getDepartmentId())
- .checkNotZero("positionId",userInfo.getPositionId());
+ checkSysUserInfo(userInfo,true);
//修改初始化
ConvertBean.modelUpdate(userInfo,user);
@@ -121,16 +108,14 @@ public class SysUserInfoController extends CoreBaseController{
sysUserInfoService.updateSysUserInfo(userInfo);
sysUserInfoService.refreshRefUserDepartment(userInfo.getId(),
- StringTool.getArrayLong(userInfo.getDepartmentIdList()), user.getUserName());
+ StringTool.getArrayLong(userInfo.getDepartmentIdList()),
+ user.getUserName());
sysUserInfoService.refreshRefUserPosition(userInfo.getId(),
- new Long[]{userInfo.getPositionId()}, user.getUserName());
+ StringTool.getArrayLong(userInfo.getPositionIdList()),
+ user.getUserName());
- SysDepartment department = departmentService.getSysDepartmentById(userInfo.getDepartmentId());
- if(department != null){
- sysUserInfoService.refreshRefUserOrganize(userInfo.getId(),
- department.getOrganizeId(),user.getUserName());
- }
+ sysUserInfoService.refreshRefUserOrganize(userInfo.getId(), userInfo.getDepartment().getOrganizeId(),user.getUserName());
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
@@ -238,4 +223,90 @@ public class SysUserInfoController extends CoreBaseController{
}
}
+ @GetMapping(value = "/find-ref-department/{userId}")
+ @ApiOperation(value = "查询角色的所有角色权限关系", notes = "查询角色的所有角色权限关系")
+ public ResultBean findRefDepartment(@PathVariable("userId") String userId) {
+ try {
+ ValidatorBean.checkNotNull(userId, "用户 id 不能为空");
+ List list = sysUserInfoService.findRefUserDepartmentByUserId(Long.parseLong(userId));
+ return ResultBean.success("操作成功")
+ .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
+ .setResultList(list);
+ } catch (ImppBusiException busExcep) {
+ LOGGER.error(busExcep.getErrorMsg() + ":{}", busExcep.getErrorDetail(), busExcep);
+ return ResultBean.fail(busExcep);
+ } catch (Exception e) {
+ LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + ":{}", e.getMessage(), e);
+ return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+ }
+ }
+
+ @GetMapping(value = "/find-ref-position/{userId}")
+ @ApiOperation(value = "查询角色的所有角色权限关系", notes = "查询角色的所有角色权限关系")
+ public ResultBean findRefPosition(@PathVariable("userId") String userId) {
+ try {
+ ValidatorBean.checkNotNull(userId, "用户 id 不能为空");
+ List list = sysUserInfoService.findSysRefUserPositionByUserId(Long.parseLong(userId));
+ return ResultBean.success("操作成功")
+ .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
+ .setResultList(list);
+ } catch (ImppBusiException busExcep) {
+ LOGGER.error(busExcep.getErrorMsg() + ":{}", busExcep.getErrorDetail(), busExcep);
+ return ResultBean.fail(busExcep);
+ } catch (Exception e) {
+ LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + ":{}", e.getMessage(), e);
+ return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+ }
+ }
+
+ /**
+ * 用户唯一信息校验
+ * @param userInfo
+ * @param isId 是否检查ID 存在
+ */
+ private void checkSysUserInfo(SysUserInfo userInfo,boolean isId){
+
+ try{
+ //条件验证
+ ValidatorBean.beginValid(userInfo)
+ .notNull("name",userInfo.getName())
+ .notNull("userEmpNo",userInfo.getUserEmpNo())
+ .checkNotZero("departmentId",userInfo.getDepartmentId())
+ .checkNotZero("departmentIdList",userInfo.getDepartmentIdList())
+ .checkNotZero("positionId",userInfo.getPositionId());
+ if(isId){
+ ValidatorBean.beginValid(userInfo)
+ .notNull("id",userInfo.getId());
+ }
+
+ SysDepartment department = departmentService.getSysDepartmentById(userInfo.getDepartmentId());
+ if(department == null){
+ throw ImppExceptionBuilder.newInstance()
+ .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+ .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+ .setErrorDetail("主部门信息不存在。")
+ .build();
+ }
+
+ SysPosition position = sysPositionService.getSysPositionById(userInfo.getPositionId());
+ if(position == null){
+ throw ImppExceptionBuilder.newInstance()
+ .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+ .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+ .setErrorDetail("主岗位信息不存在。")
+ .build();
+ }
+
+ sysUserInfoService.checkSysUserInfoOnly(userInfo);
+
+ userInfo.setDepartmentNameRdd(department.getName());
+ userInfo.setPositionNameRdd(position.getName());
+ userInfo.setDepartment(department);
+ userInfo.setPosition(position);
+ }catch(ImppBusiException busExcep){
+ LOGGER.error(busExcep.getErrorMsg() + ":{}",busExcep.getErrorDetail(),busExcep);
+ }catch(Exception e){
+ LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + ":{}",e.getMessage(),e);
+ }
+ }
}
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java
index 256cb42..f39319d 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java
@@ -13,6 +13,7 @@ import cn.estsh.i3plus.pojo.platform.repository.*;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
+import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -103,7 +104,7 @@ public class SysUserInfoService implements ISysUserInfoService {
nameList.add(department.getName());
}
- userInfo.setDepartmentNameRdd(String.join(",",nameList));
+ userInfo.setDepartmentNamesRdd(String.join(",",nameList));
refUserDepartmentRDao.saveAll(list);
sysUserInfoRDao.save(userInfo);
@@ -151,7 +152,7 @@ public class SysUserInfoService implements ISysUserInfoService {
nameList.add(position.getName());
}
- userInfo.setPositionNameRdd(String.join(",",nameList));
+ userInfo.setPositionNamesRdd(String.join(",",nameList));
refUserPositionRDao.saveAll(list);
sysUserInfoRDao.save(userInfo);
@@ -227,4 +228,47 @@ public class SysUserInfoService implements ISysUserInfoService {
return new ListPager(sysUserInfoRDao.findByHqlWherePage(hqlPack + userInfo.orderBy(),pager),pager);
}
}
+
+ @Override
+ @ApiOperation(value = "关系查询-用户部门",notes = "查询用户部门关系")
+ public List findRefUserDepartmentByUserId(Long userId) {
+ return refUserDepartmentRDao.findByProperty("userId",userId);
+ }
+
+ @Override
+ @ApiOperation(value = "关系查询-用户岗位",notes = "查询用户岗位关系")
+ public List findSysRefUserPositionByUserId(Long userId) {
+ return refUserPositionRDao.findByProperty("userId",userId);
+ }
+
+ @Override
+ @ApiOperation(value = "用户唯一校验",notes = "校验用户信息唯一性")
+ public void checkSysUserInfoOnly(SysUserInfo userInfo) {
+ if(userInfo != null){
+ // 登录名唯一教研
+ if(!checkUserInfoByUserEmpNo(userInfo.getUserEmpNo(), userInfo.getId() == null ? 0 : userInfo.getId())){
+ throw ImppExceptionBuilder.newInstance()
+ .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+ .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
+ .setErrorDetail("工号已存在")
+ .setErrorSolution("请重新输入工号")
+ .build();
+ }
+ }
+ }
+
+ @Override
+ @ApiOperation(value = "用户唯一校验 用户工号",notes = "用户唯一校验 用户工号")
+ public boolean checkUserInfoByUserEmpNo(String no, long id) {
+ int count;
+ if(id > 0){
+ StringBuffer sw = new StringBuffer();
+ HqlPack.getStringEqualPack(no,"userEmpNo",sw);
+ HqlPack.getNumNOEqualPack(id,"id",sw);
+ count = sysUserInfoRDao.findByHqlWhereCount(sw.toString());
+ }else{
+ count = sysUserInfoRDao.findByPropertyCount("userEmpNo",no);
+ }
+ return count <= 0 ;
+ }
}
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java
index 7bb481e..9b3a663 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java
@@ -9,6 +9,7 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.base.shirotoken.UserToken;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.platform.bean.*;
@@ -18,6 +19,7 @@ import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.CredentialsException;
import org.apache.shiro.authc.UnknownAccountException;
@@ -430,7 +432,7 @@ public class SysUserService implements ISysUserService {
packSysUserDepartment(sessionUser,userInfo); //封装用户部门信息
packSysUserPosition(sessionUser,userInfo); //封装用户岗位信息
- packSysUserOrganize(sessionUser,userInfo); //封装用户组织信息
+ packSysUserOrganize(userInfo); //封装用户组织信息
userInfo.setUser(user);
sessionUser.setUserName(userInfo.getName());
@@ -522,11 +524,10 @@ public class SysUserService implements ISysUserService {
/**
* 封装用户 组织信息封装
- * @param sessionUser
* @param userInfo
* @return
*/
- public void packSysUserOrganize(SessionUser sessionUser, SysUserInfo userInfo){
+ public void packSysUserOrganize(SysUserInfo userInfo){
try {
LOGGER.debug("平台用户 SYS_USER user id :{}", userInfo.getId());
userInfo.setOrganize(organizeRDao.getById(userInfo.getOrganizeId()));
@@ -538,8 +539,8 @@ public class SysUserService implements ISysUserService {
ids[i] = departmentList.get(i).getOrganizeId();
}
- String hqlWhere = CoreHqlPack.packHqlIds("id", ids);
- List organizeList = organizeRDao.findByHqlWhere(hqlWhere);
+ String strWhere = CoreHqlPack.packHqlSysOrganize(ids, ImppEnumUtil.ORGANIZE_YTPE.TYPE_FACTORY.getValue());
+ List organizeList = organizeRDao.findByHqlWhere(strWhere);
userInfo.setOrganizeList(organizeList);
}
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java
index 31aa9a6..77ff2a2 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java
@@ -1,6 +1,8 @@
package cn.estsh.i3plus.core.apiservice.websocket;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
index 73f944e..214ecea 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
@@ -13,11 +13,6 @@ impp.cluster.regist.center=http://reg.estsh.com/eureka/
#多注册中心
#impp.cluster.regist.center=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/
-################ 功能配置2 ################
-#是否允许前端跨域提交impp.web.cross.hosts
-impp.web.cross = true
-
-################ 授权过滤配置 ################
#用户登陆路径
filter.shiro.user.loginuri = /login
#系统管理员登陆路径
diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestDepartmentService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestDepartmentService.java
index 3c5aa24..c330bce 100644
--- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestDepartmentService.java
+++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestDepartmentService.java
@@ -34,7 +34,7 @@
// for(int i = 0 ; i < 50 ; i++ ){
// Department obj = new Department();
// obj.setName("Junit Test " + i);
-// obj.setDepartmentCode("TEST_JUNIT " + i);
+// obj.setDepartmentCode("DEV_JUNIT " + i);
// obj.setParentId(1057165194242953216L);
// obj.setOrganizeId(1057163974900060160L);
// obj = departmentService.insertDepartment(obj);
diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java
index dd6f15e..55718e7 100644
--- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java
+++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java
@@ -141,6 +141,7 @@ public class TestExcelPermission extends TestBase {
obj.setUserInfoId(Long.parseLong(row.getCell(5).getStringCellValue()));
obj.setUserName(row.getCell(6).getStringCellValue());
obj.setIsValid(1);
+ obj.setUserStatus(1);
obj.setUserType(1);
obj.setUserLoginNum(0);
diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelSysConfig.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelSysConfig.java
index 69ad6a8..43ec295 100644
--- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelSysConfig.java
+++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelSysConfig.java
@@ -1,207 +1,207 @@
-//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
-//
-//import cn.estsh.i3plus.pojo.platform.bean.*;
-//import cn.estsh.i3plus.pojo.platform.repository.SysConfigRepository;
-//import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository;
-//import cn.estsh.i3plus.pojo.platform.repository.SysLocaleLanguageRepository;
-//import cn.estsh.i3plus.pojo.platform.repository.SysLocaleResourceRepository;
-//import org.apache.poi.ss.usermodel.Row;
-//import org.apache.poi.xssf.usermodel.XSSFSheet;
-//import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-//import org.junit.Test;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.beans.factory.annotation.Autowired;
-//
-//import java.io.InputStream;
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * @Description :
-// * @Reference :
-// * @Author : yunhao
-// * @CreateDate : 2018-11-22 11:01
-// * @Modify:
-// **/
-//public class TestExcelSysConfig extends TestBase {
-//
-// public static final Logger LOGGER = LoggerFactory.getLogger(TestExcelPermission.class);
-//
-// // 文件路径
-// public static final String PATH_NAME = "init/sys-config.xlsx";
-// // 权限Sheet 名称
-// public static final String SHEET_SYS_CONFIG = "sys-config";
-// public static final String SHEET_DICTIONARY = "dictionary";
-// public static final String SHEET_LANGUAGE = "language";
-// public static final String SHEET_RESOURCE = "resource";
-//
-// @Autowired
-// private SysConfigRepository sysConfigRDao;
-// @Autowired
-// private SysDictionaryRepository sysDictionaryRDao;
-// @Autowired
-// private SysLocaleLanguageRepository sysLocaleLanguageRDao;
-// @Autowired
-// private SysLocaleResourceRepository sysLocaleResourceRDao;
-//
-// @Test
-// public void testInit() throws Exception {
-// XSSFWorkbook workbook = getWorkbook(PATH_NAME);
-// if(workbook != null){
-// XSSFSheet sheetSysConfig = workbook.getSheet(SHEET_SYS_CONFIG);
-// XSSFSheet sheetDictionary = workbook.getSheet(SHEET_DICTIONARY);
-// XSSFSheet sheetLanguage = workbook.getSheet(SHEET_LANGUAGE);
-// XSSFSheet sheetResource = workbook.getSheet(SHEET_RESOURCE);
-//
-// List sysConfigList = getSysConfig(sheetSysConfig);
-// List sysDictionaryList = getSysDictionary(sheetDictionary);
-// List sysLocaleLanguageList = getSysLocaleLanguage(sheetLanguage);
-// List sysLocaleResourceList= getSysLocaleResource(sheetResource);
-//
-// LOGGER.info("System Init SysConfig Size:{}",sysConfigList.size());
-// LOGGER.info("System Init SysDictionary Size:{}",sysDictionaryList.size());
-// LOGGER.info("System Init SysLocaleLanguage Size:{}",sysLocaleLanguageList.size());
-// LOGGER.info("System Init SysLocaleResource Size:{}",sysLocaleResourceList.size());
-//
-// sysConfigRDao.saveAll(sysConfigList);
-// sysDictionaryRDao.saveAll(sysDictionaryList);
-// sysLocaleLanguageRDao.saveAll(sysLocaleLanguageList);
-// sysLocaleResourceRDao.saveAll(sysLocaleResourceList);
-// }
-// }
-//
-// public List getSysConfig(XSSFSheet sheet){
-// List result = new ArrayList<>();
-// if(sheet != null){
-// if(sheet.getLastRowNum() >= 1){
-// SysConfig obj = null;
-// for (int i = 1; i <= sheet.getLastRowNum(); i++) {
-// try {
-// Row row = sheet.getRow(i);//获取索引为i的行,以0开始
-// if(row.getCell(0).toString().trim().length() > 0){
-// obj = new SysConfig();
-// obj.setId(Long.parseLong(row.getCell(0).getStringCellValue()));
-// obj.setName(row.getCell(1).getStringCellValue());
-// obj.setConfigType(Integer.valueOf(row.getCell(2).getStringCellValue()));
-// obj.setConfigCode(row.getCell(3).getStringCellValue());
-// obj.setConfigValue(row.getCell(4).getStringCellValue());
-// obj.setConfigDescription(row.getCell(5).getStringCellValue());
-// obj.setIsValid(1);
-//
-// result.add(obj);
-// }
-// }catch (Exception e){
-// LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i);
-// }
-// }
-// }
-// }
-// return result;
-// }
-//
-// public List getSysDictionary(XSSFSheet sheet){
-// List result = new ArrayList<>();
-// if(sheet != null){
-// if(sheet.getLastRowNum() >= 1){
-// SysDictionary obj = null;
-// for (int i = 1; i <= sheet.getLastRowNum(); i++) {
-// try {
-// Row row = sheet.getRow(i);//获取索引为i的行,以0开始
-// if(row.getCell(0).toString().trim().length() > 0){
-// obj = new SysDictionary();
-// obj.setId(Long.parseLong(row.getCell(0).getStringCellValue()));
-// obj.setName(row.getCell(1).getStringCellValue());
-// obj.setDictionaryCode(row.getCell(2).getStringCellValue());
-// obj.setParentId(Long.valueOf(row.getCell(3).getStringCellValue()));
-// obj.setParentNameRdd(row.getCell(4).getStringCellValue());
-// obj.setParentCodeRdd(row.getCell(5).getStringCellValue());
-// obj.setDictionaryValue(row.getCell(6).getStringCellValue());
-// obj.setDictionarySort(Integer.valueOf(row.getCell(7).getStringCellValue()));
-// obj.setDictionaryDescription(row.getCell(8).getStringCellValue());
-// obj.setIsValid(1);
-//
-// result.add(obj);
-// }
-// }catch (Exception e){
-// LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i);
-// }
-// }
-// }
-// }
-// return result;
-// }
-//
-// public List getSysLocaleLanguage(XSSFSheet sheet){
-// List result = new ArrayList<>();
-// if(sheet != null){
-// if(sheet.getLastRowNum() >= 1){
-// SysLocaleLanguage obj = null;
-// for (int i = 1; i <= sheet.getLastRowNum(); i++) {
-// try {
-// Row row = sheet.getRow(i);//获取索引为i的行,以0开始
-// if(row.getCell(0).toString().trim().length() > 0){
-// obj = new SysLocaleLanguage();
-// obj.setId(Long.parseLong(row.getCell(0).getStringCellValue()));
-// obj.setLanguageName(row.getCell(1).getStringCellValue());
-// obj.setLanguageCode(row.getCell(2).getStringCellValue());
-// obj.setLanguageSort(Integer.valueOf(row.getCell(3).getStringCellValue()));
-// obj.setIsDefault(Integer.valueOf(row.getCell(4).getStringCellValue()));
-// obj.setLanguageStatus(Integer.valueOf(row.getCell(5).getStringCellValue()));
-// obj.setIsValid(1);
-//
-// result.add(obj);
-// }
-// }catch (Exception e){
-// LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i);
-// }
-// }
-// }
-// }
-// return result;
-// }
-//
-// public List getSysLocaleResource(XSSFSheet sheet){
-// List result = new ArrayList<>();
-// if(sheet != null){
-// if(sheet.getLastRowNum() >= 1){
-// SysLocaleResource obj = null;
-// for (int i = 1; i <= sheet.getLastRowNum(); i++) {
-// try {
-// Row row = sheet.getRow(i);//获取索引为i的行,以0开始
-// if(row.getCell(0).toString().trim().length() > 0){
-// obj = new SysLocaleResource();
-// obj.setId(Long.parseLong(row.getCell(0).getStringCellValue()));
-// obj.setResourceType(Integer.valueOf(row.getCell(1).getStringCellValue()));
-// obj.setLanguageCode(row.getCell(2).getStringCellValue());
-// obj.setLanguageNameRdd(row.getCell(3).getStringCellValue());
-// obj.setResourceKey(row.getCell(4).getStringCellValue());
-// obj.setResourceValue(row.getCell(5).getStringCellValue());
-// obj.setIsSystem(Integer.valueOf(row.getCell(6).getStringCellValue()));
-// obj.setIsValid(1);
-//
-// result.add(obj);
-// }
-// }catch (Exception e){
-// LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i);
-// }
-// }
-// }
-// }
-// return result;
-// }
-//
-//
-// public XSSFWorkbook getWorkbook(String pathName){
-// try {
-// InputStream in = TestExcelPermission.class.getClassLoader().getResourceAsStream(pathName);
-// XSSFWorkbook workbook = new XSSFWorkbook(in);
-// return workbook;
-// }catch (Exception e){
-// LOGGER.error(" System Init Sys Data Excel Error file path {} error message :{}",pathName,e.getMessage());
-// e.getMessage();
-// return null;
-// }
-// }
-//
-//}
+package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
+
+import cn.estsh.i3plus.pojo.platform.bean.*;
+import cn.estsh.i3plus.pojo.platform.repository.SysConfigRepository;
+import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository;
+import cn.estsh.i3plus.pojo.platform.repository.SysLocaleLanguageRepository;
+import cn.estsh.i3plus.pojo.platform.repository.SysLocaleResourceRepository;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2018-11-22 11:01
+ * @Modify:
+ **/
+public class TestExcelSysConfig extends TestBase {
+
+ public static final Logger LOGGER = LoggerFactory.getLogger(TestExcelPermission.class);
+
+ // 文件路径
+ public static final String PATH_NAME = "init/sys-config.xlsx";
+ // 权限Sheet 名称
+ public static final String SHEET_SYS_CONFIG = "sys-config";
+ public static final String SHEET_DICTIONARY = "dictionary";
+ public static final String SHEET_LANGUAGE = "language";
+ public static final String SHEET_RESOURCE = "resource";
+
+ @Autowired
+ private SysConfigRepository sysConfigRDao;
+ @Autowired
+ private SysDictionaryRepository sysDictionaryRDao;
+ @Autowired
+ private SysLocaleLanguageRepository sysLocaleLanguageRDao;
+ @Autowired
+ private SysLocaleResourceRepository sysLocaleResourceRDao;
+
+ @Test
+ public void testInit() throws Exception {
+ XSSFWorkbook workbook = getWorkbook(PATH_NAME);
+ if(workbook != null){
+ XSSFSheet sheetSysConfig = workbook.getSheet(SHEET_SYS_CONFIG);
+ XSSFSheet sheetDictionary = workbook.getSheet(SHEET_DICTIONARY);
+ XSSFSheet sheetLanguage = workbook.getSheet(SHEET_LANGUAGE);
+ XSSFSheet sheetResource = workbook.getSheet(SHEET_RESOURCE);
+
+ List sysConfigList = getSysConfig(sheetSysConfig);
+ List sysDictionaryList = getSysDictionary(sheetDictionary);
+ List sysLocaleLanguageList = getSysLocaleLanguage(sheetLanguage);
+ List sysLocaleResourceList= getSysLocaleResource(sheetResource);
+
+ LOGGER.info("System Init SysConfig Size:{}",sysConfigList.size());
+ LOGGER.info("System Init SysDictionary Size:{}",sysDictionaryList.size());
+ LOGGER.info("System Init SysLocaleLanguage Size:{}",sysLocaleLanguageList.size());
+ LOGGER.info("System Init SysLocaleResource Size:{}",sysLocaleResourceList.size());
+
+ sysConfigRDao.saveAll(sysConfigList);
+ sysDictionaryRDao.saveAll(sysDictionaryList);
+ sysLocaleLanguageRDao.saveAll(sysLocaleLanguageList);
+ sysLocaleResourceRDao.saveAll(sysLocaleResourceList);
+ }
+ }
+
+ public List getSysConfig(XSSFSheet sheet){
+ List result = new ArrayList<>();
+ if(sheet != null){
+ if(sheet.getLastRowNum() >= 1){
+ SysConfig obj = null;
+ for (int i = 1; i <= sheet.getLastRowNum(); i++) {
+ try {
+ Row row = sheet.getRow(i);//获取索引为i的行,以0开始
+ if(row.getCell(0).toString().trim().length() > 0){
+ obj = new SysConfig();
+ obj.setId(Long.parseLong(row.getCell(0).getStringCellValue()));
+ obj.setName(row.getCell(1).getStringCellValue());
+ obj.setConfigType(Integer.valueOf(row.getCell(2).getStringCellValue()));
+ obj.setConfigCode(row.getCell(3).getStringCellValue());
+ obj.setConfigValue(row.getCell(4).getStringCellValue());
+ obj.setConfigDescription(row.getCell(5).getStringCellValue());
+ obj.setIsValid(1);
+
+ result.add(obj);
+ }
+ }catch (Exception e){
+ LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i);
+ }
+ }
+ }
+ }
+ return result;
+ }
+
+ public List getSysDictionary(XSSFSheet sheet){
+ List result = new ArrayList<>();
+ if(sheet != null){
+ if(sheet.getLastRowNum() >= 1){
+ SysDictionary obj = null;
+ for (int i = 1; i <= sheet.getLastRowNum(); i++) {
+ try {
+ Row row = sheet.getRow(i);//获取索引为i的行,以0开始
+ if(row.getCell(0).toString().trim().length() > 0){
+ obj = new SysDictionary();
+ obj.setId(Long.parseLong(row.getCell(0).getStringCellValue()));
+ obj.setName(row.getCell(1).getStringCellValue());
+ obj.setDictionaryCode(row.getCell(2).getStringCellValue());
+ obj.setParentId(Long.valueOf(row.getCell(3).getStringCellValue()));
+ obj.setParentNameRdd(row.getCell(4).getStringCellValue());
+ obj.setParentCodeRdd(row.getCell(5).getStringCellValue());
+ obj.setDictionaryValue(row.getCell(6).getStringCellValue());
+ obj.setDictionarySort(Integer.valueOf(row.getCell(7).getStringCellValue()));
+ obj.setDictionaryDescription(row.getCell(8).getStringCellValue());
+ obj.setIsValid(1);
+
+ result.add(obj);
+ }
+ }catch (Exception e){
+ LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i);
+ }
+ }
+ }
+ }
+ return result;
+ }
+
+ public List getSysLocaleLanguage(XSSFSheet sheet){
+ List result = new ArrayList<>();
+ if(sheet != null){
+ if(sheet.getLastRowNum() >= 1){
+ SysLocaleLanguage obj = null;
+ for (int i = 1; i <= sheet.getLastRowNum(); i++) {
+ try {
+ Row row = sheet.getRow(i);//获取索引为i的行,以0开始
+ if(row.getCell(0).toString().trim().length() > 0){
+ obj = new SysLocaleLanguage();
+ obj.setId(Long.parseLong(row.getCell(0).getStringCellValue()));
+ obj.setLanguageName(row.getCell(1).getStringCellValue());
+ obj.setLanguageCode(row.getCell(2).getStringCellValue());
+ obj.setLanguageSort(Integer.valueOf(row.getCell(3).getStringCellValue()));
+ obj.setIsDefault(Integer.valueOf(row.getCell(4).getStringCellValue()));
+ obj.setLanguageStatus(Integer.valueOf(row.getCell(5).getStringCellValue()));
+ obj.setIsValid(1);
+
+ result.add(obj);
+ }
+ }catch (Exception e){
+ LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i);
+ }
+ }
+ }
+ }
+ return result;
+ }
+
+ public List getSysLocaleResource(XSSFSheet sheet){
+ List result = new ArrayList<>();
+ if(sheet != null){
+ if(sheet.getLastRowNum() >= 1){
+ SysLocaleResource obj = null;
+ for (int i = 1; i <= sheet.getLastRowNum(); i++) {
+ try {
+ Row row = sheet.getRow(i);//获取索引为i的行,以0开始
+ if(row.getCell(0).toString().trim().length() > 0){
+ obj = new SysLocaleResource();
+ obj.setId(Long.parseLong(row.getCell(0).getStringCellValue()));
+ obj.setResourceType(Integer.valueOf(row.getCell(1).getStringCellValue()));
+ obj.setLanguageCode(row.getCell(2).getStringCellValue());
+ obj.setLanguageNameRdd(row.getCell(3).getStringCellValue());
+ obj.setResourceKey(row.getCell(4).getStringCellValue());
+ obj.setResourceValue(row.getCell(5).getStringCellValue());
+ obj.setIsSystem(Integer.valueOf(row.getCell(6).getStringCellValue()));
+ obj.setIsValid(1);
+
+ result.add(obj);
+ }
+ }catch (Exception e){
+ LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i);
+ }
+ }
+ }
+ }
+ return result;
+ }
+
+
+ public XSSFWorkbook getWorkbook(String pathName){
+ try {
+ InputStream in = TestExcelPermission.class.getClassLoader().getResourceAsStream(pathName);
+ XSSFWorkbook workbook = new XSSFWorkbook(in);
+ return workbook;
+ }catch (Exception e){
+ LOGGER.error(" System Init Sys Data Excel Error file path {} error message :{}",pathName,e.getMessage());
+ e.getMessage();
+ return null;
+ }
+ }
+
+}
diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestOrganizeService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestOrganizeService.java
index 11f7e07..af77e5d 100644
--- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestOrganizeService.java
+++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestOrganizeService.java
@@ -35,7 +35,7 @@
// for(int i = 0 ; i < 50 ; i++ ){
// Organize obj = new Organize();
// obj.setName("Junit Test " + i);
-// obj.setOrganizeCode("TEST_JUNIT " + i);
+// obj.setOrganizeCode("DEV_JUNIT " + i);
// obj.setParentId(-1L);
// obj = organizeService.insertOrganize(obj);
// System.out.println(JSON.toJSONString(obj));
diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionService.java
index 8626b4f..3e53b3b 100644
--- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionService.java
+++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionService.java
@@ -35,7 +35,7 @@
// for(int i = 0 ; i < 50 ; i++ ){
// Position position = new Position();
// position.setName("Junit Test " + i);
-// position.setPositionCode("TEST_JUNIT " + i);
+// position.setPositionCode("DEV_JUNIT " + i);
// position = positionService.insertPosition(position);
// System.out.println(JSON.toJSONString(position));
// }
diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryService.java
index 1ec458c..8922e68 100644
--- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryService.java
+++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryService.java
@@ -53,7 +53,7 @@
// SysDictionary sysDictionary = new SysDictionary();
// sysDictionary.setName("字典测试");
// sysDictionary.setDictionaryCode("dic_test");
-// sysDictionary.setDictionaryValue("TEST");
+// sysDictionary.setDictionaryValue("DEV");
// sysDictionary.setDictionaryDescription("字典测试");
//
// sysDictionaryService.insertSysDictionary(sysDictionary);
diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysMenuService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysMenuService.java
index e056eac..ce918a3 100644
--- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysMenuService.java
+++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysMenuService.java
@@ -68,7 +68,7 @@
// for(int i = 0 ; i < 50 ; i++ ){
// SysMenu obj = new SysMenu();
// obj.setName("Junit Test " + i);
-// obj.setMenuCode("TEST_JUNIT " + i);
+// obj.setMenuCode("DEV_JUNIT " + i);
// obj.setParentId(-1L);
// obj = sysMenuService.insertSysMenu(obj);
// System.out.println(JSON.toJSONString(obj));