diff --git a/.gitignore b/.gitignore
index d35a5afe..8aa9c4c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ target/
target/*
# IntelliJ project files
.idea
+.idea/
.idea/*
*.iml
out
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 55a4ff40..00000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 2e9b25c0..00000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 6560a989..00000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,36 +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 536821c8..00000000
--- 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__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml
deleted file mode 100644
index 9c1deaaa..00000000
--- a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml
deleted file mode 100644
index dd874c7d..00000000
--- a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml
deleted file mode 100644
index 974b2b2f..00000000
--- a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__cn_hutool_hutool_all_4_1_21.xml b/.idea/libraries/Maven__cn_hutool_hutool_all_4_1_21.xml
deleted file mode 100644
index 2c1ebb25..00000000
--- a/.idea/libraries/Maven__cn_hutool_hutool_all_4_1_21.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml b/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml
deleted file mode 100644
index 61b011ff..00000000
--- a/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_62.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_62.xml
deleted file mode 100644
index 07ced7ee..00000000
--- a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_62.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml
deleted file mode 100644
index d9050a48..00000000
--- a/.idea/libraries/Maven__com_fasterxml_classmate_1_4_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_annotations_2_9_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml
deleted file mode 100644
index 00770912..00000000
--- 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_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_9.xml
deleted file mode 100644
index 66985d92..00000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_9.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_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_9_3.xml
deleted file mode 100644
index 2c87400e..00000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_9_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_xml_2_9_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_xml_2_9_0.xml
deleted file mode 100644
index 539dac2d..00000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_xml_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_datatype_jackson_datatype_jdk8_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_9.xml
deleted file mode 100644
index 8502ae46..00000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_9.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_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_9.xml
deleted file mode 100644
index b4de13cd..00000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_9.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_afterburner_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_9.xml
deleted file mode 100644
index 86058979..00000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_9.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_jaxb_annotations_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_9_9.xml
deleted file mode 100644
index a25c6f20..00000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_9_9.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_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_9.xml
deleted file mode 100644
index 0c8bdeee..00000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_woodstox_woodstox_core_5_0_3.xml b/.idea/libraries/Maven__com_fasterxml_woodstox_woodstox_core_5_0_3.xml
deleted file mode 100644
index 0605294c..00000000
--- a/.idea/libraries/Maven__com_fasterxml_woodstox_woodstox_core_5_0_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml b/.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml
deleted file mode 100644
index 9835b4ab..00000000
--- a/.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_5.xml b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_5.xml
deleted file mode 100644
index 0984787a..00000000
--- a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_0_9_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_1_4.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_1_4.xml
deleted file mode 100644
index a93de30d..00000000
--- a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_4_1_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_qcloudsms_qcloudsms_1_0_5.xml b/.idea/libraries/Maven__com_github_qcloudsms_qcloudsms_1_0_5.xml
deleted file mode 100644
index 4108752e..00000000
--- a/.idea/libraries/Maven__com_github_qcloudsms_qcloudsms_1_0_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml b/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml
deleted file mode 100644
index b7991dc7..00000000
--- a/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_vlsi_compactmap_compactmap_1_2_1.xml b/.idea/libraries/Maven__com_github_vlsi_compactmap_compactmap_1_2_1.xml
deleted file mode 100644
index 6b2af78f..00000000
--- a/.idea/libraries/Maven__com_github_vlsi_compactmap_compactmap_1_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_code_findbugs_annotations_3_0_1.xml b/.idea/libraries/Maven__com_google_code_findbugs_annotations_3_0_1.xml
deleted file mode 100644
index e86f2fb9..00000000
--- a/.idea/libraries/Maven__com_google_code_findbugs_annotations_3_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml
deleted file mode 100644
index f2e06ff4..00000000
--- a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.xml
deleted file mode 100644
index 0ab965c6..00000000
--- a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.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 e38a4e07..00000000
--- 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_google_inject_guice_4_1_0.xml b/.idea/libraries/Maven__com_google_inject_guice_4_1_0.xml
deleted file mode 100644
index 043c8db0..00000000
--- a/.idea/libraries/Maven__com_google_inject_guice_4_1_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 a9e262be..00000000
--- 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_netflix_archaius_archaius_core_0_7_6.xml b/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml
deleted file mode 100644
index 2a63c828..00000000
--- a/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_9_3.xml b/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_9_3.xml
deleted file mode 100644
index 6bee69bd..00000000
--- a/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_9_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_9_3.xml b/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_9_3.xml
deleted file mode 100644
index c126864c..00000000
--- a/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_9_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_12.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_12.xml
deleted file mode 100644
index a8797694..00000000
--- a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_12.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_12.xml
deleted file mode 100644
index 19d41d74..00000000
--- a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_12.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_12.xml
deleted file mode 100644
index 3cd4eed3..00000000
--- a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_12.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_12.xml
deleted file mode 100644
index 0bff53c5..00000000
--- a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml
deleted file mode 100644
index 69016503..00000000
--- a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml
deleted file mode 100644
index 59a2aef0..00000000
--- a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml
deleted file mode 100644
index 26bf19b1..00000000
--- a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml
deleted file mode 100644
index 8c3b29f7..00000000
--- a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_5.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_5.xml
deleted file mode 100644
index 42ece554..00000000
--- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_5.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_5.xml
deleted file mode 100644
index d60cc389..00000000
--- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_5.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_5.xml
deleted file mode 100644
index 4e66fb73..00000000
--- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_5.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_5.xml
deleted file mode 100644
index 1bfea867..00000000
--- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_5.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_5.xml
deleted file mode 100644
index 2a11e1aa..00000000
--- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_5.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_5.xml
deleted file mode 100644
index 497f7398..00000000
--- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml b/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml
deleted file mode 100644
index 8620327d..00000000
--- a/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_4_3.xml b/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_4_3.xml
deleted file mode 100644
index 90fa2ba2..00000000
--- a/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_4_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml
deleted file mode 100644
index a83d0f77..00000000
--- a/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml
deleted file mode 100644
index eb021712..00000000
--- a/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml
deleted file mode 100644
index 8a261e2e..00000000
--- a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_10.xml b/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_10.xml
deleted file mode 100644
index fe1bb116..00000000
--- a/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml
deleted file mode 100644
index 5ccc3aaf..00000000
--- a/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.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 923a9408..00000000
--- 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 a6d25f29..00000000
--- 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 a5603ea5..00000000
--- 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__commons_configuration_commons_configuration_1_8.xml b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml
deleted file mode 100644
index 1a96694d..00000000
--- a/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml
deleted file mode 100644
index f29ce862..00000000
--- a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_2.xml b/.idea/libraries/Maven__commons_io_commons_io_2_2.xml
deleted file mode 100644
index b0ed4164..00000000
--- a/.idea/libraries/Maven__commons_io_commons_io_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml b/.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml
deleted file mode 100644
index 604e494e..00000000
--- a/.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
deleted file mode 100644
index a3b5d101..00000000
--- a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_core_9_7_0.xml b/.idea/libraries/Maven__io_github_openfeign_feign_core_9_7_0.xml
deleted file mode 100644
index 1f015dfc..00000000
--- a/.idea/libraries/Maven__io_github_openfeign_feign_core_9_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_7_0.xml b/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_7_0.xml
deleted file mode 100644
index ce6ac69f..00000000
--- a/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_java8_9_7_0.xml b/.idea/libraries/Maven__io_github_openfeign_feign_java8_9_7_0.xml
deleted file mode 100644
index 77a431d0..00000000
--- a/.idea/libraries/Maven__io_github_openfeign_feign_java8_9_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_7_0.xml b/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_7_0.xml
deleted file mode 100644
index 15db94e1..00000000
--- a/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_3_0.xml b/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_3_0.xml
deleted file mode 100644
index 7e3c7a65..00000000
--- a/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_3_0.xml b/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_3_0.xml
deleted file mode 100644
index 859d1b63..00000000
--- a/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_7_0.xml b/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_7_0.xml
deleted file mode 100644
index 78e8df7c..00000000
--- a/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_lettuce_lettuce_core_5_1_8_RELEASE.xml b/.idea/libraries/Maven__io_lettuce_lettuce_core_5_1_8_RELEASE.xml
deleted file mode 100644
index 5048a765..00000000
--- a/.idea/libraries/Maven__io_lettuce_lettuce_core_5_1_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_micrometer_micrometer_core_1_1_6.xml b/.idea/libraries/Maven__io_micrometer_micrometer_core_1_1_6.xml
deleted file mode 100644
index c49ac62b..00000000
--- a/.idea/libraries/Maven__io_micrometer_micrometer_core_1_1_6.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_39_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_39_Final.xml
deleted file mode 100644
index 426d0e07..00000000
--- a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_39_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_39_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_1_39_Final.xml
deleted file mode 100644
index 6afb8374..00000000
--- a/.idea/libraries/Maven__io_netty_netty_codec_4_1_39_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_39_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_1_39_Final.xml
deleted file mode 100644
index 57397bf7..00000000
--- a/.idea/libraries/Maven__io_netty_netty_common_4_1_39_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_39_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_4_1_39_Final.xml
deleted file mode 100644
index e9869509..00000000
--- a/.idea/libraries/Maven__io_netty_netty_handler_4_1_39_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_39_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_39_Final.xml
deleted file mode 100644
index 56d9b45c..00000000
--- a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_39_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_39_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_1_39_Final.xml
deleted file mode 100644
index d7715b52..00000000
--- a/.idea/libraries/Maven__io_netty_netty_transport_4_1_39_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_2_12_RELEASE.xml b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_12_RELEASE.xml
deleted file mode 100644
index 1e36e7f6..00000000
--- a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_12_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml b/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml
deleted file mode 100644
index d9e1c455..00000000
--- a/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml b/.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml
deleted file mode 100644
index f7ca3b79..00000000
--- a/.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml b/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml
deleted file mode 100644
index 014cd263..00000000
--- a/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml b/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml
deleted file mode 100644
index 67fc64ad..00000000
--- a/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml b/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml
deleted file mode 100644
index 3f419626..00000000
--- a/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.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 74f266d1..00000000
--- 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 61d5d27d..00000000
--- 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 7589b4ca..00000000
--- 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 e6cb233c..00000000
--- 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 32389a4f..00000000
--- 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 79400a0d..00000000
--- 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 3c049ecd..00000000
--- 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 eefd1e86..00000000
--- 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 1cfdaf87..00000000
--- 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__io_zipkin_brave_brave_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_5_4_3.xml
deleted file mode 100644
index 3bc3be41..00000000
--- a/.idea/libraries/Maven__io_zipkin_brave_brave_5_4_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_context_log4j2_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_context_log4j2_5_4_3.xml
deleted file mode 100644
index ee8123d1..00000000
--- a/.idea/libraries/Maven__io_zipkin_brave_brave_context_log4j2_5_4_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_http_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_http_5_4_3.xml
deleted file mode 100644
index 46f0a871..00000000
--- a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_http_5_4_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_httpasyncclient_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_httpasyncclient_5_4_3.xml
deleted file mode 100644
index 80d7a57d..00000000
--- a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_httpasyncclient_5_4_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_httpclient_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_httpclient_5_4_3.xml
deleted file mode 100644
index c5af2430..00000000
--- a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_httpclient_5_4_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_kafka_clients_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_kafka_clients_5_4_3.xml
deleted file mode 100644
index c21d331d..00000000
--- a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_kafka_clients_5_4_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_servlet_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_servlet_5_4_3.xml
deleted file mode 100644
index b7cf08ca..00000000
--- a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_servlet_5_4_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_spring_rabbit_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_spring_rabbit_5_4_3.xml
deleted file mode 100644
index 08784fb1..00000000
--- a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_spring_rabbit_5_4_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_spring_web_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_spring_web_5_4_3.xml
deleted file mode 100644
index b90e35bd..00000000
--- a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_spring_web_5_4_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_spring_webmvc_5_4_3.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_spring_webmvc_5_4_3.xml
deleted file mode 100644
index 44fc4fb1..00000000
--- a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_spring_webmvc_5_4_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_reporter_2_7_10.xml b/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_reporter_2_7_10.xml
deleted file mode 100644
index 78f47c20..00000000
--- a/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_reporter_2_7_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_sender_amqp_client_2_7_10.xml b/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_sender_amqp_client_2_7_10.xml
deleted file mode 100644
index 125927b6..00000000
--- a/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_sender_amqp_client_2_7_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_sender_kafka11_2_7_10.xml b/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_sender_kafka11_2_7_10.xml
deleted file mode 100644
index d6f6782e..00000000
--- a/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_sender_kafka11_2_7_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_zipkin_zipkin2_zipkin_2_11_7.xml b/.idea/libraries/Maven__io_zipkin_zipkin2_zipkin_2_11_7.xml
deleted file mode 100644
index e0304a97..00000000
--- a/.idea/libraries/Maven__io_zipkin_zipkin2_zipkin_2_11_7.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 095c2866..00000000
--- 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_inject_javax_inject_1.xml b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml
deleted file mode 100644
index b024d920..00000000
--- a/.idea/libraries/Maven__javax_inject_javax_inject_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml
deleted file mode 100644
index 8c822085..00000000
--- a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.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 877ae022..00000000
--- 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__javax_websocket_javax_websocket_api_1_1.xml b/.idea/libraries/Maven__javax_websocket_javax_websocket_api_1_1.xml
deleted file mode 100644
index e03ce582..00000000
--- a/.idea/libraries/Maven__javax_websocket_javax_websocket_api_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml b/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml
deleted file mode 100644
index cb7e729b..00000000
--- a/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml b/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml
deleted file mode 100644
index 313dd9c8..00000000
--- a/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_10_3.xml b/.idea/libraries/Maven__joda_time_joda_time_2_10_3.xml
deleted file mode 100644
index 1435996e..00000000
--- a/.idea/libraries/Maven__joda_time_joda_time_2_10_3.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 d3b71924..00000000
--- 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_8_0_17.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_17.xml
deleted file mode 100644
index 05b4771b..00000000
--- a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_17.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_16.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_16.xml
deleted file mode 100644
index 1d6377b8..00000000
--- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_16.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_9_16.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_16.xml
deleted file mode 100644
index 7640d10a..00000000
--- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_16.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml b/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml
deleted file mode 100644
index a4877eff..00000000
--- a/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.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 c85dd2a9..00000000
--- 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 fdd4d462..00000000
--- 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_sourceforge_htmlcleaner_htmlcleaner_2_22.xml b/.idea/libraries/Maven__net_sourceforge_htmlcleaner_htmlcleaner_2_22.xml
deleted file mode 100644
index 8af1619d..00000000
--- a/.idea/libraries/Maven__net_sourceforge_htmlcleaner_htmlcleaner_2_22.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml
deleted file mode 100644
index 16f7b549..00000000
--- a/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml b/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml
deleted file mode 100644
index f45d08ad..00000000
--- a/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml
deleted file mode 100644
index 36cc6acd..00000000
--- a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.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 8017f0f5..00000000
--- 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_math_2_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml
deleted file mode 100644
index 669f1259..00000000
--- a/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_1.xml
deleted file mode 100644
index 240c31c3..00000000
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_1.xml
deleted file mode 100644
index 0ee1b622..00000000
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_9.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_9.xml
deleted file mode 100644
index a6cd8bae..00000000
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_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_11_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml
deleted file mode 100644
index a8ccd8c8..00000000
--- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml
deleted file mode 100644
index c07afd03..00000000
--- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml
deleted file mode 100644
index c7594208..00000000
--- a/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml
deleted file mode 100644
index 87665193..00000000
--- a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml
deleted file mode 100644
index ed2ae3b0..00000000
--- a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.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 c880d724..00000000
--- 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 0fa594fe..00000000
--- 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 d57b86bd..00000000
--- 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 1afe73bb..00000000
--- 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 4da72a3d..00000000
--- 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 53029e24..00000000
--- 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 58c5eaf1..00000000
--- 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_event_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_4_0.xml
deleted file mode 100644
index 02e5f05d..00000000
--- 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 4d86375a..00000000
--- 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 69e34161..00000000
--- 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 0f144e83..00000000
--- 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_xmlbeans_xmlbeans_2_6_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml
deleted file mode 100644
index bcef78e7..00000000
--- a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_4.xml b/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_4.xml
deleted file mode 100644
index dad7e0d1..00000000
--- a/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_4.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_4.xml
deleted file mode 100644
index f26a3cf0..00000000
--- a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml
deleted file mode 100644
index 6c945692..00000000
--- a/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_beanshell_bsh_2_0b5.xml b/.idea/libraries/Maven__org_beanshell_bsh_2_0b5.xml
deleted file mode 100644
index 87e43be9..00000000
--- a/.idea/libraries/Maven__org_beanshell_bsh_2_0b5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_60.xml b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_60.xml
deleted file mode 100644
index 471f80c5..00000000
--- a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_60.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_60.xml b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_60.xml
deleted file mode 100644
index 170a65be..00000000
--- a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_60.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml b/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml
deleted file mode 100644
index 5030d27a..00000000
--- a/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml b/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml
deleted file mode 100644
index 5f948ed9..00000000
--- a/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml b/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml
deleted file mode 100644
index 4acc8dd5..00000000
--- a/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_annotations_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_annotations_9_4_19_v20190610.xml
deleted file mode 100644
index 3586aa31..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_annotations_9_4_19_v20190610.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_client_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_client_9_4_19_v20190610.xml
deleted file mode 100644
index 8fcbfac0..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_client_9_4_19_v20190610.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_continuation_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_continuation_9_4_19_v20190610.xml
deleted file mode 100644
index 7a9ae055..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_continuation_9_4_19_v20190610.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_19_v20190610.xml
deleted file mode 100644
index c4d34d8a..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_19_v20190610.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_19_v20190610.xml
deleted file mode 100644
index fe926ad4..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_19_v20190610.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_plus_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_plus_9_4_19_v20190610.xml
deleted file mode 100644
index c4a5afbc..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_plus_9_4_19_v20190610.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_4_19_v20190610.xml
deleted file mode 100644
index 37dfe27a..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_4_19_v20190610.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_4_19_v20190610.xml
deleted file mode 100644
index 7d1ee607..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_4_19_v20190610.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_4_19_v20190610.xml
deleted file mode 100644
index b2255b0f..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_4_19_v20190610.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlets_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlets_9_4_19_v20190610.xml
deleted file mode 100644
index a43f9c15..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlets_9_4_19_v20190610.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_19_v20190610.xml
deleted file mode 100644
index 9b1231b9..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_19_v20190610.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_4_19_v20190610.xml
deleted file mode 100644
index 31eca6cb..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_4_19_v20190610.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_4_19_v20190610.xml
deleted file mode 100644
index 44b48dc5..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_4_19_v20190610.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_javax_websocket_client_impl_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_javax_websocket_client_impl_9_4_19_v20190610.xml
deleted file mode 100644
index b5dec2c4..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_websocket_javax_websocket_client_impl_9_4_19_v20190610.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_javax_websocket_server_impl_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_javax_websocket_server_impl_9_4_19_v20190610.xml
deleted file mode 100644
index 987f522f..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_websocket_javax_websocket_server_impl_9_4_19_v20190610.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_4_19_v20190610.xml
deleted file mode 100644
index 65e6203b..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_4_19_v20190610.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_4_19_v20190610.xml
deleted file mode 100644
index 19cb190a..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_4_19_v20190610.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_4_19_v20190610.xml
deleted file mode 100644
index 12aaa1a5..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_4_19_v20190610.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_server_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_server_9_4_19_v20190610.xml
deleted file mode 100644
index c4c347f1..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_server_9_4_19_v20190610.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_servlet_9_4_19_v20190610.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_servlet_9_4_19_v20190610.xml
deleted file mode 100644
index d301a7aa..00000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_servlet_9_4_19_v20190610.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 e5d35d87..00000000
--- 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 2a1ddc27..00000000
--- 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_hdrhistogram_HdrHistogram_2_1_9.xml b/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml
deleted file mode 100644
index c6263b8c..00000000
--- a/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.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_17_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_17_Final.xml
deleted file mode 100644
index 489a30be..00000000
--- a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_17_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_3_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_3_Final.xml
deleted file mode 100644
index 1323c971..00000000
--- a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_3_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jdom_jdom2_2_0_6.xml b/.idea/libraries/Maven__org_jdom_jdom2_2_0_6.xml
deleted file mode 100644
index fef0d501..00000000
--- a/.idea/libraries/Maven__org_jdom_jdom2_2_0_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_json_json_20170516.xml b/.idea/libraries/Maven__org_json_json_20170516.xml
deleted file mode 100644
index 284ad69e..00000000
--- a/.idea/libraries/Maven__org_json_json_20170516.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml b/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml
deleted file mode 100644
index 266ea422..00000000
--- a/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.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 5fa1abfd..00000000
--- 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_23_4.xml b/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml
deleted file mode 100644
index 88a8a0f5..00000000
--- a/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mortbay_jasper_apache_el_8_5_40.xml b/.idea/libraries/Maven__org_mortbay_jasper_apache_el_8_5_40.xml
deleted file mode 100644
index 2fb4a9d2..00000000
--- a/.idea/libraries/Maven__org_mortbay_jasper_apache_el_8_5_40.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_generator_mybatis_generator_core_1_3_7.xml b/.idea/libraries/Maven__org_mybatis_generator_mybatis_generator_core_1_3_7.xml
deleted file mode 100644
index 3ee34af0..00000000
--- a/.idea/libraries/Maven__org_mybatis_generator_mybatis_generator_core_1_3_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_4_0.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_4_0.xml
deleted file mode 100644
index 44e088ae..00000000
--- a/.idea/libraries/Maven__org_mybatis_mybatis_3_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml
deleted file mode 100644
index 1b0619ab..00000000
--- a/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_1_1.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_1_1.xml
deleted file mode 100644
index 419114c7..00000000
--- a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_1_1.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_1_1.xml
deleted file mode 100644
index f51338c2..00000000
--- a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_1_1.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 4679a935..00000000
--- 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 acdc0195..00000000
--- 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_ow2_asm_asm_7_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_7_1.xml
deleted file mode 100644
index f567a85c..00000000
--- a/.idea/libraries/Maven__org_ow2_asm_asm_7_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_analysis_7_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_analysis_7_1.xml
deleted file mode 100644
index 1e1ed0b4..00000000
--- a/.idea/libraries/Maven__org_ow2_asm_asm_analysis_7_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_commons_7_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_commons_7_1.xml
deleted file mode 100644
index 9bea6223..00000000
--- a/.idea/libraries/Maven__org_ow2_asm_asm_commons_7_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_tree_7_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_tree_7_1.xml
deleted file mode 100644
index 5cfee4cc..00000000
--- a/.idea/libraries/Maven__org_ow2_asm_asm_tree_7_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml
deleted file mode 100644
index e3be1945..00000000
--- a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.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_3.xml b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml
deleted file mode 100644
index 8b0988b8..00000000
--- a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.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 69c5c8ac..00000000
--- 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_28.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_28.xml
deleted file mode 100644
index 855d1e62..00000000
--- a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_28.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_28.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_28.xml
deleted file mode 100644
index 69a53e4c..00000000
--- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_28.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_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_1_8_RELEASE.xml
deleted file mode 100644
index b15074ed..00000000
--- a/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_1_8_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_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_1_8_RELEASE.xml
deleted file mode 100644
index ca4326de..00000000
--- a/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_1_8_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_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_8_RELEASE.xml
deleted file mode 100644
index 056d8e74..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_8_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_actuator_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_1_8_RELEASE.xml
deleted file mode 100644
index 5d8a4876..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_1_8_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_actuator_autoconfigure_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_1_8_RELEASE.xml
deleted file mode 100644
index c503119f..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_1_8_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_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_8_RELEASE.xml
deleted file mode 100644
index 5f992b7f..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_8_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_configuration_processor_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_2_1_8_RELEASE.xml
deleted file mode 100644
index 12934655..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_2_1_8_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_devtools_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_8_RELEASE.xml
deleted file mode 100644
index 9be55e76..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_8_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_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_8_RELEASE.xml
deleted file mode 100644
index b04a64a0..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_8_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_actuator_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_1_8_RELEASE.xml
deleted file mode 100644
index 9405f299..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_1_8_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_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_1_8_RELEASE.xml
deleted file mode 100644
index 59161e64..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_1_8_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_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_8_RELEASE.xml
deleted file mode 100644
index f1661719..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_8_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_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_1_8_RELEASE.xml
deleted file mode 100644
index 6703a629..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_1_8_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_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_8_RELEASE.xml
deleted file mode 100644
index 8a666443..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_8_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_jetty_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jetty_2_1_8_RELEASE.xml
deleted file mode 100644
index 5a4711e7..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jetty_2_1_8_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_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_8_RELEASE.xml
deleted file mode 100644
index 7c63acba..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_8_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_logging_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_8_RELEASE.xml
deleted file mode 100644
index 7404a08b..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_8_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_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_8_RELEASE.xml
deleted file mode 100644
index 7c702576..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_8_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_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_8_RELEASE.xml
deleted file mode 100644
index 4e3eac68..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_8_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_websocket_2_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_1_8_RELEASE.xml
deleted file mode 100644
index 6eca6ed2..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_1_8_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_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_8_RELEASE.xml
deleted file mode 100644
index c56e7435..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_8_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_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_8_RELEASE.xml
deleted file mode 100644
index 86efc9aa..00000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_0_2_RELEASE.xml
deleted file mode 100644
index 2ac736ba..00000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_0_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_0_2_RELEASE.xml
deleted file mode 100644
index de727253..00000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_0_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_0_2_RELEASE.xml
deleted file mode 100644
index 2e662aa4..00000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_0_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_2_0_2_RELEASE.xml
deleted file mode 100644
index 6e886217..00000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_2_0_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_0_2_RELEASE.xml
deleted file mode 100644
index c10672f3..00000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_0_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_0_2_RELEASE.xml
deleted file mode 100644
index 6389a7ce..00000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_0_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_0_2_RELEASE.xml
deleted file mode 100644
index 6c44eea8..00000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_0_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_sleuth_core_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_sleuth_core_2_0_2_RELEASE.xml
deleted file mode 100644
index e8ff949c..00000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_sleuth_core_2_0_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_sleuth_zipkin_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_sleuth_zipkin_2_0_2_RELEASE.xml
deleted file mode 100644
index 03114048..00000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_sleuth_zipkin_2_0_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_0_2_RELEASE.xml
deleted file mode 100644
index a0fc2d4a..00000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_0_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_0_2_RELEASE.xml
deleted file mode 100644
index 8bb1bcb2..00000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_0_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_client_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_client_2_0_2_RELEASE.xml
deleted file mode 100644
index 745c3297..00000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_client_2_0_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_0_2_RELEASE.xml
deleted file mode 100644
index 1db1791c..00000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_0_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_0_2_RELEASE.xml
deleted file mode 100644
index 842c633c..00000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_0_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_0_2_RELEASE.xml
deleted file mode 100644
index 297c8056..00000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_0_2_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_sleuth_2_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_sleuth_2_0_2_RELEASE.xml
deleted file mode 100644
index d97abd04..00000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_sleuth_2_0_2_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_1_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_10_RELEASE.xml
deleted file mode 100644
index a01ad536..00000000
--- a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_10_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_1_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_10_RELEASE.xml
deleted file mode 100644
index 375cb7d2..00000000
--- a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_10_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_1_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_10_RELEASE.xml
deleted file mode 100644
index 3964806e..00000000
--- a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_10_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 415679a6..00000000
--- 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 a2d86278..00000000
--- 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_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_4_RELEASE.xml
deleted file mode 100644
index 06f4d583..00000000
--- a/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_4_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_1_6_RELEASE.xml
deleted file mode 100644
index 10f93441..00000000
--- a/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_1_6_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_7_RELEASE.xml
deleted file mode 100644
index 21fa4d8f..00000000
--- a/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_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_aop_5_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_1_9_RELEASE.xml
deleted file mode 100644
index e1214d6f..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_aop_5_1_9_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_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_1_9_RELEASE.xml
deleted file mode 100644
index c85d3912..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_beans_5_1_9_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_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_1_9_RELEASE.xml
deleted file mode 100644
index 77a2dff2..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_context_5_1_9_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_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_9_RELEASE.xml
deleted file mode 100644
index 9d73c6ea..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_9_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_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_1_9_RELEASE.xml
deleted file mode 100644
index e2c6e4f2..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_core_5_1_9_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_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_1_9_RELEASE.xml
deleted file mode 100644
index dbece0dc..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_expression_5_1_9_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_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_9_RELEASE.xml
deleted file mode 100644
index 83a13dbc..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_9_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_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_9_RELEASE.xml
deleted file mode 100644
index a3bb4166..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_9_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_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_messaging_5_1_9_RELEASE.xml
deleted file mode 100644
index 695cd536..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_messaging_5_1_9_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_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_oxm_5_1_9_RELEASE.xml
deleted file mode 100644
index 64a139c9..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_oxm_5_1_9_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_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_1_9_RELEASE.xml
deleted file mode 100644
index c21dbd86..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_test_5_1_9_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_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_1_9_RELEASE.xml
deleted file mode 100644
index 1b287412..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_tx_5_1_9_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_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_1_9_RELEASE.xml
deleted file mode 100644
index c751ec2b..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_web_5_1_9_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_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_9_RELEASE.xml
deleted file mode 100644
index abb746aa..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_9_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_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_websocket_5_1_9_RELEASE.xml
deleted file mode 100644
index 2e455955..00000000
--- a/.idea/libraries/Maven__org_springframework_spring_websocket_5_1_9_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_6_3.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_3.xml
deleted file mode 100644
index 172c3cbb..00000000
--- a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml
deleted file mode 100644
index 5e240702..00000000
--- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml
deleted file mode 100644
index 4de7af33..00000000
--- a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml b/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml
deleted file mode 100644
index da17a2dc..00000000
--- a/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml b/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml
deleted file mode 100644
index 4d9db360..00000000
--- a/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.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 d30d09e2..00000000
--- 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 b9dfe982..00000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1ddf..00000000
--- 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 34ce9b99..00000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1575453955595
-
-
- 1575453955595
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
index e35d85de..e70b40a8 100644
--- a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
@@ -89,6 +89,10 @@ public class TaskVo {
private Long endTime;
@ApiModelProperty("时长")
private Long duration;
+ @ApiModelProperty("显示的开始时间")
+ private String showBeginTime;
+ @ApiModelProperty("显示的结束时间")
+ private String showEndTime;
@ApiModelProperty("循环周期")
private String cycle;
@ApiModelProperty("跳转模式 -1手动,0自动,1延迟")
diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java
index b9c5a503..d8212a48 100644
--- a/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/vo/UserVo.java
@@ -56,4 +56,13 @@ public class UserVo {
@ApiModelProperty("密码")
private String password;
}
+
+ @Getter
+ @Setter
+ @ApiModel
+ public static class TokenToUserId{
+ @ApiModelProperty("用户id")
+ private Long id;
+ }
+
}
diff --git a/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java b/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java
index e961e6b4..b52fd039 100644
--- a/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java
+++ b/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java
@@ -128,6 +128,7 @@ public class SpringConfig implements WebMvcConfigurer {
.excludePathPatterns("/users/signup")
.excludePathPatterns("/users/password")
.excludePathPatterns("/users/account")
+ .excludePathPatterns("/users/token")
.addPathPatterns("/plugins/**")
.addPathPatterns("/delivers/**")
.addPathPatterns("/tasks/**")
diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java
index 10169c74..908e9c76 100644
--- a/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java
+++ b/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java
@@ -17,4 +17,6 @@ public interface TaskDeliverDao extends ProTaskDeliverMapper{
List selectBySubTimeId(@Param("subTimeId") Long subTimeId);
List selectDeliverByUserId(@Param("userId") Long userId);
+
+ void deletePostLogCheckerByPostLogId(@Param("postLogId") Long postLogId);
}
diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDetailDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDetailDao.java
index ab8d64d9..b34d193a 100644
--- a/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDetailDao.java
+++ b/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDetailDao.java
@@ -28,5 +28,6 @@ public interface TaskDetailDao extends ProTaskDetailMapper {
Long selectSubTimeByTaskIdAndTime(@Param("detailId") Long detailId, @Param("now") Long now);
-// void deleteTaskByRoleId(@Param("parentId")Long roleId);
+ void selectTaskByDetailId(@Param("detailId") Long detailId);
+
}
diff --git a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java
index 737db465..d8d9523e 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java
@@ -28,7 +28,7 @@ import java.util.*;
@Slf4j
@Service
-@Transactional(propagation = Propagation.REQUIRED)
+@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
public class ExcelService implements IExcelService {
@Autowired
private SysPluginDao sysPluginDao;
@@ -214,6 +214,24 @@ public class ExcelService implements IExcelService {
proRoleService.saveProRole(creatorRole);
proRoles.add(creatorRole);
+ //添加关注者一级角色
+ ProRole attention = new ProRole();
+ attention.setName(WebConstant.ROLE_NAME.Attention.value);
+ attention.setDescription(WebConstant.ROLE_NAME.Attention.phase);
+ attention.setProjectId(sysProject.getId());
+ attention.setId(snowflake.nextId());
+ proRoleService.saveProRole(attention);
+ proRoles.add(attention);
+ //添加关注者角色(二级角色)
+ ProRole attentionRole = new ProRole();
+ attentionRole.setName(WebConstant.ROLE_NAME.Attention.phase);
+ attentionRole.setDescription(WebConstant.ROLE_NAME.Attention.value);
+ attentionRole.setParentId(attention.getId());
+ attentionRole.setProjectId(sysProject.getId());
+ attentionRole.setId(snowflake.nextId());
+ proRoleService.saveProRole(attentionRole);
+ proRoles.add(attentionRole);
+
//添加成员和奖惩干系人
memberWhitStakeholder(memberSheet, stakeholderProRole.getId(),sysProject,proMembers);
diff --git a/tall/src/main/java/com/ccsens/tall/service/ExcludeRoleService.java b/tall/src/main/java/com/ccsens/tall/service/ExcludeRoleService.java
index cfda94b1..6d3f918b 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ExcludeRoleService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ExcludeRoleService.java
@@ -2,13 +2,15 @@ package com.ccsens.tall.service;
import com.ccsens.tall.bean.po.ProRoleExeclude;
import com.ccsens.tall.persist.dao.ProRoleExecludeDao;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+@Slf4j
@Service
-@Transactional(propagation = Propagation.REQUIRED)
+@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
public class ExcludeRoleService implements IExcludeRoleService{
@Autowired
private ProRoleExecludeDao proRoleExecludeDao;
diff --git a/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java b/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java
index ac146ebd..ac300a81 100644
--- a/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/IProRoleService.java
@@ -22,5 +22,5 @@ public interface IProRoleService {
ProRole getAllMember(Long projectId);
- void deleteRoleByProjectId(Long projectId);
+ void deleteRoleByProjectId(Long userId,Long projectId);
}
diff --git a/tall/src/main/java/com/ccsens/tall/service/IProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/IProTaskDetailService.java
index 26e64cdc..7082e504 100644
--- a/tall/src/main/java/com/ccsens/tall/service/IProTaskDetailService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/IProTaskDetailService.java
@@ -20,5 +20,7 @@ public interface IProTaskDetailService {
TaskVo.NormalTask selectTaskByParentId(Long parentId, Long startTime, Long endTime);
- void deleteTaskByRoleId(Long roleId);
+ void deleteTask(Long currentUserId,Long taskId);
+
+ void deleteTaskByTaskId(Long taskId);
}
diff --git a/tall/src/main/java/com/ccsens/tall/service/IProjectService.java b/tall/src/main/java/com/ccsens/tall/service/IProjectService.java
index 6112d265..54b44ed0 100644
--- a/tall/src/main/java/com/ccsens/tall/service/IProjectService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/IProjectService.java
@@ -28,5 +28,5 @@ public interface IProjectService {
void deleteProject(Long currentUserId, Long projectId)throws Exception;
- void copyProject(Long userId, Long projectId);
+ ProjectVo.ProjectInfo copyProject(Long userId, Long projectId);
}
diff --git a/tall/src/main/java/com/ccsens/tall/service/MessageService.java b/tall/src/main/java/com/ccsens/tall/service/MessageService.java
index 1b1d57c1..0129e9a7 100644
--- a/tall/src/main/java/com/ccsens/tall/service/MessageService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/MessageService.java
@@ -6,16 +6,21 @@ import com.ccsens.tall.bean.dto.message.*;
import com.ccsens.tall.bean.vo.MemberVo;
import com.ccsens.util.JacksonUtil;
import com.ccsens.util.config.RabbitMQConfig;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import static io.lettuce.core.pubsub.PubSubOutput.Type.message;
+@Slf4j
@Service
+@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
public class MessageService implements IMessageService{
@Autowired
private AmqpTemplate rabbitTemplate;
diff --git a/tall/src/main/java/com/ccsens/tall/service/ProMemberRoleService.java b/tall/src/main/java/com/ccsens/tall/service/ProMemberRoleService.java
index 61efb175..4628493c 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ProMemberRoleService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ProMemberRoleService.java
@@ -21,9 +21,10 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
+
@Slf4j
@Service
-@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
public class ProMemberRoleService implements IProMemberRoleService{
@Autowired
private ProMemberRoleDao proMemberRoleDao;
diff --git a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java
index 43d77ff0..78064e4b 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java
@@ -9,6 +9,7 @@ import com.ccsens.tall.persist.dao.ProMemberDao;
import com.ccsens.tall.persist.dao.ProMemberRoleDao;
import com.ccsens.tall.persist.dao.ProRoleDao;
import com.ccsens.util.WebConstant;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -17,8 +18,9 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
+@Slf4j
@Service
-@Transactional(propagation = Propagation.REQUIRED)
+@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
public class ProMemberService implements IProMemberService {
@Autowired
private ProMemberDao proMemberDao;
@@ -134,20 +136,30 @@ public class ProMemberService implements IProMemberService {
*/
@Override
public List selectRolesByUserIdAndProjectId(Long userId, Long projectId) throws Exception {
- List roleList = new ArrayList<>();
- ProMemberExample memberExample = new ProMemberExample();
- memberExample.createCriteria().andUserIdEqualTo(userId).andProjectIdEqualTo(projectId);
- List memberList = proMemberDao.selectByExample(memberExample);
- if (CollectionUtil.isNotEmpty(memberList)) {
- ProMember member = memberList.get(0);
- ProMemberRoleExample memberRoleExample = new ProMemberRoleExample();
- memberRoleExample.createCriteria().andMemberIdEqualTo(member.getId());
- List memberRoleList = proMemberRoleDao.selectByExample(memberRoleExample);
- if(CollectionUtil.isNotEmpty(memberRoleList)){
- for(ProMemberRole memberRole:memberRoleList){
- ProRole role = proRoleDao.selectByPrimaryKey(memberRole.getRoleId());
- roleList.add(role);
- }
+// List roleList = new ArrayList<>();
+// ProMemberExample memberExample = new ProMemberExample();
+// memberExample.createCriteria().andUserIdEqualTo(userId).andProjectIdEqualTo(projectId);
+// List memberList = proMemberDao.selectByExample(memberExample);
+// if (CollectionUtil.isNotEmpty(memberList)) {
+// ProMember member = memberList.get(0);
+// ProMemberRoleExample memberRoleExample = new ProMemberRoleExample();
+// memberRoleExample.createCriteria().andMemberIdEqualTo(member.getId());
+// List memberRoleList = proMemberRoleDao.selectByExample(memberRoleExample);
+// if(CollectionUtil.isNotEmpty(memberRoleList)){
+// for(ProMemberRole memberRole:memberRoleList){
+// ProRole role = proRoleDao.selectByPrimaryKey(memberRole.getRoleId());
+// roleList.add(role);
+// }
+// }
+// }
+ List roleList = proRoleDao.selectRolesByProjectIdAndUserId(projectId, userId);
+ if(CollectionUtil.isNotEmpty(roleList)){
+ ProRoleExample roleExample = new ProRoleExample();
+ roleExample.createCriteria().andProjectIdEqualTo(projectId)
+ .andNameEqualTo(WebConstant.ROLE_NAME.Attention.phase).andParentIdNotEqualTo(0L);
+ List proRoleList = proRoleDao.selectByExample(roleExample);
+ if(CollectionUtil.isNotEmpty(proRoleList)){
+ roleList.addAll(proRoleList);
}
}
return roleList;
diff --git a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java
index 60ed5561..28f3af38 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java
@@ -11,6 +11,7 @@ import com.ccsens.tall.persist.dao.ProMemberDao;
import com.ccsens.tall.persist.dao.ProMemberRoleDao;
import com.ccsens.tall.persist.dao.ProRoleDao;
import com.ccsens.util.WebConstant;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -18,17 +19,16 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.List;
+@Slf4j
@Service
-@Transactional(propagation = Propagation.REQUIRED)
+@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
public class ProRoleService implements IProRoleService {
@Autowired
private ProRoleDao proRoleDao;
@Autowired
private ProMemberDao proMemberDao;
@Autowired
- private ProMemberRoleDao proMemberRoleDao;
- @Autowired
- private IProTaskDetailService taskDetailService;
+ private IProMemberService proMemberService;
@Autowired
private IUserService userService;
@@ -56,7 +56,8 @@ public class ProRoleService implements IProRoleService {
//是否mine
if (CollectionUtil.isNotEmpty(memberRoleList)) {
- List roleList = proRoleDao.selectRolesByProjectIdAndUserId(projectId, currentUserId);
+ //获取用户在项目中的角色
+ List roleList = proMemberService.selectRolesByUserIdAndProjectId(projectId, currentUserId);
for (ProjectVo.RoleInfo memberRole : memberRoleList) {
if (ObjectUtil.isNotNull(roleList)) {
for(ProRole role:roleList){
@@ -97,22 +98,6 @@ public class ProRoleService implements IProRoleService {
}
}
-// //是否mine
-// if (CollectionUtil.isNotEmpty(memberRoleList)) {
-// List roleList = proRoleDao.selectRolesByProjectIdAndUserId(projectId, currentUserId);
-// for (ProjectVo.RoleInfo memberRole : memberRoleList) {
-// if (ObjectUtil.isNotNull(roleList)) {
-// for(ProRole role:roleList){
-// if (memberRole.getId().equals(role.getId())) {
-// memberRole.setMine(true);
-// break;
-// } else {
-// memberRole.setMine(false);
-// }
-// }
-// }
-// }
-// }
//奖惩干系人信息
if (CollectionUtil.isNotEmpty(memberRoleList)) {
for (ProjectVo.RoleInfo memberRole : memberRoleList) {
@@ -213,20 +198,14 @@ public class ProRoleService implements IProRoleService {
//=======================================================================
/**
- * 删除所有角色
- * @param projectId
+ * 删除角色
*/
@Override
- public void deleteRoleByProjectId(Long projectId) {
+ public void deleteRoleByProjectId(Long userId,Long roleId) {
ProRoleExample roleExample = new ProRoleExample();
- roleExample.createCriteria().andProjectIdEqualTo(projectId);
+ roleExample.createCriteria().andProjectIdEqualTo(roleId);
List roleList = proRoleDao.selectByExample(roleExample);
- if(CollectionUtil.isNotEmpty(roleList)){
- //删除任务
- for(ProRole role:roleList){
- taskDetailService.deleteTaskByRoleId(role.getId());
- }
- }
+
}
diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
index 54269222..8e7379c4 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
@@ -12,6 +12,7 @@ import com.ccsens.util.CodeEnum;
import com.ccsens.util.DateUtil;
import com.ccsens.util.WebConstant;
import com.ccsens.util.exception.BaseException;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -20,8 +21,9 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.*;
+@Slf4j
@Service
-@Transactional(propagation = Propagation.REQUIRED)
+@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public class ProTaskDetailService implements IProTaskDetailService {
@Autowired
private IProRoleService proRoleService;
@@ -47,6 +49,8 @@ public class ProTaskDetailService implements IProTaskDetailService {
private ProMemberDao proMemberDao;
@Autowired
private SysProjectDao sysProjectDao;
+ @Autowired
+ private TaskPluginDao taskPluginDao;
@Override
public void saveTaskDetail(ProTaskDetail taskDetail) {
@@ -56,7 +60,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
@Override
public Object getTasksByRoleId(Long currentUserId, Long projectId, Long roleId, Long startTime, Long endTime, Integer process, Integer page, Integer pageSize) throws Exception {
SysProject sysProject = sysProjectDao.selectByPrimaryKey(projectId);
- if(ObjectUtil.isNull(sysProject)){
+ if (ObjectUtil.isNull(sysProject)) {
throw new BaseException(CodeEnum.NOT_PROJECT);
}
startTime = startTime == null ? sysProject.getBeginTime() : startTime;
@@ -64,22 +68,22 @@ public class ProTaskDetailService implements IProTaskDetailService {
Object obj = null;
ProRole role = proRoleDao.selectByPrimaryKey(roleId);
- if(ObjectUtil.isNull(role)){
+ if (ObjectUtil.isNull(role)) {
throw new BaseException(CodeEnum.NOT_ROLE);
}
ProRole parentRole = proRoleDao.selectByPrimaryKey(role.getParentId());
- if(ObjectUtil.isNull(parentRole)){
+ if (ObjectUtil.isNull(parentRole)) {
throw new BaseException(CodeEnum.NOT_ROLE);
}
- if(ObjectUtil.isNotNull(role)) {
+ if (ObjectUtil.isNotNull(role)) {
if (role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.MVP.value)) {
obj = getTaskInfoByMvp(projectId, page, pageSize);
} else if (parentRole.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.PM.value)) {
- obj = getTaskInfoByProjectIdAndPM(currentUserId,projectId, startTime, endTime, process, page, pageSize);
+ obj = getTaskInfoByProjectIdAndPM(currentUserId, projectId, startTime, endTime, process, page, pageSize);
} else if (parentRole.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.Member.value)) {
obj = getTaskInfoByProjectIdAndRoleId(currentUserId, projectId, roleId, startTime, endTime, process, page, pageSize);
}
- }else {
+ } else {
throw new BaseException(CodeEnum.NOT_ROLE);
}
return obj;
@@ -96,46 +100,46 @@ public class ProTaskDetailService implements IProTaskDetailService {
TaskVo.NormalTask normalTask = null;
//1、查找一级任务
SysProject project = sysProjectDao.selectByPrimaryKey(projectId);
- if(endTime < project.getBeginTime() || startTime > project.getEndTime()){
+ if (endTime < project.getBeginTime() || startTime > project.getEndTime()) {
return proTaskInfo;
}
ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample();
proTaskDetailExample.createCriteria().andProjectIdEqualTo(projectId).andLevelEqualTo((byte) 1);
List firstTaskDetailList = taskDetailDao.selectByExample(proTaskDetailExample);
- if(CollectionUtil.isNotEmpty(firstTaskDetailList)){
+ if (CollectionUtil.isNotEmpty(firstTaskDetailList)) {
int sequence = 1;
- for(ProTaskDetail firstTaskDetail:firstTaskDetailList){
+ for (ProTaskDetail firstTaskDetail : firstTaskDetailList) {
normalTask = new TaskVo.NormalTask();
- BeanUtil.copyProperties(firstTaskDetail,normalTask);
+ BeanUtil.copyProperties(firstTaskDetail, normalTask);
normalTask.setDetailId(firstTaskDetail.getId());
normalTask.setId(null);
normalTask.setSequence(sequence);
//查找一级任务下的二级任务
- List secondNormalTaskList = taskDetailDao.selectNormalTaskListByPM(projectId,firstTaskDetail.getId(),startTime,endTime);
- if(CollectionUtil.isNotEmpty(secondNormalTaskList)){
- for(TaskVo.NormalTask task:secondNormalTaskList){
- ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId,task.getId());
- if(ObjectUtil.isNotNull(subTimeMember)){
+ List secondNormalTaskList = taskDetailDao.selectNormalTaskListByPM(projectId, firstTaskDetail.getId(), startTime, endTime);
+ if (CollectionUtil.isNotEmpty(secondNormalTaskList)) {
+ for (TaskVo.NormalTask task : secondNormalTaskList) {
+ ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId, task.getId());
+ if (ObjectUtil.isNotNull(subTimeMember)) {
task.setRealEndTime(subTimeMember.getRealFinishTime());
task.setProcess(subTimeMember.getComplatedStatus());
}
}
- TaskUtil.Task task = TaskUtil.splitTask(secondNormalTaskList,startTime,endTime,process);
- if(CollectionUtil.isNotEmpty(task.getGlobalTask())){
- for(TaskVo.NormalTask global:task.getGlobalTask()){
+ TaskUtil.Task task = TaskUtil.splitTask(secondNormalTaskList, startTime, endTime, process);
+ if (CollectionUtil.isNotEmpty(task.getGlobalTask())) {
+ for (TaskVo.NormalTask global : task.getGlobalTask()) {
globalTask = new TaskVo.GlobalTask();
- BeanUtil.copyProperties(global,globalTask);
+ BeanUtil.copyProperties(global, globalTask);
globalTaskList.add(globalTask);
}
}
- if(CollectionUtil.isNotEmpty(task.getCommonTask())){
+ if (CollectionUtil.isNotEmpty(task.getCommonTask())) {
normalTask.setSecondTasks(new ArrayList<>());
normalTask.getSecondTasks().addAll(task.getCommonTask());
}
}
// if(CollectionUtil.isNotEmpty(normalTask.getSecondTasks())) {
- normalTaskList.add(normalTask);
- sequence++;
+ normalTaskList.add(normalTask);
+ sequence++;
// }
}
}
@@ -148,6 +152,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
proTaskInfo.setNormalTaskList(normalTaskList);
return proTaskInfo;
}
+
/**
* 查看任务 项目成员
*/
@@ -159,28 +164,28 @@ public class ProTaskDetailService implements IProTaskDetailService {
//获取“全体成员”角色
ProRole allMember = proRoleService.getAllMember(projectId);
Long allMemberId = null;
- if(ObjectUtil.isNotNull(allMember)) {
+ if (ObjectUtil.isNotNull(allMember)) {
allMemberId = allMember.getId();
}
//查找该角色的所有任务(全体成员的任务也是这个角色的任务)
- List secondTaskVoList = taskDetailDao.selectTaskByRoleAndAllMembers(projectId, roleId, allMemberId,startTime,endTime);
- if(CollectionUtil.isNotEmpty(secondTaskVoList)){
- for(TaskVo.NormalTask normalTask:secondTaskVoList){
- ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId,normalTask.getId());
- if(ObjectUtil.isNotNull(subTimeMember)){
+ List secondTaskVoList = taskDetailDao.selectTaskByRoleAndAllMembers(projectId, roleId, allMemberId, startTime, endTime);
+ if (CollectionUtil.isNotEmpty(secondTaskVoList)) {
+ for (TaskVo.NormalTask normalTask : secondTaskVoList) {
+ ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId, normalTask.getId());
+ if (ObjectUtil.isNotNull(subTimeMember)) {
normalTask.setProcess(subTimeMember.getComplatedStatus());
normalTask.setRealEndTime(subTimeMember.getRealFinishTime());
}
}
- TaskUtil.Task task = TaskUtil.splitTask(secondTaskVoList,startTime,endTime,process);
- if(CollectionUtil.isNotEmpty(task.getGlobalTask())){
- for(TaskVo.NormalTask global:task.getGlobalTask()){
+ TaskUtil.Task task = TaskUtil.splitTask(secondTaskVoList, startTime, endTime, process);
+ if (CollectionUtil.isNotEmpty(task.getGlobalTask())) {
+ for (TaskVo.NormalTask global : task.getGlobalTask()) {
globalTask = new TaskVo.GlobalTask();
- BeanUtil.copyProperties(global,globalTask);
+ BeanUtil.copyProperties(global, globalTask);
globalTaskList.add(globalTask);
}
}
- if(CollectionUtil.isNotEmpty(task.getCommonTask())){
+ if (CollectionUtil.isNotEmpty(task.getCommonTask())) {
normalTaskList = sortTaskTime(task.getCommonTask());
}
}
@@ -223,6 +228,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
proTaskInfo.setNormalTaskList(theNormalTaskList);
return proTaskInfo;
}
+
private List sortTaskTime(List commonTask) {
List normalTaskList = new ArrayList<>();
List secondTaskVoList = null;
@@ -251,8 +257,8 @@ public class ProTaskDetailService implements IProTaskDetailService {
Long endTime = timeList.get(i + 1);
for (TaskVo.NormalTask secondTaskVo : commonTask) {
- if(secondTaskVo.getTimeStatus() == 1){
- if(secondTaskVo.getBeginTime().longValue() == startTime.longValue()) {
+ if (secondTaskVo.getTimeStatus() == 1) {
+ if (secondTaskVo.getBeginTime().longValue() == startTime.longValue()) {
normalTask = new TaskVo.NormalTask();
BeanUtil.copyProperties(secondTaskVo, normalTask);
normalTask.setEndTime(null);
@@ -262,8 +268,8 @@ public class ProTaskDetailService implements IProTaskDetailService {
}
continue;
}
- if(secondTaskVo.getTimeStatus() == 2){
- if(secondTaskVo.getEndTime().longValue() == endTime.longValue()) {
+ if (secondTaskVo.getTimeStatus() == 2) {
+ if (secondTaskVo.getEndTime().longValue() == endTime.longValue()) {
normalTask = new TaskVo.NormalTask();
BeanUtil.copyProperties(secondTaskVo, normalTask);
normalTask.setBeginTime(null);
@@ -317,14 +323,14 @@ public class ProTaskDetailService implements IProTaskDetailService {
TaskVo.ProTaskInfoByMVP proTaskInfoByMVP = new TaskVo.ProTaskInfoByMVP();
List taskDeliverByMVPList = new ArrayList<>();
TaskVo.TaskDeliverByMVP taskDeliverByMVP = null;
- List firstTasks =new ArrayList<>();
+ List firstTasks = new ArrayList<>();
TaskVo.FirstTask firstProTask = null;
//查找项目下的一级任务
ProTaskDetailExample firstTaskExample = new ProTaskDetailExample();
firstTaskExample.createCriteria().andProjectIdEqualTo(projectId).andVirtualEqualTo((byte) WebConstant.TASK_VIRTUAL.Normal.value).andParentIdEqualTo(0L);
List firstTaskList = taskDetailDao.selectByExample(firstTaskExample);
- if(CollectionUtil.isNotEmpty(firstTaskList)){
- for(ProTaskDetail firstTask:firstTaskList){
+ if (CollectionUtil.isNotEmpty(firstTaskList)) {
+ for (ProTaskDetail firstTask : firstTaskList) {
taskDeliverByMVPList = new ArrayList<>();
//查找项目下所有的二级任务
ProTaskDetailExample taskExample = new ProTaskDetailExample();
@@ -370,39 +376,39 @@ public class ProTaskDetailService implements IProTaskDetailService {
}
/**
- *通过任务id查任务详情
+ * 通过任务id查任务详情
*/
@Override
public TaskVo.NormalTask getTaskInfoByTaskId(Long currentUserId, Long projectId, Long taskId) throws Exception {
ProTaskSubTime subTime = taskSubTimeDao.selectByPrimaryKey(taskId);
TaskVo.NormalTask taskDetail = null;
- if(ObjectUtil.isNotNull(subTime)) {
- taskDetail = taskDetailDao.selectTaskByTaskId(subTime.getId(),subTime.getTaskDetailId());
+ if (ObjectUtil.isNotNull(subTime)) {
+ taskDetail = taskDetailDao.selectTaskByTaskId(subTime.getId(), subTime.getTaskDetailId());
//修改任务的完成状态
- ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId,taskDetail.getId());
- if(ObjectUtil.isNotNull(subTimeMember)){
+ ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId, taskDetail.getId());
+ if (ObjectUtil.isNotNull(subTimeMember)) {
taskDetail.setProcess(subTimeMember.getComplatedStatus());
taskDetail.setRealEndTime(subTimeMember.getRealFinishTime());
}
//添加项目信息和插件信息
- normalTaskAddPlugin(currentUserId,subTime.getTaskDetailId(),taskDetail);
+ normalTaskAddPlugin(currentUserId, subTime.getTaskDetailId(), taskDetail);
if (ObjectUtil.isNotNull(taskDetail)) {
List groupTaskList = new ArrayList<>();
groupTaskList = taskDetailDao.selectTaskByParentId(projectId, taskDetail.getDetailId());
if (CollectionUtil.isNotEmpty(groupTaskList)) {
- for(TaskVo.NormalTask groupTask:groupTaskList){
+ for (TaskVo.NormalTask groupTask : groupTaskList) {
//修改任务的完成状态
- ProSubTimeMember proSubTimeMember = getProcessByUserIdAndTask(currentUserId,groupTask.getId());
- if(ObjectUtil.isNotNull(proSubTimeMember)){
+ ProSubTimeMember proSubTimeMember = getProcessByUserIdAndTask(currentUserId, groupTask.getId());
+ if (ObjectUtil.isNotNull(proSubTimeMember)) {
groupTask.setProcess(proSubTimeMember.getComplatedStatus());
groupTask.setRealEndTime(proSubTimeMember.getRealFinishTime());
}
//添加项目信息和插件信息
- normalTaskAddPlugin(currentUserId,groupTask.getDetailId(),groupTask);
+ normalTaskAddPlugin(currentUserId, groupTask.getDetailId(), groupTask);
//修改返回时子任务的名字(“任务名+(xx和XX)”)
ProTaskDetail proTaskDetail = taskDetailDao.selectByPrimaryKey(groupTask.getDetailId());
- if(proTaskDetail.getAllMember()==0){
- groupTask.setName(updateSubTaskName(groupTask.getDetailId(),groupTask.getName()));
+ if (proTaskDetail.getAllMember() == 0) {
+ groupTask.setName(updateSubTaskName(groupTask.getDetailId(), groupTask.getName()));
}
}
@@ -413,37 +419,39 @@ public class ProTaskDetailService implements IProTaskDetailService {
}
return taskDetail;
}
- private void normalTaskAddPlugin(Long userId,Long taskId,TaskVo.NormalTask normalTask) throws Exception {
+
+ private void normalTaskAddPlugin(Long userId, Long taskId, TaskVo.NormalTask normalTask) throws Exception {
ProTaskDetail task = taskDetailDao.selectByPrimaryKey(taskId);
//添加项目信息
SysProject project = sysProjectDao.selectByPrimaryKey(task.getProjectId());
- if(ObjectUtil.isNotNull(project)){
+ if (ObjectUtil.isNotNull(project)) {
normalTask.setProjectId(project.getId());
normalTask.setProjectName(project.getName());
}
ProRole role = proRoleDao.selectByPrimaryKey(normalTask.getExecutorRole());
- if(ObjectUtil.isNotNull(role)){
+ if (ObjectUtil.isNotNull(role)) {
normalTask.setExecutorRoleName(role.getName());
}
//添加插件
- List pluginVoList = pluginService.getPluginByTask(task.getId(),userId);
+ List pluginVoList = pluginService.getPluginByTask(task.getId(), userId);
normalTask.setPlugins(new ArrayList<>());
normalTask.getPlugins().addAll(pluginVoList);
}
+
/**
* 修改返回时子任务的名字 格式:“任务名+(xx和XX)”
*/
- private String updateSubTaskName(Long taskId,String taskName){
+ private String updateSubTaskName(Long taskId, String taskName) {
String name = taskName + "(";
ProTaskMemberExample taskMemberExample = new ProTaskMemberExample();
taskMemberExample.createCriteria().andTaskDetailIdEqualTo(taskId);
List taskMemberList = taskMemberDao.selectByExample(taskMemberExample);
- if(CollectionUtil.isNotEmpty(taskMemberList)){
- for(int i = 0;i < taskMemberList.size();i++){
+ if (CollectionUtil.isNotEmpty(taskMemberList)) {
+ for (int i = 0; i < taskMemberList.size(); i++) {
ProMember member = proMemberDao.selectByPrimaryKey(taskMemberList.get(i).getMemberId());
- if(ObjectUtil.isNotNull(member)){
+ if (ObjectUtil.isNotNull(member)) {
name += member.getNickname();
- if(i != taskMemberList.size()-1){
+ if (i != taskMemberList.size() - 1) {
name += "和";
}
}
@@ -466,19 +474,19 @@ public class ProTaskDetailService implements IProTaskDetailService {
//获取日期的开始结束时间
Long startMillisTime = null;
Long endMillisTime = null;
- Map timeMap = null;
- if(StrUtil.isNotEmpty(start)){
+ Map timeMap = null;
+ if (StrUtil.isNotEmpty(start)) {
timeMap = DateUtil.projectFormatDateTime(start);
startMillisTime = timeMap.get("startMillisTime");
}
- if(StrUtil.isNotEmpty(end)){
+ if (StrUtil.isNotEmpty(end)) {
timeMap = DateUtil.projectFormatDateTime(start);
endMillisTime = timeMap.get("endMillisTime");
}
//获取该用户关注的项目
List projectList = attentionService.findProjectIdByUserId(currentUserId);
- if(CollectionUtil.isNotEmpty(projectList)){
- if(StrUtil.isNotEmpty(role)) {
+ if (CollectionUtil.isNotEmpty(projectList)) {
+ if (StrUtil.isNotEmpty(role)) {
switch (role) {
case "创建者":
for (SysProject project : projectList) {
@@ -503,7 +511,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
default:
break;
}
- }else {
+ } else {
for (SysProject project : projectList) {
List taskList = getTaskInfoByProjectIdAndUserId(project, currentUserId, startMillisTime, endMillisTime);
if (CollectionUtil.isNotEmpty(taskList)) {
@@ -560,36 +568,37 @@ public class ProTaskDetailService implements IProTaskDetailService {
taskCheckList.setPageInfo(pageInfo);
return taskCheckList;
}
+
private List getTaskInfoByProjectIdAndUserId(SysProject project, Long userId,
Long startTime, Long endTime) throws Exception {
List normalTaskList = new ArrayList<>();
//获取用户的角色
- List roleList = proRoleService.getProRoleByProjectIdAndUserId(project.getId(),userId);
+ List roleList = proRoleService.getProRoleByProjectIdAndUserId(project.getId(), userId);
//获取“全体成员”角色
ProRole allMember = proRoleService.getAllMember(project.getId());
Long allMemberId = null;
- if(ObjectUtil.isNotNull(allMember)) {
+ if (ObjectUtil.isNotNull(allMember)) {
allMemberId = allMember.getId();
}
- if(CollectionUtil.isNotEmpty(roleList)) {
- for(ProRole role:roleList) {
+ if (CollectionUtil.isNotEmpty(roleList)) {
+ for (ProRole role : roleList) {
SysProject sysProject = sysProjectDao.selectByPrimaryKey(role.getProjectId());
List taskList =
taskDetailDao.selectTaskByRoleAndAllMembers(project.getId(), role.getId(), allMemberId, startTime, endTime);
- if(CollectionUtil.isNotEmpty(taskList)) {
- for(TaskVo.NormalTask normalTask:taskList){
+ if (CollectionUtil.isNotEmpty(taskList)) {
+ for (TaskVo.NormalTask normalTask : taskList) {
//修改任务的完成状态
- ProSubTimeMember proSubTimeMember = getProcessByUserIdAndTask(userId,normalTask.getId());
- if(ObjectUtil.isNotNull(proSubTimeMember)){
+ ProSubTimeMember proSubTimeMember = getProcessByUserIdAndTask(userId, normalTask.getId());
+ if (ObjectUtil.isNotNull(proSubTimeMember)) {
normalTask.setProcess(proSubTimeMember.getComplatedStatus());
normalTask.setRealEndTime(proSubTimeMember.getRealFinishTime());
}
ProRole proRole = proRoleDao.selectByPrimaryKey(normalTask.getExecutorRole());
- if(ObjectUtil.isNotNull(sysProject)) {
+ if (ObjectUtil.isNotNull(sysProject)) {
normalTask.setProjectId(sysProject.getId());
normalTask.setProjectName(sysProject.getName());
}
- if(ObjectUtil.isNotNull(proRole)){
+ if (ObjectUtil.isNotNull(proRole)) {
normalTask.setExecutorRoleName(proRole.getName());
}
}
@@ -602,7 +611,6 @@ public class ProTaskDetailService implements IProTaskDetailService {
/**
* 项目内的任务清单
- *
*/
@Override
public TaskVo.TaskCheckList selectTaskListByProject(Long projectId, Long currentUserId, Integer page, Integer pageSize,
@@ -614,18 +622,18 @@ public class ProTaskDetailService implements IProTaskDetailService {
//获取日期的开始结束时间
Long startMillisTime = null;
Long endMillisTime = null;
- Map timeMap = null;
- if(StrUtil.isNotEmpty(start)){
+ Map timeMap = null;
+ if (StrUtil.isNotEmpty(start)) {
timeMap = DateUtil.projectFormatDateTime(start);
startMillisTime = timeMap.get("startMillisTime");
}
- if(StrUtil.isNotEmpty(end)){
+ if (StrUtil.isNotEmpty(end)) {
timeMap = DateUtil.projectFormatDateTime(start);
endMillisTime = timeMap.get("endMillisTime");
}
//获取项目
SysProject sysProject = sysProjectDao.selectByPrimaryKey(projectId);
- if(ObjectUtil.isNotNull(sysProject)) {
+ if (ObjectUtil.isNotNull(sysProject)) {
List taskList = getTaskInfoByProjectIdAndUserId(sysProject, currentUserId, startMillisTime, endMillisTime);
if (CollectionUtil.isNotEmpty(taskList)) {
normalTaskList.addAll(taskList);
@@ -684,7 +692,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
*/
@Override
public List getTaskDetailByKey(Long currentUserId, Long projectId, String key) {
- List taskDetailByKeyList = taskDetailDao.selectTaskByKey(currentUserId,projectId,key);
+ List taskDetailByKeyList = taskDetailDao.selectTaskByKey(currentUserId, projectId, key);
return taskDetailByKeyList;
}
@@ -692,8 +700,8 @@ public class ProTaskDetailService implements IProTaskDetailService {
* 查询子任务最早的一条
*/
@Override
- public TaskVo.NormalTask selectTaskByParentId(Long parentId, Long startTime, Long endTime){
- TaskVo.NormalTask normalTask = taskDetailDao.selectTaskByParentIdAndTime(parentId,startTime,endTime);
+ public TaskVo.NormalTask selectTaskByParentId(Long parentId, Long startTime, Long endTime) {
+ TaskVo.NormalTask normalTask = taskDetailDao.selectTaskByParentIdAndTime(parentId, startTime, endTime);
return normalTask;
}
@@ -704,17 +712,17 @@ public class ProTaskDetailService implements IProTaskDetailService {
ProSubTimeMember subTimeMember = null;
ProTaskSubTime subTime = taskSubTimeDao.selectByPrimaryKey(subTimeId);
ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(subTime.getTaskDetailId());
- if(taskDetail.getFinishNeedAll()==0){
+ if (taskDetail.getFinishNeedAll() == 0) {
ProSubTimeMemberExample subTimeMemberExample = new ProSubTimeMemberExample();
subTimeMemberExample.createCriteria().andTaskSubTimeIdEqualTo(subTimeId).andComplatedStatusEqualTo(2);
subTimeMemberExample.setOrderByClause("real_finish_time DESC");
List subTimeMemberList = proSubTimeMemberDao.selectByExample(subTimeMemberExample);
- if(CollectionUtil.isNotEmpty(subTimeMemberList)){
+ if (CollectionUtil.isNotEmpty(subTimeMemberList)) {
subTimeMember = subTimeMemberList.get(0);
}
- }else {
+ } else {
//查找此用户在任务下的成员
- ProMember porMember = proMemberService.selectByUserId(userId,taskDetail.getProjectId());
+ ProMember porMember = proMemberService.selectByUserId(userId, taskDetail.getProjectId());
//该用户是否是任务的负责人
ProRole role = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole());
Boolean isBelongRole = proMemberService.userIsBelongRole(userId, role.getId());
@@ -726,7 +734,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
if (CollectionUtil.isNotEmpty(subTimeMemberList)) {
subTimeMember = subTimeMemberList.get(0);
}
- }else {
+ } else {
//查找任务负责人下的所有成员
List memberList = proMemberService.selectByRole(taskDetail.getExecutorRole());
if (CollectionUtil.isNotEmpty(memberList)) {
@@ -750,19 +758,45 @@ public class ProTaskDetailService implements IProTaskDetailService {
//===================================================================
/**
- * 删除角色下的所有任务相关(taskDetail,taskSubTime,taskMember,plugin)
- * @param roleId
+ * 删除任务和所有相关信息
*/
@Override
- public void deleteTaskByRoleId(Long roleId) {
-// taskDetailDao.deleteTaskByRoleId(roleId);
+ public void deleteTask(Long currentUserId, Long taskId) {
+ //检查id是详情id还是subTimeId
+ ProTaskDetail taskDetail = null;
+ ProTaskSubTime subTime = taskSubTimeDao.selectByPrimaryKey(taskId);
+ if (ObjectUtil.isNotNull(subTime)) {
+ taskDetail = taskDetailDao.selectByPrimaryKey(subTime.getTaskDetailId());
+ } else {
+ taskDetail = taskDetailDao.selectByPrimaryKey(taskId);
+ }
+ //本用户在项目中的角色
+ List proRoles = proRoleService.getProRoleByProjectIdAndUserId(taskDetail.getProjectId(), currentUserId);
+ //用户在项目中的最高权限
+ int power = proRoleService.selectPowerByRoleName(proRoles);
+ if (power > 1) {
+ if (ObjectUtil.isNotNull(taskDetail)) {
+ deleteTaskByTaskId(taskDetail.getId());
+ }
+ } else {
+ throw new BaseException(CodeEnum.NOT_POWER);
+ }
}
- /**
- * 删除任务和所有相关信息
- */
- private void deleteTaskById(Long taskId){
- //删除交付物
+ @Override
+ public void deleteTaskByTaskId(Long taskId) {
+ //1、删除交付物相关信息
taskDeliverService.deleteDeliverByTaskId(taskId);
+ //2、删除插件
+ ProTaskPluginExample pluginExample = new ProTaskPluginExample();
+ pluginExample.createCriteria().andTaskDetailIdEqualTo(taskId);
+ taskPluginDao.deleteByExample(pluginExample);
+ //3、删除任务与成员关联表
+ ProTaskMemberExample taskMemberExample = new ProTaskMemberExample();
+ taskMemberExample.createCriteria().andTaskDetailIdEqualTo(taskId);
+ taskMemberDao.deleteByExample(taskMemberExample);
+ //4、删除任务、子任务和任务完成表
+ taskDetailDao.selectTaskByDetailId(taskId);
}
+
}
diff --git a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java b/tall/src/main/java/com/ccsens/tall/service/ProjectService.java
index 4d102da4..09da1fe2 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ProjectService.java
@@ -15,6 +15,7 @@ import com.ccsens.util.cron.CronConstant;
import com.ccsens.util.cron.NatureToDate;
import com.ccsens.util.exception.BaseException;
import com.github.pagehelper.PageHelper;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -23,8 +24,9 @@ import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.util.*;
+@Slf4j
@Service
-@Transactional(propagation = Propagation.REQUIRED)
+@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
public class ProjectService implements IProjectService {
@Autowired
private SysProjectDao sysProjectDao;
@@ -356,7 +358,6 @@ public class ProjectService implements IProjectService {
return sysProjectDao.getProjectByKey(currentUserId,key);
}
-
//===========================================================================
/**
* 删除项目
@@ -372,16 +373,26 @@ public class ProjectService implements IProjectService {
SysProject project = sysProjectDao.selectByPrimaryKey(projectId);
project.setRecStatus((byte) 1);
sysProjectDao.updateByPrimaryKeySelective(project);
+ //彻底删除项目
+
}else {
throw new BaseException(CodeEnum.NOT_POWER);
}
}
+ /**
+ * 删除项目
+ */
+ private void deleteProjectById(Long projectId){
+
+ }
/**
* 复制项目
*/
@Override
- public void copyProject(Long userId ,Long projectId) {
+ public ProjectVo.ProjectInfo copyProject(Long userId ,Long projectId) {
+ ProjectVo.ProjectInfo projectInfo = new ProjectVo.ProjectInfo();
+
SysProject oldProject = sysProjectDao.selectByPrimaryKey(projectId);
SysProject newProject = new SysProject();
if(ObjectUtil.isNotNull(oldProject)){
@@ -400,6 +411,18 @@ public class ProjectService implements IProjectService {
}else {
throw new BaseException(CodeEnum.NOT_PROJECT);
}
+ //返回参数
+ projectInfo.setId(newProject.getId());
+ projectInfo.setName(newProject.getName());
+ projectInfo.setAddress(newProject.getAddress());
+ projectInfo.setBeginTime(newProject.getBeginTime());
+ projectInfo.setEndTime(newProject.getEndTime());
+ projectInfo.setTotalDuration(newProject.getEndTime() - newProject.getBeginTime());
+ if (ObjectUtil.isNotNull(projectInfo)) {
+ projectInfo.setCreator(true);
+ }
+
+ return projectInfo;
}
/**
* 复制角色
@@ -521,6 +544,10 @@ public class ProjectService implements IProjectService {
}
}
}
+
+ /**
+ * 根据时间分解任务
+ */
private void taskToSubTime(ProTaskDetail taskDetail){
//cycle为空,只加一条数据
if(ObjectUtil.isNotNull(taskDetail)) {
diff --git a/tall/src/main/java/com/ccsens/tall/service/SysPluginService.java b/tall/src/main/java/com/ccsens/tall/service/SysPluginService.java
index e9c508ec..64fcb9d2 100644
--- a/tall/src/main/java/com/ccsens/tall/service/SysPluginService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/SysPluginService.java
@@ -2,12 +2,17 @@ package com.ccsens.tall.service;
import com.ccsens.tall.bean.vo.PluginVo;
import com.ccsens.tall.persist.dao.SysPluginDao;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
+@Slf4j
@Service
+@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
public class SysPluginService implements ISysPluginService{
@Autowired
private SysPluginDao sysPluginDao;
diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
index 99fbf51b..63d3b193 100644
--- a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
@@ -16,6 +16,7 @@ import com.ccsens.tall.bean.vo.TaskVo;
import com.ccsens.tall.persist.dao.*;
import com.ccsens.util.*;
import com.ccsens.util.exception.BaseException;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -24,8 +25,9 @@ import org.springframework.transaction.annotation.Transactional;
import java.io.File;
import java.util.*;
+@Slf4j
@Service
-@Transactional(propagation = Propagation.REQUIRED)
+@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
public class TaskDeliverService implements ITaskDeliverService {
@Autowired
private TaskDeliverDao taskDeliverDao;
@@ -265,9 +267,6 @@ public class TaskDeliverService implements ITaskDeliverService {
/**
* 判断id是taskId还是subTimeId
- *
- * @param id
- * @return subTimeId
*/
private Long isTaskOrSubTime(Long id) {
Long subTimeId = null;
@@ -292,11 +291,6 @@ public class TaskDeliverService implements ITaskDeliverService {
/**
* 获取任务下所有交付物的信息
- *
- * @param currentUserId
- * @param
- * @return
- * @throws Exception
*/
@Override
public List selectTaskDeliver(Long currentUserId, Long taskId) throws Exception {
@@ -383,10 +377,6 @@ public class TaskDeliverService implements ITaskDeliverService {
/**
* 查看单个交付物的信息
- *
- * @param currentUserId
- * @param deliverId
- * @return
*/
@Override
public DeliverVo.DeliverInfo selectDeliverInfo(Long currentUserId, Long deliverId, Long taskId) throws Exception {
@@ -595,15 +585,6 @@ public class TaskDeliverService implements ITaskDeliverService {
/**
* 交付物清单
- *
- * @param currentUserId
- * @param page
- * @param pageSize
- * @param key
- * @param start
- * @param end
- * @return
- * @throws Exception
*/
@Override
public DeliverVo.DeliverFileList selectDeliverList(Long currentUserId, Integer page, Integer pageSize, String
@@ -691,10 +672,6 @@ public class TaskDeliverService implements ITaskDeliverService {
/**
* 删除交付物(修改状态变成历史项目)
- *
- * @param currentUserId
- * @param deliverId
- * @param taskId
*/
@Override
public void deleteDeliver(Long currentUserId, Long deliverId, Long taskId) throws Exception {
@@ -773,9 +750,34 @@ public class TaskDeliverService implements ITaskDeliverService {
}
//=========================================================
+
+ /**
+ * 删除任务下的交付物(彻底删除)
+ * @param taskId
+ */
@Override
public void deleteDeliverByTaskId(Long taskId) {
- //查找已上传的文件
+ //查询交付物
+ ProTaskDeliverExample deliverExample = new ProTaskDeliverExample();
+ deliverExample.createCriteria().andTaskDetailIdEqualTo(taskId);
+ List deliverList = taskDeliverDao.selectByExample(deliverExample);
+ if(CollectionUtil.isNotEmpty(deliverList)){
+ for(ProTaskDeliver deliver : deliverList){
+ ProTaskDeliverPostLogExample postLogExample = new ProTaskDeliverPostLogExample();
+ postLogExample.createCriteria().andDeliverIdEqualTo(deliver.getId());
+ List postLogList = deliverPostLogDao.selectByExample(postLogExample);
+ if(CollectionUtil.isNotEmpty(postLogList)){
+ for(ProTaskDeliverPostLog deliverPostLog : postLogList){
+ //删除文件
+ SysCommitedFile file = commitedFileDao.selectByPrimaryKey(deliverPostLog.getFileId());
+ deleteFile(file.getPath());
+ commitedFileDao.deleteByPrimaryKey(deliverPostLog.getId());
+ //删除交付物和文件、检查人的关联信息
+ taskDeliverDao.deletePostLogCheckerByPostLogId(deliverPostLog.getId());
+ }
+ }
+ }
+ }
}
diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskMemberService.java b/tall/src/main/java/com/ccsens/tall/service/TaskMemberService.java
index 7a0ea503..3355f9a2 100644
--- a/tall/src/main/java/com/ccsens/tall/service/TaskMemberService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/TaskMemberService.java
@@ -2,13 +2,15 @@ package com.ccsens.tall.service;
import com.ccsens.tall.bean.po.ProTaskMember;
import com.ccsens.tall.persist.dao.TaskMemberDao;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+@Slf4j
@Service
-@Transactional(propagation = Propagation.REQUIRED)
+@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
public class TaskMemberService implements ITaskMemberService{
@Autowired
private TaskMemberDao taskMemberDao;
diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java b/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java
index 6feb06af..4a61d34c 100644
--- a/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java
@@ -6,6 +6,7 @@ import com.ccsens.tall.bean.vo.TaskVo;
import com.ccsens.tall.persist.dao.SysPluginDao;
import com.ccsens.tall.persist.dao.TaskDetailDao;
import com.ccsens.tall.persist.dao.TaskPluginDao;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -14,8 +15,9 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
+@Slf4j
@Service
-@Transactional(propagation = Propagation.REQUIRED)
+@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
public class TaskPluginService implements ITaskPluginService{
@Autowired
private TaskPluginDao taskPluginDao;
diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java b/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java
index 0166957e..06a07319 100644
--- a/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java
@@ -15,6 +15,7 @@ import com.ccsens.util.WebConstant;
import com.ccsens.util.cron.CronConstant;
import com.ccsens.util.cron.NatureToDate;
import com.ccsens.util.exception.BaseException;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -23,8 +24,9 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
+@Slf4j
@Service
-@Transactional(propagation = Propagation.REQUIRED)
+@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
public class TaskSubTimeService implements ITaskSubTimeService {
@Autowired
private TaskSubTimeDao taskSubTimeDao;
diff --git a/tall/src/main/java/com/ccsens/tall/service/UserAttentionService.java b/tall/src/main/java/com/ccsens/tall/service/UserAttentionService.java
index a16230bb..abb24637 100644
--- a/tall/src/main/java/com/ccsens/tall/service/UserAttentionService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/UserAttentionService.java
@@ -7,6 +7,7 @@ import com.ccsens.tall.bean.po.UserAttention;
import com.ccsens.tall.bean.po.UserAttentionExample;
import com.ccsens.tall.persist.dao.SysProjectDao;
import com.ccsens.tall.persist.dao.UserAttentionDao;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -15,8 +16,9 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
+@Slf4j
@Service
-@Transactional(propagation = Propagation.REQUIRED)
+@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
public class UserAttentionService implements IUserAttentionService{
@Autowired
private UserAttentionDao attentionDao;
diff --git a/tall/src/main/java/com/ccsens/tall/service/UserService.java b/tall/src/main/java/com/ccsens/tall/service/UserService.java
index fdc35350..b260524b 100644
--- a/tall/src/main/java/com/ccsens/tall/service/UserService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/UserService.java
@@ -26,7 +26,7 @@ import java.util.Map;
@Slf4j
@Service
-@Transactional(propagation = Propagation.REQUIRED)
+@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
public class UserService implements IUserService {
@Autowired
private SysUserDao userDao;
diff --git a/tall/src/main/java/com/ccsens/tall/service/proLogService.java b/tall/src/main/java/com/ccsens/tall/service/proLogService.java
index e9dd9e3a..88674ef3 100644
--- a/tall/src/main/java/com/ccsens/tall/service/proLogService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/proLogService.java
@@ -3,10 +3,15 @@ package com.ccsens.tall.service;
import cn.hutool.core.lang.Snowflake;
import com.ccsens.tall.bean.po.ProLog;
import com.ccsens.tall.persist.dao.ProLogDao;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+@Slf4j
@Service
+@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
public class proLogService implements IProLogService{
@Autowired
private ProLogDao proLogDao;
diff --git a/tall/src/main/java/com/ccsens/tall/web/DebugController.java b/tall/src/main/java/com/ccsens/tall/web/DebugController.java
new file mode 100644
index 00000000..408e78c6
--- /dev/null
+++ b/tall/src/main/java/com/ccsens/tall/web/DebugController.java
@@ -0,0 +1,31 @@
+package com.ccsens.tall.web;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.ccsens.util.JsonResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+@Api(tags = "DEBUG" , description = "DebugController | ")
+@RestController
+@RequestMapping("/debug")
+public class DebugController {
+
+ @ApiOperation(value = "/测试",notes = "")
+ @ApiImplicitParams({
+ })
+ @RequestMapping(value="",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
+ public JsonResponse getSmsCode(HttpServletRequest request) throws Exception {
+
+ return JsonResponse.newInstance().ok("测试");
+ }
+
+
+
+}
diff --git a/tall/src/main/java/com/ccsens/tall/web/ProjectController.java b/tall/src/main/java/com/ccsens/tall/web/ProjectController.java
index 7162ee8a..94c72916 100644
--- a/tall/src/main/java/com/ccsens/tall/web/ProjectController.java
+++ b/tall/src/main/java/com/ccsens/tall/web/ProjectController.java
@@ -196,10 +196,19 @@ public class ProjectController {
@ApiImplicitParam(name = "projectId", value = "项目id", required = true, paramType = "query")
})
@RequestMapping(value = "copy", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
- public JsonResponse addProject(HttpServletRequest request,@RequestParam(required = false) Long projectId) throws Exception {
+ public JsonResponse addProject(HttpServletRequest request,@RequestParam(required = false) Long projectId) throws Exception {
Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
+ ProjectVo.ProjectInfo projectInfo = projectService.copyProject(currentUserId,projectId);
+ return JsonResponse.newInstance().ok(projectInfo);
+ }
- projectService.copyProject(currentUserId,projectId);
+ @ApiOperation(value = "修改项目信息", notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "projectId", value = "项目id", required = true, paramType = "query")
+ })
+ @RequestMapping(value = "update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+ public JsonResponse updateProject(HttpServletRequest request,@RequestParam(required = false) Long projectId) throws Exception {
+ Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
return JsonResponse.newInstance().ok();
}
}
diff --git a/tall/src/main/java/com/ccsens/tall/web/TaskController.java b/tall/src/main/java/com/ccsens/tall/web/TaskController.java
index 2e9e2754..b0084d93 100644
--- a/tall/src/main/java/com/ccsens/tall/web/TaskController.java
+++ b/tall/src/main/java/com/ccsens/tall/web/TaskController.java
@@ -94,6 +94,19 @@ public class TaskController {
return JsonResponse.newInstance().ok(taskCheckList);
}
+ @ApiOperation(value = "任务模糊搜索", notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "projectId", value = "项目id 可以为null", required = true, paramType = "query"),
+ @ApiImplicitParam(name = "key", value = "关键词", required = true, paramType = "query")
+ })
+ @RequestMapping(value = "key", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
+ public JsonResponse> getProjectByKey(HttpServletRequest request, @RequestParam(required = false)Long projectId, String key) throws Exception {
+
+ Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
+ List taskDetailByKeyList = taskDetailService.getTaskDetailByKey(currentUserId,projectId,key);
+ return JsonResponse.newInstance().ok(taskDetailByKeyList);
+ }
+
//==============================================================
@ApiOperation(value = "添加清单(任务)",notes = "")
@@ -108,17 +121,16 @@ public class TaskController {
return JsonResponse.newInstance().ok(normalTask);
}
- @ApiOperation(value = "任务模糊搜索", notes = "")
+ @ApiOperation(value = "删除任务",notes = "")
@ApiImplicitParams({
- @ApiImplicitParam(name = "projectId", value = "项目id 可以为null", required = true, paramType = "query"),
- @ApiImplicitParam(name = "key", value = "关键词", required = true, paramType = "query")
+ @ApiImplicitParam(name = "taskId", value = "任务id", required = true, paramType = "query")
})
- @RequestMapping(value = "key", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
- public JsonResponse> getProjectByKey(HttpServletRequest request, @RequestParam(required = false)Long projectId, String key) throws Exception {
-
- Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
- List taskDetailByKeyList = taskDetailService.getTaskDetailByKey(currentUserId,projectId,key);
- return JsonResponse.newInstance().ok(taskDetailByKeyList);
+ @RequestMapping(value = "", method = RequestMethod.DELETE, produces = {"application/json;charset=UTF-8"})
+ public JsonResponse deleteTask(HttpServletRequest request,
+ @RequestParam(required = false)Long taskId) throws Exception {
+ Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
+ taskDetailService.deleteTask(currentUserId,taskId);
+ return JsonResponse.newInstance().ok();
}
}
diff --git a/tall/src/main/java/com/ccsens/tall/web/UserController.java b/tall/src/main/java/com/ccsens/tall/web/UserController.java
index 2bc638b4..88d432a0 100644
--- a/tall/src/main/java/com/ccsens/tall/web/UserController.java
+++ b/tall/src/main/java/com/ccsens/tall/web/UserController.java
@@ -9,12 +9,12 @@ import com.ccsens.tall.bean.vo.UserVo;
import com.ccsens.tall.exception.UserLoginException;
import com.ccsens.tall.service.IUserService;
import com.ccsens.util.JsonResponse;
+import com.ccsens.util.JwtUtil;
import com.ccsens.util.WebConstant;
import io.jsonwebtoken.Claims;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.jsonwebtoken.ExpiredJwtException;
+import io.jsonwebtoken.SignatureException;
+import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -30,12 +30,7 @@ import java.util.Map;
public class UserController {
@Autowired
private IUserService userService;
-// @Autowired
-// private IProjectService projectService;
-// @Autowired
-// private ITaskService taskService;
-// @Autowired
-// private IDeliverService deliverService;
+
@ApiOperation(value = "/用户登录", notes = "")
@ApiImplicitParams({
@@ -101,9 +96,6 @@ public class UserController {
} else {
return JsonResponse.newInstance().fail("登陆信息不正确.");
}
-
-// UserVo.TokenBean tokenBean = userService.userManageSignin(dto);
-// return JsonResponse.newInstance().ok(tokenBean);
}
@ApiOperation(value = "/发送验证码", notes = "")
@@ -197,6 +189,33 @@ public class UserController {
return JsonResponse.newInstance().ok();
}
+ @ApiOperation(value = "根据token获取userId",notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name="token",value = "token",required = true,paramType = "query")
+ })
+ @RequestMapping(value = "token",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
+ public JsonResponse getNodeMessage(HttpServletRequest request, @RequestParam(required = true) String token) throws Exception {
+ //验证token是否有效
+ UserVo.TokenToUserId tokenToUserId = new UserVo.TokenToUserId();
+ Claims claims = null;
+ boolean flag = false;
+ if (token != null) {
+ try {
+ claims = JwtUtil.parseJWT(token, WebConstant.JWT_ACCESS_TOKEN_SECERT);
+ flag = true;
+ }catch(SignatureException e){
+ flag = false;
+ }catch(ExpiredJwtException e){
+ flag = false;
+ }catch(Exception e){
+ flag = false;
+ }
+ }
+ if(flag){
+ tokenToUserId.setId(Long.valueOf(claims.getSubject()));
+ }
+ return JsonResponse.newInstance().ok(tokenToUserId);
+ }
}
diff --git a/tall/src/main/resources/mapper_dao/DeliverDao.xml b/tall/src/main/resources/mapper_dao/DeliverDao.xml
index 33312cef..c63c4299 100644
--- a/tall/src/main/resources/mapper_dao/DeliverDao.xml
+++ b/tall/src/main/resources/mapper_dao/DeliverDao.xml
@@ -154,4 +154,17 @@
deliver_id = #{deliverId}
group by checker_id
+
+
+
+
+ DELETE
+ p,
+ pc
+ FROM
+ t_pro_task_deliver_post_log p join t_pro_task_deliver_post_log_checker pc
+ ON p.id = pc.deliver_post_log_id
+ WHERE
+ p.id = #{postLogId}
+
\ No newline at end of file
diff --git a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml
index 102df3e1..785f74e7 100644
--- a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml
+++ b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml
@@ -249,5 +249,18 @@
ORDER BY s.begin_time DESC
limit 0,1
+
+
+ DELETE
+ d,
+ s,
+ sm
+ FROM
+ t_pro_task_detail d LEFT JOIN
+ t_pro_task_sub_time s ON s.task_detail_id = d.id LEFT JOIN
+ t_pro_sub_time_member sm ON sm.task_sub_time_id = s.id
+ WHERE
+ d.id = #{detailId}
+
\ No newline at end of file
diff --git a/util/src/main/java/com/ccsens/util/cron/NatureToDate.java b/util/src/main/java/com/ccsens/util/cron/NatureToDate.java
index 43797c6b..bf7b6aa5 100644
--- a/util/src/main/java/com/ccsens/util/cron/NatureToDate.java
+++ b/util/src/main/java/com/ccsens/util/cron/NatureToDate.java
@@ -21,14 +21,14 @@ public class NatureToDate {
Date start = sdf.parse("2019-11-1 8:00:00");
Date end = sdf.parse("2019-11-30 8:00:00");
- System.out.println("每周一:" + generateDates("每周一", start, end));
- System.out.println("每周二:" + generateDates("每周二", start, end));
- System.out.println("每周三:" + generateDates("每周三", start, end));
- System.out.println("每周四:" + generateDates("每周四", start, end));
- System.out.println("每周五:" + generateDates("每周五", start, end));
- System.out.println("每周六:" + generateDates("每周六", start, end));
- System.out.println("每周天:" + generateDates("每周天", start, end));
- System.out.println("每周日:" + generateDates("每周日", start, end));
+// System.out.println("每周一:" + generateDates("每周一", start, end));
+// System.out.println("每周二:" + generateDates("每周二", start, end));
+// System.out.println("每周三:" + generateDates("每周三", start, end));
+// System.out.println("每周四:" + generateDates("每周四", start, end));
+// System.out.println("每周五:" + generateDates("每周五", start, end));
+// System.out.println("每周六:" + generateDates("每周六", start, end));
+// System.out.println("每周天:" + generateDates("每周天", start, end));
+// System.out.println("每周日:" + generateDates("每周日", start, end));
// System.out.println("每月15号:" + generateDates("每月15号", start, end));
// System.out.println("每月31号:" + generateDates("每月31号", start, end));
// System.out.println("每天:" + generateDates("每天", start, end));
@@ -40,7 +40,7 @@ public class NatureToDate {
// System.out.println("入职第一月:" + generateDates("入职第一月", start, end));
// System.out.println("入职第一年:" + generateDates("入职第一年", start, end));
// System.out.println("第八天:" + generateDates("第八天", start, end));
- System.out.println("每周四下午三点:" + generateDates("每周四下午三点", start, end));
+ System.out.println("每月15号下午5点:" + generateDates("每月15号下午5点", start, end));
}
@@ -297,7 +297,8 @@ public class NatureToDate {
} else {
String hourStr = nature.substring(start+2, end);
int hour = StringUtil.isMatch(hourStr, StringUtil.NUMBER) ? Integer.parseInt(hourStr) + 12 : NatureLanguage.count(hourStr) + 12;
- nature = nature.replace(hourStr, hour + "");
+// nature = nature.replace(hourStr, hour + "");
+ nature = nature.substring(0, start+2) + nature.substring(start+2, end).replace(hourStr, hour + "") + nature.substring(end);
}
}
return nature;