diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..01b7a85 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/dictionaries/amar.xml b/.idea/dictionaries/amar.xml new file mode 100644 index 0000000..ab1f0e9 --- /dev/null +++ b/.idea/dictionaries/amar.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..219338d --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..6fec8f4 --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..9eb8596 --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml new file mode 100644 index 0000000..33c30b4 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..06441f4 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_3.xml new file mode 100644 index 0000000..4110fd4 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_3.xml new file mode 100644 index 0000000..0bc8068 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_xml_2_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_xml_2_9_3.xml new file mode 100644 index 0000000..762f646 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_xml_2_9_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_3.xml new file mode 100644 index 0000000..9c4042d --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_3.xml new file mode 100644 index 0000000..73161db --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_9_3.xml new file mode 100644 index 0000000..096aa2c --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_9_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_3.xml new file mode 100644 index 0000000..ced21d4 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..c08dcae --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_woodstox_woodstox_core_5_0_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..04210c5 --- /dev/null +++ b/.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..0bc971a --- /dev/null +++ b/.idea/libraries/Maven__com_github_vlsi_compactmap_compactmap_1_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..09453c9 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_2.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_2.xml new file mode 100644 index 0000000..49c91be --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_18_0.xml b/.idea/libraries/Maven__com_google_guava_guava_18_0.xml new file mode 100644 index 0000000..bbd71d7 --- /dev/null +++ b/.idea/libraries/Maven__com_google_guava_guava_18_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..e956197 --- /dev/null +++ b/.idea/libraries/Maven__com_google_inject_guice_4_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_1_1_6.xml b/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_1_1_6.xml new file mode 100644 index 0000000..9ee346c --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_1_1_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_h2database_h2_1_4_196.xml b/.idea/libraries/Maven__com_h2database_h2_1_4_196.xml new file mode 100644 index 0000000..1b01c0d --- /dev/null +++ b/.idea/libraries/Maven__com_h2database_h2_1_4_196.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..f19f6eb --- /dev/null +++ b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jcraft_jsch_0_1_54.xml b/.idea/libraries/Maven__com_jcraft_jsch_0_1_54.xml new file mode 100644 index 0000000..2a43ce7 --- /dev/null +++ b/.idea/libraries/Maven__com_jcraft_jsch_0_1_54.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_5.xml b/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_5.xml new file mode 100644 index 0000000..3641a97 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_8_6.xml b/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_8_6.xml new file mode 100644 index 0000000..e25a768 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_8_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_8_6.xml b/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_8_6.xml new file mode 100644 index 0000000..79c252c --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_8_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..8f6dabe --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_1_1.xml b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_1_1.xml new file mode 100644 index 0000000..9854a4d --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..85ba8c9 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..c8b512e --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..09c6f6e --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_4.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_4.xml new file mode 100644 index 0000000..7dd8bae --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_4.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_4.xml new file mode 100644 index 0000000..7f8420a --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_4.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_4.xml new file mode 100644 index 0000000..0b069c0 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_4.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_4.xml new file mode 100644 index 0000000..b81422c --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_4.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_4.xml new file mode 100644 index 0000000..533f7ae --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_4.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_4.xml new file mode 100644 index 0000000..2c1133d --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_servo_servo_core_0_10_1.xml b/.idea/libraries/Maven__com_netflix_servo_servo_core_0_10_1.xml new file mode 100644 index 0000000..8e42a88 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_servo_servo_core_0_10_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_servo_servo_internal_0_10_1.xml b/.idea/libraries/Maven__com_netflix_servo_servo_internal_0_10_1.xml new file mode 100644 index 0000000..74dfcbc --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_servo_servo_internal_0_10_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..2061d8c --- /dev/null +++ b/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..2b077bc --- /dev/null +++ b/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..91d65b2 --- /dev/null +++ b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_19_1.xml new file mode 100644 index 0000000..b4ad3de --- /dev/null +++ b/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_19_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_19_1.xml new file mode 100644 index 0000000..943df5a --- /dev/null +++ b/.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_19_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_9.xml b/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_9.xml new file mode 100644 index 0000000..1922b11 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml new file mode 100644 index 0000000..b8581a6 --- /dev/null +++ b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_8.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_8.xml new file mode 100644 index 0000000..848c412 --- /dev/null +++ b/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..4c8ff54 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..13afda2 --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..772d6fe --- /dev/null +++ b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..1816895 --- /dev/null +++ b/.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..2ec8376 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_core_9_5_1.xml b/.idea/libraries/Maven__io_github_openfeign_feign_core_9_5_1.xml new file mode 100644 index 0000000..43878d4 --- /dev/null +++ b/.idea/libraries/Maven__io_github_openfeign_feign_core_9_5_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_5_1.xml b/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_5_1.xml new file mode 100644 index 0000000..b37db53 --- /dev/null +++ b/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_5_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_java8_9_5_1.xml b/.idea/libraries/Maven__io_github_openfeign_feign_java8_9_5_1.xml new file mode 100644 index 0000000..a052ec9 --- /dev/null +++ b/.idea/libraries/Maven__io_github_openfeign_feign_java8_9_5_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_5_1.xml b/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_5_1.xml new file mode 100644 index 0000000..ade452c --- /dev/null +++ b/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_5_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_micrometer_micrometer_core_1_0_1.xml b/.idea/libraries/Maven__io_micrometer_micrometer_core_1_0_1.xml new file mode 100644 index 0000000..26851cb --- /dev/null +++ b/.idea/libraries/Maven__io_micrometer_micrometer_core_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_22_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_22_Final.xml new file mode 100644 index 0000000..02e8171 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_22_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_4_1_22_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_1_22_Final.xml new file mode 100644 index 0000000..0b6fb38 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_codec_4_1_22_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_22_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_22_Final.xml new file mode 100644 index 0000000..19d22dc --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_22_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_common_4_1_22_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_1_22_Final.xml new file mode 100644 index 0000000..732004f --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_common_4_1_22_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_22_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_22_Final.xml new file mode 100644 index 0000000..b6f0e75 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_22_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_4_1_22_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_1_22_Final.xml new file mode 100644 index 0000000..bb8cca8 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_transport_4_1_22_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_1_22_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_1_22_Final.xml new file mode 100644 index 0000000..60be1d6 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_1_22_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_22_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_22_Final.xml new file mode 100644 index 0000000..8e31ee9 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_22_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_reactivex_rxjava_1_3_6.xml b/.idea/libraries/Maven__io_reactivex_rxjava_1_3_6.xml new file mode 100644 index 0000000..14a209e --- /dev/null +++ b/.idea/libraries/Maven__io_reactivex_rxjava_1_3_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..82613f4 --- /dev/null +++ b/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..1ce62ff --- /dev/null +++ b/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..f9da5f7 --- /dev/null +++ b/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..e74f3ab --- /dev/null +++ b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..93cf65a --- /dev/null +++ b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml b/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml new file mode 100644 index 0000000..5f032d2 --- /dev/null +++ b/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..6978c0b --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..a0c4d76 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..2a4dd7a --- /dev/null +++ b/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml b/.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml new file mode 100644 index 0000000..a468f58 --- /dev/null +++ b/.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..d411041 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_10.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_10.xml new file mode 100644 index 0000000..7b90f25 --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_10.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_10.xml new file mode 100644 index 0000000..c9e49ad --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..b3d3858 --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..1083023 --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..fd0779a --- /dev/null +++ b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..6998bac --- /dev/null +++ b/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..8f3e315 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_5.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_5.xml new file mode 100644 index 0000000..e4eb38b --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_9.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_9.xml new file mode 100644 index 0000000..7f14d45 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml new file mode 100644 index 0000000..cbe5ca7 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml new file mode 100644 index 0000000..1407c58 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_28.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_28.xml new file mode 100644 index 0000000..c83f72e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_28.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_28.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_28.xml new file mode 100644 index 0000000..a90b7bb --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_28.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_28.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_28.xml new file mode 100644 index 0000000..66bd03f --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_28.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml new file mode 100644 index 0000000..d46e30a --- /dev/null +++ b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml new file mode 100644 index 0000000..40adaaa --- /dev/null +++ b/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_attoparser_attoparser_2_0_4_RELEASE.xml b/.idea/libraries/Maven__org_attoparser_attoparser_2_0_4_RELEASE.xml new file mode 100644 index 0000000..fab35d2 --- /dev/null +++ b/.idea/libraries/Maven__org_attoparser_attoparser_2_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_56.xml b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_56.xml new file mode 100644 index 0000000..99a1774 --- /dev/null +++ b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_56.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_56.xml b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_56.xml new file mode 100644 index 0000000..4e0490f --- /dev/null +++ b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_56.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..ca43e29 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..b510642 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..2997967 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_4_8_0_201706111038_r.xml b/.idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_4_8_0_201706111038_r.xml new file mode 100644 index 0000000..70fe0ee --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_4_8_0_201706111038_r.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_freemarker_freemarker_2_3_27_incubating.xml b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_27_incubating.xml new file mode 100644 index 0000000..a8f7879 --- /dev/null +++ b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_27_incubating.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..f58bbc1 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..78dbe45 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_10.xml b/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_10.xml new file mode 100644 index 0000000..249c90f --- /dev/null +++ b/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..04cc804 --- /dev/null +++ b/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml new file mode 100644 index 0000000..ce34f42 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_5_2_14_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_5_2_14_Final.xml new file mode 100644 index 0000000..3a3af4f --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_5_2_14_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_7_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_7_Final.xml new file mode 100644 index 0000000..a4f8873 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_7_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_22_0_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_22_0_GA.xml new file mode 100644 index 0000000..ad65915 --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_22_0_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_2_0_3_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_2_0_3_Final.xml new file mode 100644 index 0000000..b841e21 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_2_0_3_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml new file mode 100644 index 0000000..5f7dd01 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..bf68169 --- /dev/null +++ b/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml b/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml new file mode 100644 index 0000000..a742a6d --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..af41e3b --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..0bf8cf2 --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..c4c54d6 --- /dev/null +++ b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml new file mode 100644 index 0000000..6073e53 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml new file mode 100644 index 0000000..20e8163 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_0_RELEASE.xml new file mode 100644 index 0000000..6f53ce1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_0_0_RELEASE.xml new file mode 100644 index 0000000..e65a3ec --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_0_0_RELEASE.xml new file mode 100644 index 0000000..2291406 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_0_RELEASE.xml new file mode 100644 index 0000000..bb1e179 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_2_0_0_RELEASE.xml new file mode 100644 index 0000000..4d76deb --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_0_RELEASE.xml new file mode 100644 index 0000000..da1a887 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_0_0_RELEASE.xml new file mode 100644 index 0000000..ac213f4 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_0_RELEASE.xml new file mode 100644 index 0000000..c479f04 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_0_RELEASE.xml new file mode 100644 index 0000000..ed5e1e3 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_0_0_RELEASE.xml new file mode 100644 index 0000000..605a919 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_0_RELEASE.xml new file mode 100644 index 0000000..250e96a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_0_RELEASE.xml new file mode 100644 index 0000000..440dbd0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_0_RELEASE.xml new file mode 100644 index 0000000..35e7c76 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_0_RELEASE.xml new file mode 100644 index 0000000..b292009 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_0_0_RELEASE.xml new file mode 100644 index 0000000..af5b00e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_0_RELEASE.xml new file mode 100644 index 0000000..b3063f3 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_0_RELEASE.xml new file mode 100644 index 0000000..d1159de --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_0_RELEASE.xml new file mode 100644 index 0000000..d298a45 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_0_RELEASE.xml new file mode 100644 index 0000000..06ed00f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_0_0_M8.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_0_0_M8.xml new file mode 100644 index 0000000..4163c70 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_0_0_M8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_2_0_0_M8.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_2_0_0_M8.xml new file mode 100644 index 0000000..777a784 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_2_0_0_M8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_server_2_0_0_M8.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_server_2_0_0_M8.xml new file mode 100644 index 0000000..20f87aa --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_server_2_0_0_M8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_0_0_M8.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_0_0_M8.xml new file mode 100644 index 0000000..27ff633 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_0_0_M8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_0_0_M7.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_0_0_M7.xml new file mode 100644 index 0000000..69c722b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_0_0_M7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_2_0_0_M7.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_2_0_0_M7.xml new file mode 100644 index 0000000..b76e598 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_2_0_0_M7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_0_0_M7.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_0_0_M7.xml new file mode 100644 index 0000000..46914b5 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_0_0_M7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_server_2_0_0_M7.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_server_2_0_0_M7.xml new file mode 100644 index 0000000..c3eb553 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_server_2_0_0_M7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_0_0_M7.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_0_0_M7.xml new file mode 100644 index 0000000..05dfd26 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_0_0_M7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_0_0_M1.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_0_0_M1.xml new file mode 100644 index 0000000..27a160e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_0_0_M1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_0_0_M8.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_0_0_M8.xml new file mode 100644 index 0000000..ec52eb8 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_0_0_M8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_config_2_0_0_M8.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_config_2_0_0_M8.xml new file mode 100644 index 0000000..664e928 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_config_2_0_0_M8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_0_0_M7.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_0_0_M7.xml new file mode 100644 index 0000000..4e6cdf4 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_0_0_M7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_server_2_0_0_M7.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_server_2_0_0_M7.xml new file mode 100644 index 0000000..4e6ffa0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_server_2_0_0_M7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_0_0_M7.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_0_0_M7.xml new file mode 100644 index 0000000..a35f285 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_0_0_M7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_0_0_M1.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_0_0_M1.xml new file mode 100644 index 0000000..cbda0d9 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_0_0_M1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_5_RELEASE.xml new file mode 100644 index 0000000..85aa25c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_5_RELEASE.xml new file mode 100644 index 0000000..f48b9dc --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_0_3_RELEASE.xml new file mode 100644 index 0000000..8fe04df --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_0_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_5_RELEASE.xml new file mode 100644 index 0000000..82e92cd --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_0_4_RELEASE.xml new file mode 100644 index 0000000..42e3c72 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_5_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aspects_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aspects_5_0_4_RELEASE.xml new file mode 100644 index 0000000..1f498dd --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aspects_5_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_0_4_RELEASE.xml new file mode 100644 index 0000000..9d3252b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_5_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_0_4_RELEASE.xml new file mode 100644 index 0000000..24e83c9 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_5_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_4_RELEASE.xml new file mode 100644 index 0000000..864030c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_0_4_RELEASE.xml new file mode 100644 index 0000000..2784300 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_5_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_0_4_RELEASE.xml new file mode 100644 index 0000000..8151535 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_5_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_4_RELEASE.xml new file mode 100644 index 0000000..d0484b5 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_4_RELEASE.xml new file mode 100644 index 0000000..8b68fe1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_5_0_4_RELEASE.xml new file mode 100644 index 0000000..6e8a76f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_5_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_0_4_RELEASE.xml new file mode 100644 index 0000000..e8317f4 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_5_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_0_4_RELEASE.xml new file mode 100644 index 0000000..e6f1139 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_5_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_0_4_RELEASE.xml new file mode 100644 index 0000000..002d32d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_5_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_4_RELEASE.xml new file mode 100644 index 0000000..0aed43d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_1_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_1_RELEASE.xml new file mode 100644 index 0000000..73e2e08 --- /dev/null +++ b/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_1_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_9_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_9_RELEASE.xml new file mode 100644 index 0000000..7d6a8dd --- /dev/null +++ b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_9_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_9_RELEASE.xml new file mode 100644 index 0000000..536ab74 --- /dev/null +++ b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_unbescape_unbescape_1_1_5_RELEASE.xml b/.idea/libraries/Maven__org_unbescape_unbescape_1_1_5_RELEASE.xml new file mode 100644 index 0000000..1649e75 --- /dev/null +++ b/.idea/libraries/Maven__org_unbescape_unbescape_1_1_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_webjars_bootstrap_4_0_0_2.xml b/.idea/libraries/Maven__org_webjars_bootstrap_4_0_0_2.xml new file mode 100644 index 0000000..e1d5766 --- /dev/null +++ b/.idea/libraries/Maven__org_webjars_bootstrap_4_0_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_webjars_jquery_2_1_1.xml b/.idea/libraries/Maven__org_webjars_jquery_2_1_1.xml new file mode 100644 index 0000000..643a421 --- /dev/null +++ b/.idea/libraries/Maven__org_webjars_jquery_2_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_webjars_popper_js_1_12_9_1.xml b/.idea/libraries/Maven__org_webjars_popper_js_1_12_9_1.xml new file mode 100644 index 0000000..023f1a7 --- /dev/null +++ b/.idea/libraries/Maven__org_webjars_popper_js_1_12_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml new file mode 100644 index 0000000..474c910 --- /dev/null +++ b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml new file mode 100644 index 0000000..33ccf19 --- /dev/null +++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..0b13335 --- /dev/null +++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..0f2d9ef --- /dev/null +++ b/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..6726a2d --- /dev/null +++ b/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..5751df6 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..be97228 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..966d677 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,1600 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + Android > Lint > Correctness > Messages + + + Manifest + + + Spelling + + + + + SpellCheckingInspection + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + project + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1520724614908 + + + 1520797708529 + + + 1520810286429 + + + 1520843031874 + + + 1520844198381 + + + 1520846486481 + + + 1520894149779 + + + 1521337748217 + + + 1521413794719 + + + 1521498334955 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Spring + + + + + + + + + + + + + + + 1.8 + + + + + + + + eureka-server + + + + + + + + 1.8 + + + + + + + + Maven: antlr:antlr:2.7.7 + + + + + + + + \ No newline at end of file diff --git a/clientui/.gitignore b/clientui/.gitignore new file mode 100644 index 0000000..30cc74d --- /dev/null +++ b/clientui/.gitignore @@ -0,0 +1,25 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +.idea/* +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/clientui/.mvn/wrapper/maven-wrapper.jar b/clientui/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..9cc84ea Binary files /dev/null and b/clientui/.mvn/wrapper/maven-wrapper.jar differ diff --git a/clientui/.mvn/wrapper/maven-wrapper.properties b/clientui/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..b573bb5 --- /dev/null +++ b/clientui/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip diff --git a/clientui/mvnw b/clientui/mvnw new file mode 100755 index 0000000..5bf251c --- /dev/null +++ b/clientui/mvnw @@ -0,0 +1,225 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +echo $MAVEN_PROJECTBASEDIR +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/clientui/mvnw.cmd b/clientui/mvnw.cmd new file mode 100644 index 0000000..019bd74 --- /dev/null +++ b/clientui/mvnw.cmd @@ -0,0 +1,143 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/clientui/pom.xml b/clientui/pom.xml new file mode 100644 index 0000000..b261fb0 --- /dev/null +++ b/clientui/pom.xml @@ -0,0 +1,110 @@ + + + 4.0.0 + + com.clientui + clientui + 0.0.1-SNAPSHOT + jar + + client-ui + Client UI de l'application + + + org.springframework.boot + spring-boot-starter-parent + 2.6.1 + + + + + UTF-8 + UTF-8 + 1.8 + Finchley.M8 + + + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-web + + + + org.webjars + bootstrap + 4.0.0-2 + + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + org.springframework.cloud + spring-cloud-starter-config + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-server + + + + org.springframework.cloud + spring-cloud-starter-netflix-ribbon + + + + org.springframework.cloud + spring-cloud-starter-sleuth + + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + diff --git a/clientui/src/main/java/com/clientui/ClientUiApplication.java b/clientui/src/main/java/com/clientui/ClientUiApplication.java new file mode 100644 index 0000000..d3339cc --- /dev/null +++ b/clientui/src/main/java/com/clientui/ClientUiApplication.java @@ -0,0 +1,24 @@ +package com.clientui; + +import brave.sampler.Sampler; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.netflix.ribbon.RibbonClient; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Bean; + +@SpringBootApplication +@EnableFeignClients("com.clientui") +@EnableDiscoveryClient +public class ClientUiApplication { + + public static void main(String[] args) { + SpringApplication.run(ClientUiApplication.class, args); + } + + @Bean + public Sampler defaultSampler(){ + return Sampler.ALWAYS_SAMPLE; + } +} diff --git a/clientui/src/main/java/com/clientui/beans/CommandeBean.java b/clientui/src/main/java/com/clientui/beans/CommandeBean.java new file mode 100644 index 0000000..bc3dfb1 --- /dev/null +++ b/clientui/src/main/java/com/clientui/beans/CommandeBean.java @@ -0,0 +1,71 @@ +package com.clientui.beans; + +import java.util.Date; + + +public class CommandeBean { + + private int id; + + private Integer productId; + + private Date dateCommande; + + private Integer quantite; + + private Boolean commandePayee; + + public CommandeBean() { + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public Integer getProductId() { + return productId; + } + + public void setProductId(Integer productId) { + this.productId = productId; + } + + public Date getDateCommande() { + return dateCommande; + } + + public void setDateCommande(Date dateCommande) { + this.dateCommande = dateCommande; + } + + public Integer getQuantite() { + return quantite; + } + + public void setQuantite(Integer quantite) { + this.quantite = quantite; + } + + public Boolean getCommandePayee() { + return commandePayee; + } + + public void setCommandePayee(Boolean commandePayee) { + this.commandePayee = commandePayee; + } + + @Override + public String toString() { + return "CommandeBean{" + + "id=" + id + + ", productId=" + productId + + ", dateCommande=" + dateCommande + + ", quantite=" + quantite + + ", commandePayee=" + commandePayee + + '}'; + } +} diff --git a/clientui/src/main/java/com/clientui/beans/PaiementBean.java b/clientui/src/main/java/com/clientui/beans/PaiementBean.java new file mode 100644 index 0000000..e4fe177 --- /dev/null +++ b/clientui/src/main/java/com/clientui/beans/PaiementBean.java @@ -0,0 +1,58 @@ +package com.clientui.beans; + + +public class PaiementBean { + + private int id; + + private Integer idCommande; + + private Double montant; + + private Long numeroCarte; + + public PaiementBean() { + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public Integer getIdCommande() { + return idCommande; + } + + public void setIdCommande(Integer idCommande) { + this.idCommande = idCommande; + } + + public Double getMontant() { + return montant; + } + + public void setMontant(Double montant) { + this.montant = montant; + } + + public Long getNumeroCarte() { + return numeroCarte; + } + + public void setNumeroCarte(Long numeroCarte) { + this.numeroCarte = numeroCarte; + } + + @Override + public String toString() { + return "PaiementBean{" + + "id=" + id + + ", idCommande=" + idCommande + + ", montant=" + montant + + ", numeroCarte=" + numeroCarte + + '}'; + } +} diff --git a/clientui/src/main/java/com/clientui/beans/ProductBean.java b/clientui/src/main/java/com/clientui/beans/ProductBean.java new file mode 100644 index 0000000..381f995 --- /dev/null +++ b/clientui/src/main/java/com/clientui/beans/ProductBean.java @@ -0,0 +1,69 @@ +package com.clientui.beans; + + +public class ProductBean { + + private int id; + + private String titre; + + private String description; + + private String image; + + private Double prix; + + public ProductBean() { + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getTitre() { + return titre; + } + + public void setTitre(String titre) { + this.titre = titre; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getImage() { + return image; + } + + public void setImage(String image) { + this.image = image; + } + + public Double getPrix() { + return prix; + } + + public void setPrix(Double prix) { + this.prix = prix; + } + + @Override + public String toString() { + return "ProductBean{" + + "id=" + id + + ", titre='" + titre + '\'' + + ", description='" + description + '\'' + + ", image='" + image + '\'' + + ", prix=" + prix + + '}'; + } +} diff --git a/clientui/src/main/java/com/clientui/configuration/FeignConfig.java b/clientui/src/main/java/com/clientui/configuration/FeignConfig.java new file mode 100644 index 0000000..d921cf7 --- /dev/null +++ b/clientui/src/main/java/com/clientui/configuration/FeignConfig.java @@ -0,0 +1,15 @@ +package com.clientui.configuration; + +import feign.auth.BasicAuthRequestInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class FeignConfig { + + @Bean + public BasicAuthRequestInterceptor mBasicAuthRequestInterceptor(){ + return new BasicAuthRequestInterceptor("utilisateur", "mdp"); + } + +} diff --git a/clientui/src/main/java/com/clientui/configuration/SleuthConfig.java b/clientui/src/main/java/com/clientui/configuration/SleuthConfig.java new file mode 100644 index 0000000..27b1e64 --- /dev/null +++ b/clientui/src/main/java/com/clientui/configuration/SleuthConfig.java @@ -0,0 +1,14 @@ +package com.clientui.configuration; + +import brave.sampler.Sampler; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SleuthConfig { + + + public Sampler defaultSampler(){ + return Sampler.ALWAYS_SAMPLE; + } +} diff --git a/clientui/src/main/java/com/clientui/controller/ClientController.java b/clientui/src/main/java/com/clientui/controller/ClientController.java new file mode 100644 index 0000000..24439ed --- /dev/null +++ b/clientui/src/main/java/com/clientui/controller/ClientController.java @@ -0,0 +1,132 @@ +package com.clientui.controller; + +import com.clientui.beans.CommandeBean; +import com.clientui.beans.PaiementBean; +import com.clientui.beans.ProductBean; +import com.clientui.proxies.MicroserviceCommandeProxy; +import com.clientui.proxies.MicroservicePaiementProxy; +import com.clientui.proxies.MicroserviceProduitsProxy; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.client.RestTemplate; + +import java.util.*; +import java.util.concurrent.ThreadLocalRandom; + + +@Controller +public class ClientController { + + @Autowired + private MicroserviceProduitsProxy ProduitsProxy; + + @Autowired + private MicroserviceCommandeProxy CommandesProxy; + + @Autowired + private MicroservicePaiementProxy paiementProxy; + + + Logger log = LoggerFactory.getLogger(this.getClass()); + + /* + * Étape (1) + * Opération qui récupère la liste des produits et on les affichent dans la page d'accueil. + * Les produits sont récupérés grâce à ProduitsProxy + * On fini par rentourner la page Accueil.html à laquelle on passe la liste d'objets "produits" récupérés. + * */ + @RequestMapping("/") + public String accueil(Model model){ + + + log.info("Envoi requête vers microservice-produits"); + + List produits = ProduitsProxy.listeDesProduits(); + + model.addAttribute("produits", produits); + + + return "Accueil"; + } + + /* + * Étape (2) + * Opération qui récupère les détails d'un produit + * On passe l'objet "produit" récupéré et qui contient les détails en question à FicheProduit.html + * */ + @RequestMapping("/details-produit/{id}") + public String ficheProduit(@PathVariable int id, Model model){ + + ProductBean produit = ProduitsProxy.recupererUnProduit(id); + + model.addAttribute("produit", produit); + + return "FicheProduit"; + } + + /* + * Étape (3) et (4) + * Opération qui fait appel au microservice de commande pour placer une commande et récupérer les détails de la commande créée + * */ + @RequestMapping(value = "/commander-produit/{idProduit}/{montant}") + public String passerCommande(@PathVariable int idProduit, @PathVariable Double montant, Model model){ + + + CommandeBean commande = new CommandeBean(); + + //On renseigne les propriétés de l'objet de type CommandeBean que nous avons crée + commande.setProductId(idProduit); + commande.setQuantite(1); + commande.setDateCommande(new Date()); + + //appel du microservice commandes grâce à Feign et on récupère en retour les détails de la commande créée, notamment son ID (étape 4). + CommandeBean commandeAjoutee = CommandesProxy.ajouterCommande(commande); + + //on passe à la vue l'objet commande et le montant de celle-ci afin d'avoir les informations nécessaire pour le paiement + model.addAttribute("commande", commandeAjoutee); + model.addAttribute("montant", montant); + + return "Paiement"; + } + + /* + * Étape (5) + * Opération qui fait appel au microservice de paiement pour traiter un paiement + * */ + @RequestMapping(value = "/payer-commande/{idCommande}/{montantCommande}") + public String payerCommande(@PathVariable int idCommande, @PathVariable Double montantCommande, Model model){ + + PaiementBean paiementAExcecuter = new PaiementBean(); + + //on reseigne les détails du produit + paiementAExcecuter.setIdCommande(idCommande); + paiementAExcecuter.setMontant(montantCommande); + paiementAExcecuter.setNumeroCarte(numcarte()); // on génère un numéro au hasard pour simuler une CB + + // On appel le microservice et (étape 7) on récupère le résultat qui est sous forme ResponseEntity ce qui va nous permettre de vérifier le code retour. + ResponseEntity paiement = paiementProxy.payerUneCommande(paiementAExcecuter); + + Boolean paiementAccepte = false; + //si le code est autre que 201 CREATED, c'est que le paiement n'a pas pu aboutir. + if(paiement.getStatusCode() == HttpStatus.CREATED) + paiementAccepte = true; + + model.addAttribute("paiementOk", paiementAccepte); // on envoi un Boolean paiementOk à la vue + + return "confirmation"; + } + + //Génére une serie de 16 chiffres au hasard pour simuler vaguement une CB + private Long numcarte() { + + return ThreadLocalRandom.current().nextLong(1000000000000000L,9000000000000000L ); + } +} diff --git a/clientui/src/main/java/com/clientui/proxies/MicroserviceCommandeProxy.java b/clientui/src/main/java/com/clientui/proxies/MicroserviceCommandeProxy.java new file mode 100644 index 0000000..916b158 --- /dev/null +++ b/clientui/src/main/java/com/clientui/proxies/MicroserviceCommandeProxy.java @@ -0,0 +1,16 @@ +package com.clientui.proxies; + +import com.clientui.beans.CommandeBean; +import org.springframework.cloud.netflix.ribbon.RibbonClient; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient(name = "zuul-server") +@RibbonClient(name = "microservice-commandes") +public interface MicroserviceCommandeProxy { + + @PostMapping(value = "/microservice-commandes/commandes") + CommandeBean ajouterCommande(@RequestBody CommandeBean commande); +} diff --git a/clientui/src/main/java/com/clientui/proxies/MicroservicePaiementProxy.java b/clientui/src/main/java/com/clientui/proxies/MicroservicePaiementProxy.java new file mode 100644 index 0000000..84856c5 --- /dev/null +++ b/clientui/src/main/java/com/clientui/proxies/MicroservicePaiementProxy.java @@ -0,0 +1,17 @@ +package com.clientui.proxies; + +import com.clientui.beans.PaiementBean; +import org.springframework.cloud.netflix.ribbon.RibbonClient; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient(name = "zuul-server") +@RibbonClient(name = "microservice-paiement") +public interface MicroservicePaiementProxy { + + @PostMapping(value = "/microservice-paiement/paiement") + ResponseEntity payerUneCommande(@RequestBody PaiementBean paiement); + +} diff --git a/clientui/src/main/java/com/clientui/proxies/MicroserviceProduitsProxy.java b/clientui/src/main/java/com/clientui/proxies/MicroserviceProduitsProxy.java new file mode 100644 index 0000000..7ba6fc1 --- /dev/null +++ b/clientui/src/main/java/com/clientui/proxies/MicroserviceProduitsProxy.java @@ -0,0 +1,27 @@ +package com.clientui.proxies; + +import com.clientui.beans.ProductBean; +import org.springframework.cloud.netflix.ribbon.RibbonClient; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +import java.util.List; +import java.util.Optional; + +@FeignClient(name = "zuul-server") +@RibbonClient(name = "microservice-produits") +public interface MicroserviceProduitsProxy { + + @GetMapping(value = "/microservice-produits/Produits") + List listeDesProduits(); + + /* + * Notez ici la notation @PathVariable("id") qui est différente de celle qu'on utlise dans le contrôleur + **/ + @GetMapping( value = "/microservice-produits/Produits/{id}") + ProductBean recupererUnProduit(@PathVariable("id") int id); + + + +} diff --git a/clientui/src/main/resources/bootstrap.properties b/clientui/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..8648d88 --- /dev/null +++ b/clientui/src/main/resources/bootstrap.properties @@ -0,0 +1,3 @@ +spring.application.name=microservice-clientui + +spring.cloud.config.uri=http://localhost:9101 \ No newline at end of file diff --git a/clientui/src/main/resources/templates/Accueil.html b/clientui/src/main/resources/templates/Accueil.html new file mode 100644 index 0000000..be2d91e --- /dev/null +++ b/clientui/src/main/resources/templates/Accueil.html @@ -0,0 +1,35 @@ + + + + Mcommerce + + + + + + + +
+ +

Application Mcommerce

+ +
+ + + +
+ +
+ + + + + + \ No newline at end of file diff --git a/clientui/src/main/resources/templates/Confirmation.html b/clientui/src/main/resources/templates/Confirmation.html new file mode 100644 index 0000000..e754988 --- /dev/null +++ b/clientui/src/main/resources/templates/Confirmation.html @@ -0,0 +1,39 @@ + + + + Mcommerce + + + + + + + +
+ +

Application Mcommerce

+ +
+
+ +

+ Paiement Accepté +

+ +

+ Le paiement n'a pas abouti +

+ + + +
+
+ +
+ + + + + + \ No newline at end of file diff --git a/clientui/src/main/resources/templates/FicheProduit.html b/clientui/src/main/resources/templates/FicheProduit.html new file mode 100644 index 0000000..3e2692e --- /dev/null +++ b/clientui/src/main/resources/templates/FicheProduit.html @@ -0,0 +1,39 @@ + + + + Mcommerce + + + + + + + +
+ +

Application Mcommerce

+ +
+
+ + + +

+ +

+ +

+ COMMANDER +

+ +
+
+ +
+ + + + + + \ No newline at end of file diff --git a/clientui/src/main/resources/templates/Paiement.html b/clientui/src/main/resources/templates/Paiement.html new file mode 100644 index 0000000..7fbb89c --- /dev/null +++ b/clientui/src/main/resources/templates/Paiement.html @@ -0,0 +1,43 @@ + + + + Mcommerce + + + + + + + +
+ +

Application Mcommerce

+ +
+
+ +

+ Ici l'utilisateur sélectionne en temps normal un moyen de paiement et entre les informations de sa carte bancaire.
+ Nous allons éviter d'ajouter les formulaires nécessaireS afin de garder l'application la plus basique et simple possible pour la suite.
+ Si vous vous sentez à l'aise, vous pouvez créer un formulaire pour accepter le numéro de la CB, que vous traiterez dans le contrôleur grâce à + un PostMapping. +

+ + +

+ Payer Ma Commande +

+ + + +
+
+ +
+ + + + + + \ No newline at end of file diff --git a/clientui/src/test/java/com/clientui/ClientUiApplicationTests.java b/clientui/src/test/java/com/clientui/ClientUiApplicationTests.java new file mode 100644 index 0000000..97ce6f1 --- /dev/null +++ b/clientui/src/test/java/com/clientui/ClientUiApplicationTests.java @@ -0,0 +1,16 @@ +package com.clientui; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ClientUiApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/config-server-repo/config-server-repo.iml b/config-server-repo/config-server-repo.iml new file mode 100644 index 0000000..8021953 --- /dev/null +++ b/config-server-repo/config-server-repo.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/config-server-repo/eureka-server.properties b/config-server-repo/eureka-server.properties new file mode 100644 index 0000000..fc4b271 --- /dev/null +++ b/config-server-repo/eureka-server.properties @@ -0,0 +1,6 @@ +server.port:9102 + +spring.application.name=eureka-server +eureka.client.serviceUrl.defaultZone:http://localhost:9102/eureka/ +eureka.client.registerWithEureka:false +eureka.client.fetchRegistry:false \ No newline at end of file diff --git a/config-server-repo/microservice-clientui.properties b/config-server-repo/microservice-clientui.properties new file mode 100644 index 0000000..7801b47 --- /dev/null +++ b/config-server-repo/microservice-clientui.properties @@ -0,0 +1,6 @@ + +server.port: 8080 + +#Eureka +eureka.client.serviceUrl.defaultZone: http://localhost:9102/eureka/ + diff --git a/config-server-repo/microservice-commandes.properties b/config-server-repo/microservice-commandes.properties new file mode 100644 index 0000000..5c96b19 --- /dev/null +++ b/config-server-repo/microservice-commandes.properties @@ -0,0 +1,12 @@ + +server.port 9002 + +#Configurations H2 +spring.jpa.show-sql=true +spring.h2.console.enabled=true + +#défini l'encodage pour data.sql +spring.datasource.sql-script-encoding=UTF-8 + +#Eureka +eureka.client.serviceUrl.defaultZone: http://localhost:9102/eureka/ \ No newline at end of file diff --git a/config-server-repo/microservice-paiement.properties b/config-server-repo/microservice-paiement.properties new file mode 100644 index 0000000..1d6f525 --- /dev/null +++ b/config-server-repo/microservice-paiement.properties @@ -0,0 +1,11 @@ +server.port 9003 + +#Configurations H2 +spring.jpa.show-sql=true +spring.h2.console.enabled=true + +#défini l'encodage pour data.sql +spring.datasource.sql-script-encoding=UTF-8 + +#Eureka +eureka.client.serviceUrl.defaultZone: http://localhost:9102/eureka/ \ No newline at end of file diff --git a/config-server-repo/microservice-produits.properties b/config-server-repo/microservice-produits.properties new file mode 100644 index 0000000..15872a6 --- /dev/null +++ b/config-server-repo/microservice-produits.properties @@ -0,0 +1,15 @@ + +#Configurations H2 +spring.jpa.show-sql=true +spring.h2.console.enabled=true + +#défini l'encodage pour data.sql +spring.datasource.sql-script-encoding=UTF-8 + + +#Nos configurations + +mes-configs.limitDeProduits= 3 + +#Eureka +eureka.client.serviceUrl.defaultZone: http://localhost:9102/eureka/ \ No newline at end of file diff --git a/config-server-repo/zuul-server.properties b/config-server-repo/zuul-server.properties new file mode 100644 index 0000000..7fd518f --- /dev/null +++ b/config-server-repo/zuul-server.properties @@ -0,0 +1,9 @@ + +server.port 9004 + +#Eureka +eureka.client.serviceUrl.defaultZone: http://localhost:9102/eureka/ + +#Spring Security +spring.security.user.name=utilisateur +spring.security.user.password=mdp \ No newline at end of file diff --git a/config-server/.gitignore b/config-server/.gitignore new file mode 100644 index 0000000..2af7cef --- /dev/null +++ b/config-server/.gitignore @@ -0,0 +1,24 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/config-server/.mvn/wrapper/maven-wrapper.jar b/config-server/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..9cc84ea Binary files /dev/null and b/config-server/.mvn/wrapper/maven-wrapper.jar differ diff --git a/config-server/.mvn/wrapper/maven-wrapper.properties b/config-server/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..b573bb5 --- /dev/null +++ b/config-server/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip diff --git a/config-server/mvnw b/config-server/mvnw new file mode 100755 index 0000000..5bf251c --- /dev/null +++ b/config-server/mvnw @@ -0,0 +1,225 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +echo $MAVEN_PROJECTBASEDIR +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/config-server/mvnw.cmd b/config-server/mvnw.cmd new file mode 100644 index 0000000..019bd74 --- /dev/null +++ b/config-server/mvnw.cmd @@ -0,0 +1,143 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/config-server/pom.xml b/config-server/pom.xml new file mode 100644 index 0000000..1323f62 --- /dev/null +++ b/config-server/pom.xml @@ -0,0 +1,79 @@ + + + 4.0.0 + + com.mcommerce + config-server + 0.0.1-SNAPSHOT + jar + + config-server + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 2.6.1 + + + + + UTF-8 + UTF-8 + 1.8 + Finchley.M8 + + + + + org.springframework.cloud + spring-cloud-config-server + + + + org.springframework.cloud + spring-cloud-starter-sleuth + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + diff --git a/config-server/src/main/java/com/mcommerce/configserver/ConfigServerApplication.java b/config-server/src/main/java/com/mcommerce/configserver/ConfigServerApplication.java new file mode 100644 index 0000000..e18b08d --- /dev/null +++ b/config-server/src/main/java/com/mcommerce/configserver/ConfigServerApplication.java @@ -0,0 +1,14 @@ +package com.mcommerce.configserver; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.config.server.EnableConfigServer; + +@SpringBootApplication +@EnableConfigServer +public class ConfigServerApplication { + + public static void main(String[] args) { + SpringApplication.run(ConfigServerApplication.class, args); + } +} diff --git a/config-server/src/main/resources/application.properties b/config-server/src/main/resources/application.properties new file mode 100644 index 0000000..c3c6173 --- /dev/null +++ b/config-server/src/main/resources/application.properties @@ -0,0 +1,5 @@ + +spring.application.name=config-server +server.port:9101 + +spring.cloud.config.server.git.uri=https://github.com/AmarMicroDev/mcommerce-config-repo.git \ No newline at end of file diff --git a/config-server/src/test/java/com/mcommerce/configserver/ConfigServerApplicationTests.java b/config-server/src/test/java/com/mcommerce/configserver/ConfigServerApplicationTests.java new file mode 100644 index 0000000..69c94ce --- /dev/null +++ b/config-server/src/test/java/com/mcommerce/configserver/ConfigServerApplicationTests.java @@ -0,0 +1,16 @@ +package com.mcommerce.configserver; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ConfigServerApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/eureka-server/.gitignore b/eureka-server/.gitignore new file mode 100644 index 0000000..81a33ed --- /dev/null +++ b/eureka-server/.gitignore @@ -0,0 +1,25 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/eureka-server/.mvn/wrapper/maven-wrapper.jar b/eureka-server/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..9cc84ea Binary files /dev/null and b/eureka-server/.mvn/wrapper/maven-wrapper.jar differ diff --git a/eureka-server/.mvn/wrapper/maven-wrapper.properties b/eureka-server/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..b573bb5 --- /dev/null +++ b/eureka-server/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip diff --git a/eureka-server/mvnw b/eureka-server/mvnw new file mode 100755 index 0000000..5bf251c --- /dev/null +++ b/eureka-server/mvnw @@ -0,0 +1,225 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +echo $MAVEN_PROJECTBASEDIR +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/eureka-server/mvnw.cmd b/eureka-server/mvnw.cmd new file mode 100644 index 0000000..019bd74 --- /dev/null +++ b/eureka-server/mvnw.cmd @@ -0,0 +1,143 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/eureka-server/pom.xml b/eureka-server/pom.xml new file mode 100644 index 0000000..8647010 --- /dev/null +++ b/eureka-server/pom.xml @@ -0,0 +1,88 @@ + + + 4.0.0 + + com.mcommerce + eureka-server + 0.0.1-SNAPSHOT + jar + + eureka-server + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 2.6.1 + + + + + UTF-8 + UTF-8 + 1.8 + Finchley.M8 + + + + + org.springframework.cloud + spring-cloud-starter-config + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-server + + + + org.springframework.cloud + spring-cloud-starter-sleuth + + + + org.springframework.cloud + spring-cloud-sleuth-zipkin + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + diff --git a/eureka-server/src/main/java/com/mcommerce/eurekaserver/EurekaServerApplication.java b/eureka-server/src/main/java/com/mcommerce/eurekaserver/EurekaServerApplication.java new file mode 100644 index 0000000..80f978a --- /dev/null +++ b/eureka-server/src/main/java/com/mcommerce/eurekaserver/EurekaServerApplication.java @@ -0,0 +1,14 @@ +package com.mcommerce.eurekaserver; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; + +@SpringBootApplication +@EnableEurekaServer +public class EurekaServerApplication { + + public static void main(String[] args) { + SpringApplication.run(EurekaServerApplication.class, args); + } +} diff --git a/eureka-server/src/main/resources/bootstrap.properties b/eureka-server/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..b82d67c --- /dev/null +++ b/eureka-server/src/main/resources/bootstrap.properties @@ -0,0 +1,3 @@ +spring.application.name=eureka-server + +spring.cloud.config.uri=http://localhost:9101 \ No newline at end of file diff --git a/eureka-server/src/test/java/com/mcommerce/eurekaserver/EurekaServerApplicationTests.java b/eureka-server/src/test/java/com/mcommerce/eurekaserver/EurekaServerApplicationTests.java new file mode 100644 index 0000000..fc9a53f --- /dev/null +++ b/eureka-server/src/test/java/com/mcommerce/eurekaserver/EurekaServerApplicationTests.java @@ -0,0 +1,16 @@ +package com.mcommerce.eurekaserver; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class EurekaServerApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/images/Bougie.PNG b/images/Bougie.PNG deleted file mode 100644 index 1ef92d8..0000000 Binary files a/images/Bougie.PNG and /dev/null differ diff --git a/images/Chaise.PNG b/images/Chaise.PNG deleted file mode 100644 index f542230..0000000 Binary files a/images/Chaise.PNG and /dev/null differ diff --git a/images/Cheval.PNG b/images/Cheval.PNG deleted file mode 100644 index 2d46ec8..0000000 Binary files a/images/Cheval.PNG and /dev/null differ diff --git a/images/Horloge.PNG b/images/Horloge.PNG deleted file mode 100644 index 4898f92..0000000 Binary files a/images/Horloge.PNG and /dev/null differ diff --git a/images/Vase.PNG b/images/Vase.PNG deleted file mode 100644 index 62b5d82..0000000 Binary files a/images/Vase.PNG and /dev/null differ diff --git a/images/coq.PNG b/images/coq.PNG deleted file mode 100644 index e246643..0000000 Binary files a/images/coq.PNG and /dev/null differ diff --git a/images/lampe.PNG b/images/lampe.PNG deleted file mode 100644 index 05d069a..0000000 Binary files a/images/lampe.PNG and /dev/null differ diff --git a/images/table d'opération.PNG b/images/table d'opération.PNG deleted file mode 100644 index 802a039..0000000 Binary files a/images/table d'opération.PNG and /dev/null differ diff --git a/microservice-commandes/mvnw b/microservice-commandes/mvnw old mode 100644 new mode 100755 diff --git a/microservice-commandes/pom.xml b/microservice-commandes/pom.xml index e4daa4b..7ad374a 100644 --- a/microservice-commandes/pom.xml +++ b/microservice-commandes/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.1 @@ -22,6 +22,7 @@ UTF-8 UTF-8 1.8 + Finchley.M8 @@ -42,6 +43,16 @@ runtime + + org.springframework.cloud + spring-cloud-starter-config + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-server + + org.springframework.boot spring-boot-starter-test @@ -49,6 +60,18 @@ + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + @@ -58,5 +81,15 @@ + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + diff --git a/microservice-commandes/src/main/java/com/mcommandes/McommandesApplication.java b/microservice-commandes/src/main/java/com/mcommandes/McommandesApplication.java index 246684a..376f00d 100644 --- a/microservice-commandes/src/main/java/com/mcommandes/McommandesApplication.java +++ b/microservice-commandes/src/main/java/com/mcommandes/McommandesApplication.java @@ -2,8 +2,10 @@ package com.mcommandes; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @SpringBootApplication +@EnableDiscoveryClient public class McommandesApplication { public static void main(String[] args) { diff --git a/microservice-commandes/src/main/java/com/mcommandes/web/controller/CommandeController.java b/microservice-commandes/src/main/java/com/mcommandes/web/controller/CommandeController.java index a578723..7a5dbd8 100644 --- a/microservice-commandes/src/main/java/com/mcommandes/web/controller/CommandeController.java +++ b/microservice-commandes/src/main/java/com/mcommandes/web/controller/CommandeController.java @@ -37,4 +37,15 @@ public class CommandeController { return commande; } + + /* + * Permet de mettre à jour une commande existante. + * save() mettra à jours uniquement les champs renseignés dans l'objet commande reçu. Ainsi dans ce cas, comme le champs date dans "commande" n'est + * pas renseigné, la date précédemment enregistrée restera en place + **/ + @PutMapping(value = "/commandes") + public void updateCommande(@RequestBody Commande commande) { + + commandesDao.save(commande); + } } diff --git a/microservice-commandes/src/main/resources/application.properties b/microservice-commandes/src/main/resources/application.properties deleted file mode 100644 index f686363..0000000 --- a/microservice-commandes/src/main/resources/application.properties +++ /dev/null @@ -1,5 +0,0 @@ -server.port=9002 - -#Configurations H2 -spring.jpa.show-sql=true -spring.h2.console.enabled=true diff --git a/microservice-commandes/src/main/resources/bootstrap.properties b/microservice-commandes/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..e04afcf --- /dev/null +++ b/microservice-commandes/src/main/resources/bootstrap.properties @@ -0,0 +1,3 @@ +spring.application.name=microservice-commandes + +spring.cloud.config.uri=http://localhost:9101 \ No newline at end of file diff --git a/microservice-commandes/src/test/java/com/mcommandes/McommandesApplicationTests.java b/microservice-commandes/src/test/java/com/mcommandes/McommandesApplicationTests.java new file mode 100644 index 0000000..ce03e24 --- /dev/null +++ b/microservice-commandes/src/test/java/com/mcommandes/McommandesApplicationTests.java @@ -0,0 +1,16 @@ +package com.mcommandes; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class McommandesApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/microservice-commandes/src/test/java/com/mpayement/MpayementApplicationTests.java b/microservice-commandes/src/test/java/com/mpayement/MpayementApplicationTests.java new file mode 100644 index 0000000..dc70e04 --- /dev/null +++ b/microservice-commandes/src/test/java/com/mpayement/MpayementApplicationTests.java @@ -0,0 +1,16 @@ +package com.mpayement; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class MpayementApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/microservice-paiement/mvnw b/microservice-paiement/mvnw old mode 100644 new mode 100755 diff --git a/microservice-paiement/pom.xml b/microservice-paiement/pom.xml index 709a4a5..43477d0 100644 --- a/microservice-paiement/pom.xml +++ b/microservice-paiement/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.1 @@ -22,6 +22,7 @@ UTF-8 UTF-8 1.8 + Finchley.M8 @@ -42,6 +43,21 @@ runtime + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + org.springframework.cloud + spring-cloud-starter-config + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-server + + org.springframework.boot spring-boot-starter-test @@ -49,6 +65,18 @@ + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + @@ -58,5 +86,15 @@ + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + diff --git a/microservice-paiement/src/main/java/com/mpaiement/MpaiementApplication.java b/microservice-paiement/src/main/java/com/mpaiement/MpaiementApplication.java index cdfe616..2c26df7 100644 --- a/microservice-paiement/src/main/java/com/mpaiement/MpaiementApplication.java +++ b/microservice-paiement/src/main/java/com/mpaiement/MpaiementApplication.java @@ -2,8 +2,12 @@ package com.mpaiement; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; @SpringBootApplication +@EnableFeignClients("com.mpaiement") +@EnableDiscoveryClient public class MpaiementApplication { public static void main(String[] args) { diff --git a/microservice-paiement/src/main/java/com/mpaiement/beans/CommandeBean.java b/microservice-paiement/src/main/java/com/mpaiement/beans/CommandeBean.java new file mode 100644 index 0000000..bafd55f --- /dev/null +++ b/microservice-paiement/src/main/java/com/mpaiement/beans/CommandeBean.java @@ -0,0 +1,70 @@ +package com.mpaiement.beans; + +import java.util.Date; + +public class CommandeBean { + + private int id; + + private Integer productId; + + private Date dateCommande; + + private Integer quantite; + + private Boolean commandePayee; + + public CommandeBean() { + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public Integer getProductId() { + return productId; + } + + public void setProductId(Integer productId) { + this.productId = productId; + } + + public Date getDateCommande() { + return dateCommande; + } + + public void setDateCommande(Date dateCommande) { + this.dateCommande = dateCommande; + } + + public Integer getQuantite() { + return quantite; + } + + public void setQuantite(Integer quantite) { + this.quantite = quantite; + } + + public Boolean getCommandePayee() { + return commandePayee; + } + + public void setCommandePayee(Boolean commandePayee) { + this.commandePayee = commandePayee; + } + + @Override + public String toString() { + return "CommandeBean{" + + "id=" + id + + ", productId=" + productId + + ", dateCommande=" + dateCommande + + ", quantite=" + quantite + + ", commandePayee=" + commandePayee + + '}'; + } +} \ No newline at end of file diff --git a/microservice-paiement/src/main/java/com/mpaiement/model/Paiement.java b/microservice-paiement/src/main/java/com/mpaiement/model/Paiement.java index 70e799c..0a1cc23 100644 --- a/microservice-paiement/src/main/java/com/mpaiement/model/Paiement.java +++ b/microservice-paiement/src/main/java/com/mpaiement/model/Paiement.java @@ -15,14 +15,14 @@ public class Paiement { @Column(unique = true) private Integer idCommande; - private Integer montant; + private Double montant; private Long numeroCarte; public Paiement() { } - public Paiement(int id, Integer idCommande, Integer montant, Long numeroCarte) { + public Paiement(int id, Integer idCommande, Double montant, Long numeroCarte) { this.id = id; this.idCommande = idCommande; this.montant = montant; @@ -45,11 +45,11 @@ public class Paiement { this.idCommande = idCommande; } - public Integer getMontant() { + public Double getMontant() { return montant; } - public void setMontant(Integer montant) { + public void setMontant(Double montant) { this.montant = montant; } diff --git a/microservice-paiement/src/main/java/com/mpaiement/proxies/MicroserviceCommandeProxy.java b/microservice-paiement/src/main/java/com/mpaiement/proxies/MicroserviceCommandeProxy.java new file mode 100644 index 0000000..31fd860 --- /dev/null +++ b/microservice-paiement/src/main/java/com/mpaiement/proxies/MicroserviceCommandeProxy.java @@ -0,0 +1,20 @@ +package com.mpaiement.proxies; + +import com.mpaiement.beans.CommandeBean; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.Optional; + +@FeignClient(name = "microservice-commandes", url = "localhost:9002") +public interface MicroserviceCommandeProxy { + + @GetMapping(value = "/commandes/{id}") + Optional recupererUneCommande(@PathVariable("id") int id); + + @PutMapping(value = "/commandes") + void updateCommande(@RequestBody CommandeBean commande); +} diff --git a/microservice-paiement/src/main/java/com/mpaiement/web/controller/PaiementController.java b/microservice-paiement/src/main/java/com/mpaiement/web/controller/PaiementController.java index 6a126bd..736a60c 100644 --- a/microservice-paiement/src/main/java/com/mpaiement/web/controller/PaiementController.java +++ b/microservice-paiement/src/main/java/com/mpaiement/web/controller/PaiementController.java @@ -1,7 +1,9 @@ package com.mpaiement.web.controller; +import com.mpaiement.beans.CommandeBean; import com.mpaiement.dao.PaiementDao; import com.mpaiement.model.Paiement; +import com.mpaiement.proxies.MicroserviceCommandeProxy; import com.mpaiement.web.exceptions.PaiementExistantException; import com.mpaiement.web.exceptions.PaiementImpossibleException; import org.springframework.beans.factory.annotation.Autowired; @@ -9,12 +11,20 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.util.Optional; + @RestController public class PaiementController { @Autowired PaiementDao paiementDao; + @Autowired + MicroserviceCommandeProxy microserviceCommandeProxy; + + /* + * Opération pour enregistrer un paiement et notifier le microservice commandes pour mettre à jour le statut de la commande en question + **/ @PostMapping(value = "/paiement") public ResponseEntity payerUneCommande(@RequestBody Paiement paiement){ @@ -26,13 +36,22 @@ public class PaiementController { //Enregistrer le paiement Paiement nouveauPaiement = paiementDao.save(paiement); - + // si le DAO nous retourne null c'est que il ya eu un problème lors de l'enregistrement if(nouveauPaiement == null) throw new PaiementImpossibleException("Erreur, impossible d'établir le paiement, réessayez plus tard"); + //On récupère la commande correspondant à ce paiement en faisant appel au Microservice commandes + Optional commandeReq = microserviceCommandeProxy.recupererUneCommande(paiement.getIdCommande()); + //commandeReq.get() permet d'extraire l'objet de type CommandeBean de Optional + CommandeBean commande = commandeReq.get(); - //TODO Nous allons appeler le Microservice Commandes ici pour lui signifier que le paiement est accepté + //on met à jour l'objet pour marquer la commande comme étant payée + commande.setCommandePayee(true); + //on envoi l'objet commande mis à jour au microservice commande afin de mettre à jour le status de la commande. + microserviceCommandeProxy.updateCommande(commande); + + //on renvoi 201 CREATED pour notifier le client au le paiement à été enregistré return new ResponseEntity(nouveauPaiement, HttpStatus.CREATED); } diff --git a/microservice-paiement/src/main/resources/application.properties b/microservice-paiement/src/main/resources/application.properties deleted file mode 100644 index 897bdf9..0000000 --- a/microservice-paiement/src/main/resources/application.properties +++ /dev/null @@ -1,6 +0,0 @@ - -server.port=9003 - -#Configurations H2 -spring.jpa.show-sql=true -spring.h2.console.enabled=true diff --git a/microservice-paiement/src/main/resources/bootstrap.properties b/microservice-paiement/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..47c5ca4 --- /dev/null +++ b/microservice-paiement/src/main/resources/bootstrap.properties @@ -0,0 +1,3 @@ +spring.application.name=microservice-paiement + +spring.cloud.config.uri=http://localhost:9101 \ No newline at end of file diff --git a/microservice-paiement/src/test/java/com/mpaiement/MpaiementApplicationTests.java b/microservice-paiement/src/test/java/com/mpaiement/MpaiementApplicationTests.java new file mode 100644 index 0000000..5da814f --- /dev/null +++ b/microservice-paiement/src/test/java/com/mpaiement/MpaiementApplicationTests.java @@ -0,0 +1,16 @@ +package com.mpaiement; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class MpaiementApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/microservice-produits/VousEtesDansTestBranch.md b/microservice-produits/VousEtesDansTestBranch.md new file mode 100644 index 0000000..e69de29 diff --git a/microservice-produits/mvnw b/microservice-produits/mvnw old mode 100644 new mode 100755 diff --git a/microservice-produits/pom.xml b/microservice-produits/pom.xml index 4b1ba2b..cd2416a 100644 --- a/microservice-produits/pom.xml +++ b/microservice-produits/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.1 @@ -22,6 +22,7 @@ UTF-8 UTF-8 1.8 + Finchley.M8 @@ -42,6 +43,33 @@ runtime + + org.springframework.boot + spring-boot-configuration-processor + true + + + + org.springframework.cloud + spring-cloud-starter-config + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-server + + + + org.springframework.cloud + spring-cloud-starter-sleuth + + + + org.springframework.cloud + spring-cloud-sleuth-zipkin + + + org.springframework.boot spring-boot-starter-test @@ -49,6 +77,18 @@ + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + @@ -58,5 +98,16 @@ + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + diff --git a/microservice-produits/src/main/java/com/mproduits/MproduitsApplication.java b/microservice-produits/src/main/java/com/mproduits/MproduitsApplication.java index 3f9132c..6224ad8 100644 --- a/microservice-produits/src/main/java/com/mproduits/MproduitsApplication.java +++ b/microservice-produits/src/main/java/com/mproduits/MproduitsApplication.java @@ -1,12 +1,24 @@ package com.mproduits; +import brave.sampler.Sampler; +import com.mproduits.configurations.ApplicationPropertiesConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.context.annotation.Bean; @SpringBootApplication +@EnableConfigurationProperties +@EnableDiscoveryClient public class MproduitsApplication { public static void main(String[] args) { SpringApplication.run(MproduitsApplication.class, args); } + + @Bean + public Sampler defaultSampler(){ + return Sampler.ALWAYS_SAMPLE; + } } diff --git a/microservice-produits/src/main/java/com/mproduits/configurations/ApplicationPropertiesConfiguration.java b/microservice-produits/src/main/java/com/mproduits/configurations/ApplicationPropertiesConfiguration.java new file mode 100644 index 0000000..ea3ffac --- /dev/null +++ b/microservice-produits/src/main/java/com/mproduits/configurations/ApplicationPropertiesConfiguration.java @@ -0,0 +1,21 @@ +package com.mproduits.configurations; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.stereotype.Component; + +@Component +@ConfigurationProperties("mes-configs") +public class ApplicationPropertiesConfiguration { + + private int limitDeProduits; + + public int getLimitDeProduits() { + return limitDeProduits; + } + + public void setLimitDeProduits(int limitDeProduits) { + this.limitDeProduits = limitDeProduits; + } +} diff --git a/microservice-produits/src/main/java/com/mproduits/configurations/SleuthConfig.java b/microservice-produits/src/main/java/com/mproduits/configurations/SleuthConfig.java new file mode 100644 index 0000000..9ce2c34 --- /dev/null +++ b/microservice-produits/src/main/java/com/mproduits/configurations/SleuthConfig.java @@ -0,0 +1,14 @@ +package com.mproduits.configurations; + +import brave.sampler.Sampler; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SleuthConfig { + + + public Sampler defaultSampler(){ + return Sampler.ALWAYS_SAMPLE; + } +} diff --git a/microservice-produits/src/main/java/com/mproduits/web/controller/ProductController.java b/microservice-produits/src/main/java/com/mproduits/web/controller/ProductController.java index 23bdf51..008bab9 100644 --- a/microservice-produits/src/main/java/com/mproduits/web/controller/ProductController.java +++ b/microservice-produits/src/main/java/com/mproduits/web/controller/ProductController.java @@ -1,9 +1,13 @@ package com.mproduits.web.controller; +import com.mproduits.configurations.ApplicationPropertiesConfiguration; import com.mproduits.dao.ProductDao; import com.mproduits.model.Product; import com.mproduits.web.exceptions.ProductNotFoundException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; @@ -17,6 +21,12 @@ public class ProductController { @Autowired ProductDao productDao; + + Logger log = LoggerFactory.getLogger(this.getClass()); + + @Autowired + ApplicationPropertiesConfiguration appProperties; + // Affiche la liste de tous les produits disponibles @GetMapping(value = "/Produits") public List listeDesProduits(){ @@ -25,7 +35,12 @@ public class ProductController { if(products.isEmpty()) throw new ProductNotFoundException("Aucun produit n'est disponible à la vente"); - return products; + List listeLimitee = products.subList(0, appProperties.getLimitDeProduits()); + + + log.info("Récupération de la liste des produits"); + + return listeLimitee; } diff --git a/microservice-produits/src/main/java/com/mproduits/web/exceptions/ProductNotFoundException.java b/microservice-produits/src/main/java/com/mproduits/web/exceptions/ProductNotFoundException.java index 3572f58..c79062f 100644 --- a/microservice-produits/src/main/java/com/mproduits/web/exceptions/ProductNotFoundException.java +++ b/microservice-produits/src/main/java/com/mproduits/web/exceptions/ProductNotFoundException.java @@ -11,3 +11,4 @@ public class ProductNotFoundException extends RuntimeException { super(message); } } + diff --git a/microservice-produits/src/main/resources/application.properties b/microservice-produits/src/main/resources/application.properties deleted file mode 100644 index 6d2d73f..0000000 --- a/microservice-produits/src/main/resources/application.properties +++ /dev/null @@ -1,7 +0,0 @@ - -server.port=9001 - -#Configurations H2 -spring.jpa.show-sql=true -spring.h2.console.enabled=true - diff --git a/microservice-produits/src/main/resources/bootstrap.properties b/microservice-produits/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..8baabbf --- /dev/null +++ b/microservice-produits/src/main/resources/bootstrap.properties @@ -0,0 +1,3 @@ +spring.application.name=microservice-produits + +spring.cloud.config.uri=http://localhost:9101 \ No newline at end of file diff --git a/microservice-produits/src/main/resources/data.sql b/microservice-produits/src/main/resources/data.sql index 307ee59..8ca5b0c 100644 --- a/microservice-produits/src/main/resources/data.sql +++ b/microservice-produits/src/main/resources/data.sql @@ -12,4 +12,4 @@ INSERT INTO PRODUCT (ID , TITRE ,DESCRIPTION ,IMAGE ,PRIX ) VALUES (5, 'Horloge INSERT INTO PRODUCT (ID , TITRE ,DESCRIPTION ,IMAGE ,PRIX ) VALUES (6, 'Table d''opération pour Hamsters', 'Pour réaliser vos opérations chirugicales sur votre Hamster!', 'https://github.com/OpenClassrooms-Student-Center/4668216-Optimisez-votre-architecture-Microservices/blob/master/images/table%20d''op%C3%A9ration.PNG?raw=true', 210.0); -INSERT INTO PRODUCT (ID , TITRE ,DESCRIPTION ,IMAGE ,PRIX ) VALUES (7 , 'Vase ayant appartenu a Zeus', 'Risque de choc électrique', 'https://github.com/OpenClassrooms-Student-Center/4668216-Optimisez-votre-architecture-Microservices/blob/master/images/Vase.PNG?raw=true', 730.0); \ No newline at end of file +INSERT INTO PRODUCT (ID , TITRE ,DESCRIPTION ,IMAGE ,PRIX ) VALUES (7 , 'Vase ayant appartenu a Zeus', 'Risque de choc électrique', 'https://github.com/OpenClassrooms-Student-Center/4668216-Optimisez-votre-architecture-Microservices/blob/master/images/Vase.PNG?raw=true', 730.0); diff --git a/microservice-produits/src/test/java/com/mproduits/MproduitsApplicationTests.java b/microservice-produits/src/test/java/com/mproduits/MproduitsApplicationTests.java new file mode 100644 index 0000000..32bd4cc --- /dev/null +++ b/microservice-produits/src/test/java/com/mproduits/MproduitsApplicationTests.java @@ -0,0 +1,16 @@ +package com.mproduits; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class MproduitsApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/zuul-server/.gitignore b/zuul-server/.gitignore new file mode 100644 index 0000000..81a33ed --- /dev/null +++ b/zuul-server/.gitignore @@ -0,0 +1,25 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/zuul-server/.mvn/wrapper/maven-wrapper.jar b/zuul-server/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..9cc84ea Binary files /dev/null and b/zuul-server/.mvn/wrapper/maven-wrapper.jar differ diff --git a/zuul-server/.mvn/wrapper/maven-wrapper.properties b/zuul-server/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..b573bb5 --- /dev/null +++ b/zuul-server/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip diff --git a/zuul-server/mvnw b/zuul-server/mvnw new file mode 100755 index 0000000..5bf251c --- /dev/null +++ b/zuul-server/mvnw @@ -0,0 +1,225 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +echo $MAVEN_PROJECTBASEDIR +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/zuul-server/mvnw.cmd b/zuul-server/mvnw.cmd new file mode 100644 index 0000000..019bd74 --- /dev/null +++ b/zuul-server/mvnw.cmd @@ -0,0 +1,143 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/zuul-server/pom.xml b/zuul-server/pom.xml new file mode 100644 index 0000000..3423095 --- /dev/null +++ b/zuul-server/pom.xml @@ -0,0 +1,98 @@ + + + 4.0.0 + + com.mcommerce + zuul-server + 0.0.1-SNAPSHOT + jar + + zuul-server + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 2.6.1 + + + + + UTF-8 + UTF-8 + 1.8 + Finchley.M8 + + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + + + org.springframework.cloud + spring-cloud-starter-netflix-zuul + + + + org.springframework.cloud + spring-cloud-starter-config + + + + org.springframework.cloud + spring-cloud-starter-security + + + + org.springframework.cloud + spring-cloud-starter-sleuth + + + + org.springframework.cloud + spring-cloud-sleuth-zipkin + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + diff --git a/zuul-server/src/main/java/com/mcommerce/zuulserver/ZuulServerApplication.java b/zuul-server/src/main/java/com/mcommerce/zuulserver/ZuulServerApplication.java new file mode 100644 index 0000000..491c565 --- /dev/null +++ b/zuul-server/src/main/java/com/mcommerce/zuulserver/ZuulServerApplication.java @@ -0,0 +1,20 @@ +package com.mcommerce.zuulserver; + +import brave.sampler.Sampler; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.netflix.zuul.EnableZuulProxy; +import org.springframework.context.annotation.Bean; + +@SpringBootApplication +@EnableZuulProxy +@EnableDiscoveryClient +public class ZuulServerApplication { + + public static void main(String[] args) { + SpringApplication.run(ZuulServerApplication.class, args); + } + + +} diff --git a/zuul-server/src/main/java/com/mcommerce/zuulserver/configuration/SleuthConfig.java b/zuul-server/src/main/java/com/mcommerce/zuulserver/configuration/SleuthConfig.java new file mode 100644 index 0000000..03b4da9 --- /dev/null +++ b/zuul-server/src/main/java/com/mcommerce/zuulserver/configuration/SleuthConfig.java @@ -0,0 +1,14 @@ +package com.mcommerce.zuulserver.configuration; + +import brave.sampler.Sampler; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SleuthConfig { + + + public Sampler defaultSampler(){ + return Sampler.ALWAYS_SAMPLE; + } +} diff --git a/zuul-server/src/main/java/com/mcommerce/zuulserver/filters/LogFilter.java b/zuul-server/src/main/java/com/mcommerce/zuulserver/filters/LogFilter.java new file mode 100644 index 0000000..7885cda --- /dev/null +++ b/zuul-server/src/main/java/com/mcommerce/zuulserver/filters/LogFilter.java @@ -0,0 +1,42 @@ +package com.mcommerce.zuulserver.filters; + +import com.netflix.zuul.ZuulFilter; +import com.netflix.zuul.context.RequestContext; +import com.netflix.zuul.exception.ZuulException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; + +@Component +public class LogFilter extends ZuulFilter { + + Logger log = LoggerFactory.getLogger(this.getClass()); + + @Override + public String filterType() { + return "pre"; + } + + @Override + public int filterOrder() { + return 1; + } + + @Override + public boolean shouldFilter() { + return true; + } + + @Override + public Object run() throws ZuulException { + + HttpServletRequest req = RequestContext.getCurrentContext().getRequest(); + + log.info("**** Requête interceptée ! L'URL est : {} " , req.getRequestURL()); + + return null; + } +} diff --git a/zuul-server/src/main/java/com/mcommerce/zuulserver/filters/ReponseFilter.java b/zuul-server/src/main/java/com/mcommerce/zuulserver/filters/ReponseFilter.java new file mode 100644 index 0000000..4c6760e --- /dev/null +++ b/zuul-server/src/main/java/com/mcommerce/zuulserver/filters/ReponseFilter.java @@ -0,0 +1,46 @@ +package com.mcommerce.zuulserver.filters; + +import com.netflix.zuul.ZuulFilter; +import com.netflix.zuul.context.RequestContext; +import com.netflix.zuul.exception.ZuulException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@Component +public class ReponseFilter extends ZuulFilter { + + Logger log = LoggerFactory.getLogger(this.getClass()); + + @Override + public String filterType() { + return "post"; + } + + @Override + public int filterOrder() { + return 1; + } + + //désactivé + @Override + public boolean shouldFilter() { + return false; + } + + @Override + public Object run() throws ZuulException { + + HttpServletResponse response = RequestContext.getCurrentContext().getResponse(); + + response.setStatus(400); + + log.info(" CODE HTTP {} ", response.getStatus()); + + + return null; + } +} diff --git a/zuul-server/src/main/resources/bootstrap.properties b/zuul-server/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..a085dbc --- /dev/null +++ b/zuul-server/src/main/resources/bootstrap.properties @@ -0,0 +1,2 @@ +spring.application.name=zuul-server +spring.cloud.config.uri=http://localhost:9101 diff --git a/zuul-server/src/test/java/com/mcommerce/zuulserver/ZuulServerApplicationTests.java b/zuul-server/src/test/java/com/mcommerce/zuulserver/ZuulServerApplicationTests.java new file mode 100644 index 0000000..7de4329 --- /dev/null +++ b/zuul-server/src/test/java/com/mcommerce/zuulserver/ZuulServerApplicationTests.java @@ -0,0 +1,16 @@ +package com.mcommerce.zuulserver; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ZuulServerApplicationTests { + + @Test + public void contextLoads() { + } + +}