diff --git a/.idea/artifacts/share_war.xml b/.idea/artifacts/share_war.xml new file mode 100644 index 0000000000000000000000000000000000000000..e59d1c698f5f81c1ca7f1020962a7a5b811ade5a --- /dev/null +++ b/.idea/artifacts/share_war.xml @@ -0,0 +1,16 @@ + + + $PROJECT_DIR$/share_project/target + + + false + share + war + false + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/share_war_exploded.xml b/.idea/artifacts/share_war_exploded.xml new file mode 100644 index 0000000000000000000000000000000000000000..6d4d8cf5012e8a77dc3870de7f5e4fb2b450b5df --- /dev/null +++ b/.idea/artifacts/share_war_exploded.xml @@ -0,0 +1,116 @@ + + + $PROJECT_DIR$/share_project/target/share-0.0.1 + + + true + share + war + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000000000000000000000000000000000000..8ab0540dccb56803d6a16debfb9614a5425af211 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/google-java-format.xml b/.idea/google-java-format.xml new file mode 100644 index 0000000000000000000000000000000000000000..2aa056da349dddd834c2c648fc49c936f390dbfc --- /dev/null +++ b/.idea/google-java-format.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index e0cbe79f6b7287449229b1bcb9eeaa73a9e00517..18b26cbc7fde1807bfc1728dec7b25ab35914226 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -2,9 +2,14 @@ - + + - \ 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 0000000000000000000000000000000000000000..6fec8f4346ac31350b855bd6cd3886f1d15e3f79 --- /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 0000000000000000000000000000000000000000..9eb8596a33a55f6e2480baf37393b24b7ae8da60 --- /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_alibaba_druid_1_1_20.xml b/.idea/libraries/Maven__com_alibaba_druid_1_1_20.xml new file mode 100644 index 0000000000000000000000000000000000000000..d10ba70a2db6c9a6e528266e3b32e2e49c035cc1 --- /dev/null +++ b/.idea/libraries/Maven__com_alibaba_druid_1_1_20.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_20.xml b/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_20.xml new file mode 100644 index 0000000000000000000000000000000000000000..4f8e37a6f749da726a5e0514a2943832c0a27557 --- /dev/null +++ b/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_20.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_50.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_50.xml new file mode 100644 index 0000000000000000000000000000000000000000..909aed03531eb55e4c87fd480481f449c41cb532 --- /dev/null +++ b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_50.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_4_11_54_ALL.xml b/.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_4_11_54_ALL.xml new file mode 100644 index 0000000000000000000000000000000000000000..b5944d33ce9e9956fa66e36f931e33d4dc989a66 --- /dev/null +++ b/.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_4_11_54_ALL.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml new file mode 100644 index 0000000000000000000000000000000000000000..bc7d7fd869dadc58b6b2b17fd7852efe43e1671f --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..d6408240bbe1e1454bf626ea788db7296c7b449e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..572ed924b85c80dee3db6727c1abc71df438a9ed --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_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_11_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..c9ac6cc0504797b262d99da179938254c6ff7963 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_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_11_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..76ed7ddfc81972797e46bb81efd90ded46244b41 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_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_11_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..1ed8753066fa747fee38d3daddc239d4cca052cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_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_11_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..2aad1f70f490dd121a656b5b31b779f0afc3f8f8 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_20_0.xml b/.idea/libraries/Maven__com_google_guava_guava_20_0.xml new file mode 100644 index 0000000000000000000000000000000000000000..c5bd322e1504ed1ba58740d40bb6836f4fc9592b --- /dev/null +++ b/.idea/libraries/Maven__com_google_guava_guava_20_0.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 0000000000000000000000000000000000000000..f19f6eb36d90a68eaceb438559d62b3054eaef31 --- /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_sun_activation_jakarta_activation_1_2_2.xml b/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..fea99f02633a0e8c19cd5206275bfac4f65d4ee1 --- /dev/null +++ b/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_mail_jakarta_mail_1_6_5.xml b/.idea/libraries/Maven__com_sun_mail_jakarta_mail_1_6_5.xml new file mode 100644 index 0000000000000000000000000000000000000000..a86e1762eaf57a035c541164da95806f58d1de6e --- /dev/null +++ b/.idea/libraries/Maven__com_sun_mail_jakarta_mail_1_6_5.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 0000000000000000000000000000000000000000..b8581a6f5eef96c4979f258063e7c7c8d633f024 --- /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_3_4_5.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml new file mode 100644 index 0000000000000000000000000000000000000000..97e22912d67e2065823863ce87154f31ca59cf07 --- /dev/null +++ b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml new file mode 100644 index 0000000000000000000000000000000000000000..b770f56aa973a210ba6b27bc867394d3695317ef --- /dev/null +++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_lettuce_lettuce_core_5_3_5_RELEASE.xml b/.idea/libraries/Maven__io_lettuce_lettuce_core_5_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..f21e381bd3470ab19cd53fff8541c7111308f482 --- /dev/null +++ b/.idea/libraries/Maven__io_lettuce_lettuce_core_5_3_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_53_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_53_Final.xml new file mode 100644 index 0000000000000000000000000000000000000000..edc596f203d31f6dfb79360ed407807af880f27b --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_53_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_4_1_53_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_1_53_Final.xml new file mode 100644 index 0000000000000000000000000000000000000000..43debb7fb173f71fc0f7b60c285b31cd3704ade7 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_codec_4_1_53_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_common_4_1_53_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_1_53_Final.xml new file mode 100644 index 0000000000000000000000000000000000000000..0d06a015887a9323547674ee2626786ee21c59ad --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_common_4_1_53_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_handler_4_1_53_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_4_1_53_Final.xml new file mode 100644 index 0000000000000000000000000000000000000000..567d406758fc2c8564920eb11df0b326137b30c4 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_handler_4_1_53_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_53_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_53_Final.xml new file mode 100644 index 0000000000000000000000000000000000000000..de3d9b5363c248c5f0ddf5e435fcfc1a3b81ef95 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_53_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_4_1_53_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_1_53_Final.xml new file mode 100644 index 0000000000000000000000000000000000000000..b3d797a4dc330aa6023a02608290b4dbf54a44dd --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_transport_4_1_53_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_11_RELEASE.xml b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_11_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..aa3a6b6624c1c309244319e56b25ef1a41df1508 --- /dev/null +++ b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_11_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..03588dc9d07e7b17b323755027104b226448da92 --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..4a47148b6e09d9ace3694873e267f6bce97dc25d --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..f934649ac97878982c63bf6250e8659081ca5246 --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..7898a19c22ca232040d6a9743aa56c40d3b81b22 --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..4ed7d0d2699c8323519085b2d06e3081a4faa4aa --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..c40ef9ff4f6cd886cf5144d349ff8a3fec6b798d --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..0700f01d6a88679a82d385fe8c4d0ae076e3fc54 --- /dev/null +++ b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml new file mode 100644 index 0000000000000000000000000000000000000000..1c4a62127f3a3c6c456bbef56c14ee539f06e597 --- /dev/null +++ b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml new file mode 100644 index 0000000000000000000000000000000000000000..395508ff2d52d7b55d81a904648972e0aeeaf706 --- /dev/null +++ b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..be90656e69bb0356d5fbed85d2639aeac6c5f16a --- /dev/null +++ b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml new file mode 100644 index 0000000000000000000000000000000000000000..cba9dd244f222ce7ecbdcab4c7f9621a57fe1a67 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..04213f73868a39471664c431bdb5073055eb36d5 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_22.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_22.xml new file mode 100644 index 0000000000000000000000000000000000000000..4de6b45fb49933ce3b98fc8866e55be354fb7561 --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_22.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_17.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_17.xml new file mode 100644 index 0000000000000000000000000000000000000000..6f96bd875ca08f85a67ab547e349aab29a6e772b --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_17.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_17.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_17.xml new file mode 100644 index 0000000000000000000000000000000000000000..b4b0b687dd971cbfd23341fa2a5c5bc40957ec9d --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_17.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 0000000000000000000000000000000000000000..b3d38583846d5aa1772f53caeccc169761a55a6f --- /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 0000000000000000000000000000000000000000..108302355fbaaf40e819f97756e3ed357517a466 --- /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_apache_logging_log4j_log4j_api_2_13_3.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..8ad499666deb18b7b66bbe7b7af75a4cb9d0a946 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_13_3.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_13_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..1bd11c6a5303a75a9a59fe054312ddca577d51df --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_13_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_13_3.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_13_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..59bfab8fec8a5cf0b299eb63967ce693bfd94f69 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_13_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_13_3.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_13_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..0bb21429d7778cb23cb27d776b204bfc34bd85ba --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_13_3.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_13_3.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..57e6ac4878219cace6e087de5021bc4b5a223092 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_39.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_39.xml new file mode 100644 index 0000000000000000000000000000000000000000..b1152ac06a8f4b69c65f9feaea5859d2d2713abd --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_39.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_39.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_39.xml new file mode 100644 index 0000000000000000000000000000000000000000..0b88f03e7c39e0700fabf9d787a3f207fcfe8114 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_39.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml new file mode 100644 index 0000000000000000000000000000000000000000..f854ab00fdbf2e7209bbdf678f7c45f3bb209378 --- /dev/null +++ b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml new file mode 100644 index 0000000000000000000000000000000000000000..89765002a792d3fd2fba7f7c7c3d7afaf224225c --- /dev/null +++ b/.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml b/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..5bad7db8498edfcf30810fc0d829cb646f6ead0f --- /dev/null +++ b/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_62.xml b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_62.xml new file mode 100644 index 0000000000000000000000000000000000000000..f546c7ad3276a8bdda8325ea795ae5b23ea3e0b7 --- /dev/null +++ b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_62.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml b/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..ae5020d69f0e700c9eca359ae07f33d714285800 --- /dev/null +++ b/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..6b5496ff097a7fd9b72025c4acf36cda1416eda3 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_3.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..d6a98a928cc2e79503203ea04d69edf39ab43f79 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_3.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..3f50defa0ee07cacbb13d1e1f5ccd9fc77fc2344 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_3.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..2331281b6ab06c92842011222b01fc9c51eaaee5 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_3.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..98e9d9eb82b5c9720822582d8948ddd1f1480525 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_3.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..0122027c72195b6405f4342fc3e3dd5f8ef00651 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_3.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..8ddd1f89f5c1d76a62d908f842194c2848be917a --- /dev/null +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml new file mode 100644 index 0000000000000000000000000000000000000000..87cb599b4fffcc104a93d2960f9798e6f4905d0b --- /dev/null +++ b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml b/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..d2f4afa38dac9c566f6f17c199d19f865fedfbe0 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..6c02a6376ec4e61dbe2889ad621120c27b5c21f5 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_5.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_5.xml new file mode 100644 index 0000000000000000000000000000000000000000..c6b733451afb3d6c2120f979f18bf7c702f85914 --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_5.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_5.xml new file mode 100644 index 0000000000000000000000000000000000000000..eb39604abfed41916bf073f35c908d5bfa538f6c --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_3.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..dc3ed940fc82ca494eda71915752fee863d3e782 --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_3.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..9304237751911ef84414cc2676a0f7f50548ba7c --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_3.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 0000000000000000000000000000000000000000..af41e3b6171208cedd29faa1922420ed916cc5b7 --- /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_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml new file mode 100644 index 0000000000000000000000000000000000000000..fbc1b1635a2c69174f8bea7d6306f5175015adc0 --- /dev/null +++ b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.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 0000000000000000000000000000000000000000..0bf8cf2b279adf5dbfdb0ad574f87390f1e4b072 --- /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_projectlombok_lombok_1_18_16.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_16.xml new file mode 100644 index 0000000000000000000000000000000000000000..33d4265f93ccd7f50555cf9878777782764266dd --- /dev/null +++ b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_16.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..f17253bf81c48360905fb478f634536f0202bf5f --- /dev/null +++ b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.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 0000000000000000000000000000000000000000..c4c54d6d5452b5e2f25085adb2d2b98c38ae4731 --- /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_30.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml new file mode 100644 index 0000000000000000000000000000000000000000..27229ce3e82cb0f1ec67292e953fc9bf08bb12ba --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml new file mode 100644 index 0000000000000000000000000000000000000000..02b6812c3b22ac0b71ecfdd339cfc092deb99e0e --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..93f09a55225eb6fbfe35db5d311f34103b0eee6b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_5_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_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..b01ae119cacbc1ba45ea9fe477e4696fdebbf5f5 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..3a40e912bfce96fe49faf1fcb3c950bddfeb5934 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_3_5_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_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..dce2de429f206173294f410fc9758447fa527ed7 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_5_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_redis_2_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..17b356534a7f0aab19ea6d17414cd3de9a7c6655 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_3_5_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_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..ccb5840a38038b314d874025a0f8fa8ea4ab4a0f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_3_5_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_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..69a4f1fe5dde3b370a0b9a1c3ef647f4f0ad7f8e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_3_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..f08ba296a5065fb003a59b89391d5eea78c1bc19 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_3_5_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_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..aa9e2a74afc0c649c2424910054c32c11f61033e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..f7b01a0dda34484bc9398acde985190b5c2c026d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_3_5_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_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..4c1557840df00f5b143634436a33c48204b5800f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_5_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_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..b975713f121b5effdce70733723fac2def27bcf7 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_3_5_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_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..d67f7869964ae9b01460116cf582b9f0c272ef30 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_3_5_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_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..3145feaef9a0256d9c9129e81e271349729fb41a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_3_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_4_1.xml new file mode 100644 index 0000000000000000000000000000000000000000..ad61a295ab9d42c64a6a3787e5cdf0d88ac05a22 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..0d88d122f98b4da606b5f8237928c69cf0c6cfa3 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_5_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_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..bce041f15bafa26e5dafa338e02d9689f4f5d5d0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..55e2e63900d49f490bc9881d38f3ff278041386f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..2cea683b8bf0849ee881895aa626e8c521631383 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_3_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_3_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_3_5_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..713d3fd3938eab5198957ae5935b23e013d4122f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_3_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..fbc045291892fa23bdae801938612a435a28c1be --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..7e6f096b8ffa4f78bad1cf7d1f444eae27429179 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_2_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_2_10_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..81765c74c55124a1d76ca9ca6e16c571d5096d58 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_5_2_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_2_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_2_10_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..9c37e8ae7e21d060e2a7b89d1ac94f936e4a841e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_5_2_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_2_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_2_10_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..a19fb4675f106898f3b4ad9c9356ce837c69e584 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_5_2_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_10_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..7dc1ed82a2328752a80c1b09a1e6151227d28743 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_2_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_2_10_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..33aa8d4bc8e3c03a5c68b40366d395b6645d372e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_5_2_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_2_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_2_10_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..38ed31ea998e5cad982cd0c770794a4ca1dde9e6 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_5_2_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_10_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..7781a89cdb7df0eb7ee0d9dc51bb8c2b0bcf51cb --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_10_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..ae53ab3ca27939720109b061a13944404722bfea --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_messaging_5_2_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_messaging_5_2_10_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..9cd7f8357f405d207e48af8d11865a95e9bbd0af --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_messaging_5_2_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_10_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..8cd13f8d459828732d499b5655fb2d495a10972c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_2_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_2_10_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..d71d9147168c2b1b8e9065005cac05ffcb84911c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_5_2_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_2_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_2_10_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..adb500df88508bfc45d67699686d223a7a1d1a66 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_5_2_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_2_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_2_10_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..0236b0a92ea9fc04e01302a74c504145b42d59c4 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_5_2_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_10_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..ce80896a61fca3864963016bbc803d72611c5174 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_websocket_5_2_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_websocket_5_2_10_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..da0141ce35838833648743fba95eaba933e75ae1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_websocket_5_2_10_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_4_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..7b246ae1cab497ce43d8c6527e4332be42443c2b --- /dev/null +++ b/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_11_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_11_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..7b72babd7ee9a6b822d396bfbc5c8b2d5b673233 --- /dev/null +++ b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_11_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_11_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_11_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..3370587a76a503d6a4f6f2ada07a6d7c279877a3 --- /dev/null +++ b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_11_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml b/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml new file mode 100644 index 0000000000000000000000000000000000000000..2334aa0538d29343fd8acda7b2cb199efa85e78d --- /dev/null +++ b/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml new file mode 100644 index 0000000000000000000000000000000000000000..006a8d346efa506e119271dd612dfc07f4eef831 --- /dev/null +++ b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml new file mode 100644 index 0000000000000000000000000000000000000000..e998675a21e799d26744edcb29eac417ab916b69 --- /dev/null +++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index f100e19f6b47525938a6322a4ffe16e7dc509359..b58915bdf7a656271c1f7f74639cffacdf86b28a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,8 @@ + + + diff --git a/share_project/src/main/java/com/share/controller/DemandProjectController.java b/share_project/src/main/java/com/share/controller/DemandProjectController.java index 0e4b15fe664c4176e69fdacc099d2f39d903f077..72a7d62ca3a73ac1119a393269ddaceab876f74f 100644 --- a/share_project/src/main/java/com/share/controller/DemandProjectController.java +++ b/share_project/src/main/java/com/share/controller/DemandProjectController.java @@ -2,30 +2,22 @@ package com.share.controller; import com.share.domain.DemandProject; import com.share.domain.ResultInfo; -import com.share.domain.User; import com.share.service.DemandProjectService; import com.share.service.ProjectShowService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; -import javax.servlet.http.HttpSession; /** * @author 谢佳豪 * @data 2020/11/24 - 20:12 * @description 需求项目模块controller层(增、查) */ -@Api(tags = "项目模块-需求") @Controller @ResponseBody @RequestMapping("/demand") -@CrossOrigin(allowCredentials = "true") public class DemandProjectController { private DemandProjectService demandProjectService; @@ -48,18 +40,10 @@ public class DemandProjectController { * post请求 提交需求表单 添加数据 * @param demandProject 表单数据对象 * @param operation 操作符（0-保存、1-发布） - * @param httpSession * @return */ - @ApiOperation("填写表单，发布需求项目") @PostMapping("/{operation}") - public ResultInfo addDemandProject(@ApiParam("操作符") @PathVariable String operation, @RequestBody DemandProject demandProject, @ApiIgnore HttpSession httpSession){ - - //获取当前用户的用户名 - User user = (User) httpSession.getAttribute("user"); - //设置用户名 - demandProject.setPublisher(user.getUsername()); - + public ResultInfo addDemandProject(@PathVariable String operation, DemandProject demandProject){ return demandProjectService.addDemandProject(demandProject, operation); } @@ -69,26 +53,19 @@ public class DemandProjectController { * @param winner 胜出者（用户名） * @return */ - @ApiOperation("需求项目发布者择出优胜者") @GetMapping("/choose") - public ResultInfo chooseWinner(@ApiParam("需求项目id") Integer id, @ApiParam("优者用户名") String winner){ + public ResultInfo chooseWinner(Integer id, String winner){ return demandProjectService.updateWinner(id, winner); } /** * 成为候选人 * @param id 项目id - * @param httpSession + * @param candidate 候选人 TODO 获取session域中的user.username * @return */ - @ApiOperation("用户参与该需求项目的竞选") @GetMapping("/join") - public ResultInfo becomeCandidate(@ApiParam("需求项目id") Integer id, @ApiIgnore HttpSession httpSession){ - - User user = (User)httpSession.getAttribute("user"); - //获取当前用户名为候选人 - String candidate = user.getUsername(); - + public ResultInfo becomeCandidate(Integer id, String candidate){ return demandProjectService.addCandidatesList(id, candidate); } @@ -97,9 +74,8 @@ public class DemandProjectController { * @param projectName 项目名 * @return 响应结果 */ - @ApiOperation("搜索框模糊查询，获取项目基本信息") @GetMapping("/project") - public ResultInfo selectProject(@ApiParam("项目名") String projectName, @ApiParam("项目类型") String type, @ApiParam("页数") Integer page){ + public ResultInfo selectProject(String projectName, String type, Integer page){ return projectShowService.getProjectsByType(projectName, type, page); } @@ -108,9 +84,8 @@ public class DemandProjectController { * @param projectName 项目名 * @return 响应结果 */ - @ApiOperation("搜索框模糊查询，统计项目个数") @GetMapping("/count") - public ResultInfo countProject(@ApiParam("项目名") String projectName, @ApiParam("类型") String type){ + public ResultInfo countProject(String projectName, String type){ return projectShowService.countProjectByCondition(projectName, type); } diff --git a/share_project/src/main/java/com/share/controller/SkillProjectController.java b/share_project/src/main/java/com/share/controller/SkillProjectController.java index 8c21bc48e097df653ff042fa516f0c4ab0c24ebe..86e5bf32a2b2780891efeb340bd099d3d9baf4c1 100644 --- a/share_project/src/main/java/com/share/controller/SkillProjectController.java +++ b/share_project/src/main/java/com/share/controller/SkillProjectController.java @@ -2,31 +2,21 @@ package com.share.controller; import com.share.domain.ResultInfo; import com.share.domain.SkillProject; -import com.share.domain.User; import com.share.service.ProjectShowService; import com.share.service.SkillProjectService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import javax.servlet.http.HttpSession; /** * @author 谢佳豪 * @data 2020/11/24 - 20:38 * @description 技能项目模块controller层 */ -@Api(tags = "项目模块-技能") @Controller @ResponseBody @RequestMapping("/skill") -@CrossOrigin(allowCredentials = "true") public class SkillProjectController { private SkillProjectService skillProjectService; @@ -49,15 +39,8 @@ public class SkillProjectController { * @param operation 操作符（0-保存、1-发布） * @return */ - @ApiOperation("填写表单，发布技能项目") @PostMapping("/{operation}") - public ResultInfo addSkillProject(@ApiParam("操作符") @PathVariable String operation, @ApiParam("技能信息") @RequestBody SkillProject skillProject, @ApiIgnore HttpSession httpSession){ - - //获取当前用户名 - User user = (User) httpSession.getAttribute("user"); - //设置发布者 - skillProject.setPublisher(user.getUsername()); - + public ResultInfo addSkillProject(@PathVariable String operation, SkillProject skillProject){ return skillProjectService.addSkillProject(skillProject, operation); } @@ -67,26 +50,19 @@ public class SkillProjectController { * @param winner 胜出者（用户名） * @return */ - @ApiOperation("技能项目发布者择出优胜者") @GetMapping("/choose") - public ResultInfo chooseWinner(@ApiParam("技能项目id") Integer id, @ApiParam("优胜者用户名") String winner){ + public ResultInfo chooseWinner(Integer id, String winner){ return skillProjectService.updateWinner(id, winner); } /** * 成为候选人 * @param id 项目id - * @param httpSession + * @param candidate 候选人 TODO 获取session域中的user.username * @return */ - @ApiOperation("用户参与该技能项目竞选") @GetMapping("/join") - public ResultInfo becomeCandidate(@ApiParam("技能项目id") Integer id, @ApiIgnore HttpSession httpSession){ - - //获取当前用户名为候选人 - User user = (User)httpSession.getAttribute("user"); - String candidate = user.getUsername(); - + public ResultInfo becomeCandidate(Integer id, String candidate){ return skillProjectService.addCandidatesList(id, candidate); } @@ -95,9 +71,8 @@ public class SkillProjectController { * @param projectName 项目名 * @return 响应结果 */ - @ApiOperation("搜索框模糊查询，获取项目基本信息") @GetMapping("/project") - public ResultInfo selectProject(@ApiParam("项目名称") String projectName, @ApiParam("类型") String type, @ApiParam("页数") Integer page){ + public ResultInfo selectProject(String projectName, String type, Integer page){ return sillProjectShowService.getProjectsByType(projectName, type, page); } @@ -106,9 +81,8 @@ public class SkillProjectController { * @param projectName 项目名 * @return 响应结果 */ - @ApiOperation("搜索框模糊查询，统计项目个数") @GetMapping("/count") - public ResultInfo countProject(@ApiParam("项目名称") String projectName, @ApiParam("类型") String type){ + public ResultInfo countProject(String projectName, String type){ return sillProjectShowService.countProjectByCondition(projectName, type); } diff --git a/share_project/src/main/java/com/share/controller/UserController.java b/share_project/src/main/java/com/share/controller/UserController.java index da4e14156fea12368aecb2ec559b66900881a512..88f684212ed65b3f6d5829e89802aa8e2e6239b9 100644 --- a/share_project/src/main/java/com/share/controller/UserController.java +++ b/share_project/src/main/java/com/share/controller/UserController.java @@ -5,32 +5,14 @@ import com.share.domain.PersonalUser; import com.share.domain.ResultInfo; import com.share.domain.User; import com.share.service.UserService; -import com.share.utils.CookieUtil; -import com.share.utils.KeyGeneratorUtil; -import com.share.utils.RedisUtil; import com.share.vo.LoginParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; -import org.springframework.util.DigestUtils; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; - import org.springframework.web.bind.annotation.RequestMapping; -import springfox.documentation.annotations.ApiIgnore; - -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.TimeUnit; /** * Demo Class @@ -38,11 +20,9 @@ import java.util.concurrent.TimeUnit; * @author 古市 * @date 2020-12-02 23:00 **/ -@Api(tags = "用户模块-个人") @Controller @RequestMapping("/user") @ResponseBody -@CrossOrigin(allowCredentials = "true") public class UserController { private UserService userService; @@ -52,219 +32,45 @@ public class UserController { this.userService = userService; } - private RedisUtil redisUtil; - - @Autowired - public void setRedisUtil(RedisUtil redisUtil) { - this.redisUtil = redisUtil; - } - /** * 注册用户 - * * @param user 用户数据 * @return 注册状态 */ - @ApiOperation("用户注册") - @PostMapping("/registration") - public ResultInfo registration(@ApiParam("用户实体类") @RequestBody User user) { + @RequestMapping("/registration") + public ResultInfo registration(User user){ return userService.registration(user); } - @ApiOperation("完善个人信息") - @PostMapping("/supplyPerson") - public ResultInfo supplyPersonalInfo(@ApiParam("个人信息实体类") @RequestBody PersonalUser user, HttpSession session) { - - User sessionUser = (User) session.getAttribute("user"); - - // 设置username - user.setUsername(sessionUser.getUsername()); + @PostMapping("/supplyPerson") + public ResultInfo supplyPersonalInfo(PersonalUser user){ return userService.supplyPersonalUser(user); } - @ApiOperation("完善公司信息") @PostMapping("/supplyCompany") - public ResultInfo supplyCompanyInfo(@ApiParam("公司信息实体类") @RequestBody CompanyUser user) { + public ResultInfo supplyCompanyInfo(CompanyUser user){ return userService.supplyCompanyUser(user); } - @ApiOperation("检验是否存在重复用户名") @GetMapping("/repeatUsername/{username}") - public ResultInfo repeatUsername(@ApiParam("用户名") @PathVariable String username) { + public ResultInfo repeatUsername(@PathVariable String username){ return userService.repeatUsername(username); } - @ApiOperation("检验是否存在重复手机号") @GetMapping("/repeatTelephone/{telephone}") - public ResultInfo repeatTelephone(@ApiParam("手机号") @PathVariable String telephone) { + public ResultInfo repeatTelephone(@PathVariable String telephone){ return userService.repeatTelephone(telephone); } - @ApiOperation("检验是否存在重复的邮箱") - @GetMapping("/repeatEmail") - public ResultInfo repeatEmail(@ApiParam("email") @RequestParam String email) { - return userService.repeatEmail(email); - } - - @ApiOperation("检验本地的JSESSIONID是否与redis一致") - @GetMapping("/isLogin") - public ResultInfo checkJsessionid(@ApiIgnore HttpServletRequest request, HttpSession session) { - - //比较两者的sessionId - if (CookieUtil.checkCookie(request, session)) { - - User user = (User) session.getAttribute("user"); - - //将已登录的用户的头像和用户名返回 - Map resultMap = new HashMap<>(); - resultMap.put("userPicture", user.getPicture()); - resultMap.put("username", user.getUsername()); - return ResultInfo.successInfo("已登录！", resultMap); - - } else { - return ResultInfo.failInfo("请先登录！"); - } - - - } - - @ApiOperation("用户登录") @PostMapping("/login") - public ResultInfo login(@ApiParam("登录验证实体类") @RequestBody LoginParam param, @ApiIgnore HttpSession session, @ApiIgnore HttpServletRequest request, @ApiIgnore HttpServletResponse response) { - - //对表单的密码进行加密 - String md5Password = DigestUtils.md5DigestAsHex(param.getPassword().getBytes()); - - //查询数据，比较是否登录成功 - User user = userService.login(param.getAccount(), md5Password); - - if (user != null && user.getUsername() != null) { - //修改用户的登录状态 - user.setOnline(true); - userService.updateOnlineState(user.getUsername(), true); - //session存放user信息 + public ResultInfo login(@RequestBody LoginParam param, HttpSession session){ + User user = userService.login(param.getAccount(), param.getPassword()); + if (user != null && user.getUsername() != null){ session.setAttribute("user", user); - - //key-value - String browserKey = "JSESSIONID"; - String redisKey = KeyGeneratorUtil.sessionIdKeyGenerate(user.getUsername(), "sessionId"); - String sessionId = session.getId(); - - //获取浏览器的cookie - String browserValue = CookieUtil.getCookie(request, browserKey); - - - if (redisUtil.get(redisKey) != browserValue || browserValue == null) { - //存储sessionId到redis，存放在hash集合中 - redisUtil.hset("sessionId", redisKey, sessionId, 2, 3); - //将sessionId作为cookie返回浏览器，设置JSESSIONID的存储时间 - CookieUtil.setCookie(request, response, browserKey, sessionId); - } - return ResultInfo.successInfo("登录成功"); } return ResultInfo.failInfo("请检查用户名和密码"); } - /** - * 用户安全登出 - * - * @param session - * @return - */ - @ApiOperation("用户登出") - @GetMapping("/logout") - public ResultInfo logout(@ApiIgnore HttpServletResponse response, @ApiIgnore HttpServletRequest request, @ApiIgnore HttpSession session) { - //修改用户的登录状态 - User user = (User) session.getAttribute("user"); - userService.updateOnlineState(user.getUsername(), false); - - //清空session域中的user - session.invalidate(); - - //清空浏览器指定的cookie - CookieUtil.clearAllCookies(request, response); - String redisKey = KeyGeneratorUtil.sessionIdKeyGenerate(user.getUsername(), "sessionId"); - - //删除redis中的key-value - redisUtil.hdel("sessionId", redisKey); - - return ResultInfo.successInfo("安全退出"); - - } - - /** - * 获取用户的基本信息 - * @param username 用户名 - * @return - */ - @GetMapping("/getUserInfo") - public ResultInfo getUserInfo(@RequestParam("username") String username){ - return userService.getUserInfo(username); - } - - - /** - * 根据用户名查询我的信息 - * @param session - * @return - */ - @GetMapping("/myInfo") - public ResultInfo getMyInfo(HttpSession session){ - - //修改用户的登录状态 - User user = (User) session.getAttribute("user"); - - return userService.getMyInfo(user.getUsername()); - } - - - /** - * 修改密码时 需要验证原密码 - * @param session - * @param password 密码 - * @return - */ - @GetMapping("/checkPassword") - public ResultInfo checkPassword(HttpSession session, String password){ - - //获取session域中的user - User user = (User) session.getAttribute("user"); - - //对表单的密码进行加密 - String md5Password = DigestUtils.md5DigestAsHex(password.getBytes()); - - User resultUser = userService.login(user.getUsername(), md5Password); - - if (resultUser != null) { - return ResultInfo.successInfo("密码正确，验证成功！"); - } else { - return ResultInfo.failInfo("密码错误，验证失败！"); - } - } - - @GetMapping("/updatePassword") - public ResultInfo updatePassword(HttpSession session, String newPassword){ - - //获取session域中的user - User user = (User) session.getAttribute("user"); - - //对表单的密码进行加密 - String md5Password = DigestUtils.md5DigestAsHex(newPassword.getBytes()); - - return userService.updatePassword(user.getUsername(), md5Password); - } - - @GetMapping("/getUserBalance") - public ResultInfo getUserBalance(HttpSession session){ - - //获取session域中的user - User user = (User) session.getAttribute("user"); - - return userService.selectUserBalance(user.getUsername()); - } - - - } diff --git a/share_project/src/main/java/com/share/mapper/DemandProjectMapper.java b/share_project/src/main/java/com/share/mapper/DemandProjectMapper.java index 114407b8301a1f7186b6b405c38fcd9b0fc3fcd3..6186eee0229c80c64498b7c8e382f1cff133b49c 100644 --- a/share_project/src/main/java/com/share/mapper/DemandProjectMapper.java +++ b/share_project/src/main/java/com/share/mapper/DemandProjectMapper.java @@ -2,13 +2,11 @@ package com.share.mapper; import com.share.domain.DemandProject; import com.share.vo.DemandProjectData; -import com.share.vo.KeywordSearchData; import com.share.vo.ProjectResponse; import com.share.vo.UserProjectListData; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import java.util.Date; import java.util.List; /** @@ -21,7 +19,7 @@ public interface DemandProjectMapper { /** * 插入需求项目数据 - * @param demandProject 需求项目表单数据 + * @param demandProject 需求项目表单数据 TODO 用户名如何填写到项目表单中！ * @return */ Integer insertDemandProject(DemandProject demandProject); @@ -30,10 +28,11 @@ public interface DemandProjectMapper { /** * 根据用户名查询需求项目、分页查询 * @param username 用户名 - * @param status + * @param startIndex 开始取值下标 + * @param pageSize 页面数据数量 * @return */ - List selectDemandProjectListByUsername(String username, String status); + List selectDemandProjectListByUsername(String username, Integer startIndex, Integer pageSize); /** * 根据用户名查询其需求项目的数量 @@ -59,14 +58,6 @@ public interface DemandProjectMapper { */ Integer updateDemandProject(@Param("username") String username, @Param("id") Integer id, @Param("demandProject") DemandProject demandProject); - /** - * 根据用户名获取已接单的项目 - * @param username 用户名 - * @param startIndex 开始取值下标 - * @param pageSize 数据量大小 - * @return - */ - List selectReceivedProject(String username, Integer startIndex, Integer pageSize); /** * 根据条件进行分页查询 @@ -84,20 +75,4 @@ public interface DemandProjectMapper { * @return 查询出来的项目总数 */ Integer countProjectByCondition(@Param("projectName") String projectName, @Param("type") String type); - - /** - * 根据keyword查询项目的词条 - * @param keyword - * @return - */ - List selectProjectByKeyword(@Param("keyword") String keyword); - - /** - * 根据时间间隔查询所有项目 - * @param currentTime - * @param startTime - * @return - */ - List selectProjectByTime(@Param("currentTime") String currentTime, @Param("startTime") String startTime); - } diff --git a/share_project/src/main/java/com/share/mapper/SkillProjectMapper.java b/share_project/src/main/java/com/share/mapper/SkillProjectMapper.java index 09a69c8e78be295422a290849e16b2ef3ff154f8..05d7e39250dbc1f17b4d96a22bc41b6c5b3464eb 100644 --- a/share_project/src/main/java/com/share/mapper/SkillProjectMapper.java +++ b/share_project/src/main/java/com/share/mapper/SkillProjectMapper.java @@ -1,14 +1,12 @@ package com.share.mapper; import com.share.domain.SkillProject; -import com.share.vo.KeywordSearchData; import com.share.vo.ProjectResponse; import com.share.vo.SkillProjectData; import com.share.vo.UserProjectListData; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import java.util.Date; import java.util.List; /** @@ -21,7 +19,7 @@ public interface SkillProjectMapper { /** * 插入技能项目数据 - * @param skillProject 技能项目表单数据 + * @param skillProject 技能项目表单数据 TODO 用户名如何填写到项目表单中！ * @return */ Integer insertSkillProject(SkillProject skillProject); @@ -29,10 +27,11 @@ public interface SkillProjectMapper { /** * 根据用户名查询技能需求项目、分页 * @param username 用户名 - * @param status + * @param startIndex 开始下标 + * @param pageSize 数据量 * @return */ - List selectSkillProjectListByUsername(String username, String status); + List selectSkillProjectListByUsername(String username, Integer startIndex, Integer pageSize); /** * 根据用户名查询其技能项目总数量 @@ -72,21 +71,4 @@ public interface SkillProjectMapper { * @return 项目基本信息列表 */ List selectProjectByCondition(String projectName, String type, Integer page); - - - /** - * 根据keyword查询项目的词条 - * @param keyword - * @return - */ - List selectProjectByKeyword(@Param("keyword") String keyword); - - /** - * 根据时间间隔查询数据 - * @param currentTime - * @param startTime - * @return - */ - List selectProjectByTime(@Param("currentTime") String currentTime, @Param("startTime") String startTime); - } diff --git a/share_project/src/main/java/com/share/service/impl/DemandProjectShowServiceImpl.java b/share_project/src/main/java/com/share/service/impl/DemandProjectShowServiceImpl.java index 9d3d5ae583c1de7be1a0d72a6bfa54c675392fe4..21319ebc5781e285828819e99d6c995bc8fb9c60 100644 --- a/share_project/src/main/java/com/share/service/impl/DemandProjectShowServiceImpl.java +++ b/share_project/src/main/java/com/share/service/impl/DemandProjectShowServiceImpl.java @@ -54,6 +54,7 @@ public class DemandProjectShowServiceImpl implements ProjectShowService { @Override public ResultInfo countProjectByCondition(String projectName, String type) { + ; return ResultInfo.successInfo("成功计算", demandProjectMapper.countProjectByCondition(projectName, type)); } } diff --git a/share_project/src/main/resources/mapper/SkillProjectMapper.xml b/share_project/src/main/resources/mapper/SkillProjectMapper.xml index 60a93217ab116d0239835cf9cf184135248a119d..d920821f08b17e73669050d0befb4be056c193e3 100644 --- a/share_project/src/main/resources/mapper/SkillProjectMapper.xml +++ b/share_project/src/main/resources/mapper/SkillProjectMapper.xml @@ -46,17 +46,6 @@ - - - - - - - - - - - insert into skill_project @@ -71,8 +60,8 @@ @@ -155,22 +144,4 @@ - - - - - - - \ No newline at end of file diff --git a/share_project/src/main/resources/static/css/index.css b/share_project/src/main/resources/static/css/index.css index 642d6b747e8251af960e0d3ab0c980b9bb386602..764d204e0b071354f0c39f8a0d10fc3c98d3b8d3 100644 --- a/share_project/src/main/resources/static/css/index.css +++ b/share_project/src/main/resources/static/css/index.css @@ -22,6 +22,15 @@ body { position: relative; } +.nav > a { + border-radius: 4px; + transition: all .3s; +} + +.nav > a:hover { + background-color: #e1e1e1; +} + .nav .skim, .publish { position: absolute; @@ -53,8 +62,10 @@ body { color: #F0CA10; line-height: 24px; text-align: center; + transition: background-color .2s; } + .nav .login { right: 53px; } @@ -239,6 +250,12 @@ hr { color: #FDFCF4; line-height: 48px; text-align: center; + transition: background-color .3s; +} + +.btn1:hover { + background: #3a5398; + color: #f3f3f3; } .btn2 { @@ -248,6 +265,11 @@ hr { border-radius: 24px; } +.btn2:hover { + background: #69278a; + color: #f3f3f3; +} + .right { position: absolute; top: 51px; @@ -259,4 +281,4 @@ hr { .right img { width: 100%; height: auto; -} \ No newline at end of file +} diff --git a/share_project/src/main/resources/static/css/login.css b/share_project/src/main/resources/static/css/login.css index 35f421eb948bd04826eb32e8d3a9b346be7d13e1..15e98340a6926d49bb7745c81bdff5bd1ec03f3d 100644 --- a/share_project/src/main/resources/static/css/login.css +++ b/share_project/src/main/resources/static/css/login.css @@ -2,7 +2,7 @@ body { margin: 0; padding: 0; background: url(../images/background.png); - background-color: #FEFDFA; + background-color: #FFFDF4; background-size: contain; } @@ -10,45 +10,79 @@ a { text-decoration: none; } -.logo { +@font-face { + /* font-properties */ + font-family: SourceHanSansCN-Bold; + src: url('../fonts/siyuan/SOURCEHANSANSCN-BOLD.OTF'); +} + +@font-face { + /* font-properties */ + font-family: SourceHanSansCN-Light; + src: url('../fonts/siyuan/SOURCEHANSANSCN-LIGHT.OTF'); +} + +@font-face { + /* font-properties */ + font-family: SourceHanSansCN-Mediem; + src: url('../fonts/siyuan/SOURCEHANSANSCN-MEDIUM.OTF'); +} + +@font-face { + /* font-properties */ + font-family: zcoolqingkehuangyouti; + src: url('../fonts/siyuan/ZCOOL_QINGKEHUANGYOUTI.TTF'); +} + +.name { position: absolute; - top: 26px; - left: 54px; - width: 91px; - height: 29px; + top: 30px; + left: 315px; + height: 27px; + font-size: 30px; + font-family: SourceHanSansCN-Bold; + font-weight: 500; + color: #FADA3C; + line-height: 30px; } -.logo img { - width: 100%; - height: auto; +.name span { + /* width: 56px; + height: 22px; */ + font-size: 30px; + font-family: zcoolqingkehuangyouti; + font-weight: 400; + color: #FADA3C; + line-height: 30px; } .box { - position: relative; - width: 507px; - height: 520px; - margin: 100px auto; + width: 390px; + height: 390px; + background: #FFFEF9; + border-radius: 5px; + margin: 120px auto; /* border: 1px solid red; */ - box-shadow: 0px 0px 10px #F9F5D5; - background: #FFFFFF; - border-radius: 8px; + box-shadow: 0px 0px 15px #F9F5D5; } .welcome { position: absolute; - top: 75.33px; - left: 50%; - transform: translateX(-50%); + top: 50.5px; + left: 135px; display: block; - font-size: 24px; + width: 120px; + height: 29px; + font-size: 30px; + font-family: SourceHanSansCN-Bold; font-weight: bold; color: #FADA3C; - font-family: SourceHanSansCN-Bold; + line-height: 30px; } .box { position: relative; - background-color: #FFF!important; + background-color: #FFFEF9!important; } .box form { @@ -57,72 +91,59 @@ a { .uname { position: absolute; - top: 176px; - left: 80px; - width: 347px; + top: 125px; + left: 64.5px; + width: 260px; height: 35px; border: none; - outline: none; - border-bottom: 1px solid #666; + border-bottom: 1px solid #777777; line-height: 55px; font-weight: 300; - font-size: 14px; } .password { position: absolute; - top: 246px; - left: 80px; - width: 347px; + top: 179px; + left: 64.5px; + width: 260px; height: 35px; border: none; - outline: none; - border-bottom: 1px solid #666; + border-bottom: 1px solid #777777; line-height: 55px; font-weight: 300; - font-size: 14px; -} - -.focus { - color: #FADA3C; - border-bottom: 2px solid #FADA3C; } .box .btn { position: absolute; - bottom: 118px; - left: 50%; - transform: translateX(-50%); + top: 277px; + left: 65px; + width: 260px; + height: 26px; + background: #FADA3C; + border-radius: 13px; border: none; - outline: none; + line-height: 26px; font-size: 16px; font-family: SourceHanSansCN-Bold; font-weight: bold; color: #FFFFFF; cursor: pointer; - width: 347px; - height: 32px; - background: #FADA3C; - box-shadow: 0px 3px 4px 1px rgba(250, 224, 96, 0.26); - border-radius: 16px; -} - -.box .btn:hover { - background-color: #FFB800; } -.phone, -.forget { +.phone { position: absolute; - top: 302px; - left: 80px; + top: 218px; + left: 64.5px; + width: 73px; + height: 12px; + font-size: 12px; font-family: SourceHanSansCN-Light; - color: #999999; - font-size: 9px; font-weight: 300; + color: #999999; + line-height: 30px; } -.a { +.forget { position: absolute; top: 218px; left: 271px; @@ -137,14 +158,14 @@ a { .register { position: absolute; - bottom: 44px; - width: 100%; + top: 350px; + left: 60px; + height: 12px; font-size: 12px; font-family: SourceHanSansCN-Light; font-weight: 300; color: #FADA3C; line-height: 30px; - text-align: center; } .register i { diff --git a/share_project/src/main/resources/static/css/page-pay.css b/share_project/src/main/resources/static/css/page-pay.css index 101add5e06b74f7a566b6c9b09bf955881c0e703..cb5c696c34c0cff7b7839d5a480700444f86645a 100644 --- a/share_project/src/main/resources/static/css/page-pay.css +++ b/share_project/src/main/resources/static/css/page-pay.css @@ -38,13 +38,19 @@ body { height: 50px; width: 180px; text-align: center; + background-color: #f5f5f5; + margin-left: 5px; + border-radius: 8px; + transition: all .2s; + cursor: pointer; } .top-nav li:hover { background-color: #FDFAEB; } -.top-nav a:hover { + +.top-nav li:hover > a { color: #FADA3C; } @@ -69,7 +75,7 @@ body { .top-nav li .bar1 { top: 44px; - left: 66px; + left: 70px; } .top-nav li:first-of-type:hover .bar1 { @@ -78,7 +84,7 @@ body { .top-nav li .bar2 { top: 44px; - left: 246px; + left: 255px; } .top-nav li:last-of-type:hover .bar2 { @@ -86,7 +92,7 @@ body { } -/* 头像 +/* 头像 .person-center{ position: absolute; left: 900px; @@ -128,10 +134,10 @@ body { } -/* 头像下的列表 +/* 头像下的列表 .picul { - + width: 48px; height: 52px; background: #FFFFFF; @@ -149,12 +155,12 @@ body { color: #666666; transform: scale(0.85); line-height: 26px; - + } .picul li a{ line-height: 26px; font-size: 6px; -} +} .picul li:hover { color: #EEC708; @@ -304,6 +310,23 @@ body { height: 230px; border: 1px solid transparent; margin: 0 auto; + cursor: pointer; + transition: background-color .2s; + border-radius: 10px; +} + +.set-meal ul li:hover { + background-color: #fcf5e5; + /*background-color: #F8F4E6;*/ +} + +.set-meal ul li:visited { + background-color: #f8f2dd; + /*background-color: #F8F4E6;*/ +} + +.set-meal-bgc { + background-color: #f8f2dd; } .set-meal ul li a { @@ -343,7 +366,7 @@ body { } .liclick { - background-color: #F8F4E6; + background-color: #f8f2dd; border: 1px solid #FADA3C; border-radius: 10px; } @@ -404,6 +427,12 @@ body { color: #FFF; font-size: 10px; outline: none; + transition: background-color .3s; + cursor: pointer; +} + +.btn01:hover { + background-color: #5776c4; } .bottom-title { @@ -450,4 +479,4 @@ body { font-size: 15px; top: 760px; left: 480px; -} \ No newline at end of file +} diff --git a/share_project/src/main/resources/static/css/registerchoice.css b/share_project/src/main/resources/static/css/registerchoice.css new file mode 100644 index 0000000000000000000000000000000000000000..95a4327e7e491b75ac62bbfd85838ee890cd5331 --- /dev/null +++ b/share_project/src/main/resources/static/css/registerchoice.css @@ -0,0 +1,160 @@ +body { + margin: 0; + padding: 0; + background: url(../images/background.png); + background-color: #FFFDF4; + background-size: 1000px; +} + +* { + margin: 0; + padding: 0; +} + +a { + text-decoration: none; +} + +@font-face { + /* font-properties */ + font-family: SourceHanSansCN-Bold; + src: url('../fonts/siyuan/SOURCEHANSANSCN-BOLD.OTF'); +} + +@font-face { + /* font-properties */ + font-family: SourceHanSansCN-Light; + src: url('../fonts/siyuan/SOURCEHANSANSCN-LIGHT.OTF'); +} + +@font-face { + /* font-properties */ + font-family: SourceHanSansCN-Mediem; + src: url('../fonts/siyuan/SOURCEHANSANSCN-MEDIUM.OTF'); +} + +@font-face { + /* font-properties */ + font-family: zcoolqingkehuangyouti; + src: url('../fonts/siyuan/ZCOOL_QINGKEHUANGYOUTI.TTF'); +} + +@font-face { + /* font-properties */ + font-family: SourceHanSansCN-Regular; + src: url('../fonts/siyuan/SOURCEHANSANSCN-REGULAR.OTF'); +} + +.name { + position: absolute; + top: 30px; + left: 315px; + height: 27px; + font-size: 30px; + font-family: SourceHanSansCN-Bold; + font-weight: 500; + color: #FADA3C; + line-height: 30px; +} + +.name span { + /* width: 56px; + height: 22px; */ + font-size: 30px; + font-family: zcoolqingkehuangyouti; + font-weight: 400; + color: #FADA3C; + line-height: 30px; +} + +.box { + width: 401px; + height: 220px; + /* border: 1px solid red; */ + margin: 180px auto; +} + +.left { + float: left; + position: relative; + width: 160px; + height: 220px; + background: #FFFDF4; + border-radius: 9px; + /* background-color: pink; */ + box-shadow: 0px 0px 15px #F9F5D5; +} + +.person { + position: absolute; + top: 25.5px; + left: 29px; + width: 100px; + height: 100px; + background: #FBE05C; + border-image: linear-gradient(0deg, #FADA3C, #FADA3C) 10 10; + border-radius: 39px; +} + +.person img { + margin-left: 7.5px; + margin-top: 7.5px; + width: 83.5px; +} + +.left span, +.right span { + position: absolute; + left: 39.5px; + top: 150px; + width: 81px; + height: 19px; + font-size: 20px; + font-family: SourceHanSansCN-Bold; + font-weight: bold; + color: #FADA3C; + line-height: 30px; +} + +.right { + position: relative; + width: 160px; + float: right; + height: 220px; + background: #FFFDF4; + border-radius: 9px; + /* background-color: pink; */ + box-shadow: 0px 0px 15px #F9F5D5; +} + +.company { + position: absolute; + top: 25.5px; + left: 30px; + width: 100px; + height: 100px; + background: #FBE05C; + border-image: linear-gradient(0deg, #FADA3C, #FADA3C) 10 10; + border-radius: 39px; +} + +.company img { + margin-left: 9px; + margin-top: 9px; + width: 82.5px; +} + +.info { + position: absolute; + bottom: 0px; + width: 160px; + height: 26px; + background: #FADA3C; + border-radius: 0px 0px 9px 9px; + font-size: 12px; + font-family: SourceHanSansCN-Regular; + font-weight: 400; + color: #FFFFFF; + line-height: 26px; + text-align: center; +} \ No newline at end of file diff --git a/share_project/src/main/resources/static/css/search.css b/share_project/src/main/resources/static/css/search.css index 1346e95bb2f3c6aa365eb45fd2f12ae5f900351d..6f8e1448f9172e8b845420e8765d6e648d486edf 100644 --- a/share_project/src/main/resources/static/css/search.css +++ b/share_project/src/main/resources/static/css/search.css @@ -29,6 +29,16 @@ body { position: relative; } +.nav > a { + border-radius: 4px; + transition: all .3s; +} + +.nav > a:hover { + background-color: #e1e1e1; + color: #3C3B36; +} + .nav .skim, .publish { position: absolute; @@ -60,8 +70,10 @@ body { color: #F0CA10; line-height: 24px; text-align: center; + transition: background-color .2s; } + .nav .login { right: 53px; } @@ -248,4 +260,4 @@ body { border-radius: 1px; margin-left: 10px; padding: 4px 10.5px; -} \ No newline at end of file +} diff --git a/share_project/src/main/resources/static/fonts/siyuan/ZCOOL_QINGKEHUANGYOUTI.TTF b/share_project/src/main/resources/static/fonts/siyuan/ZCOOL_QINGKEHUANGYOUTI.TTF new file mode 100644 index 0000000000000000000000000000000000000000..f8f46eedfb291b464b0b734a52f16af107ad0129 Binary files /dev/null and b/share_project/src/main/resources/static/fonts/siyuan/ZCOOL_QINGKEHUANGYOUTI.TTF differ diff --git a/share_project/src/main/resources/static/pages/login.html b/share_project/src/main/resources/static/pages/login.html new file mode 100644 index 0000000000000000000000000000000000000000..e77ccb8d39a32e4bb11bdb090f7144b00ab1f403 --- /dev/null +++ b/share_project/src/main/resources/static/pages/login.html @@ -0,0 +1,56 @@ + + + + + + + Document + + + + +
最share
+ +
+ 欢迎登录 + + 忘记密码？ +
+ + + +
+ ——————未有账号？点此注册>>—————— +
+ + + + + + + \ No newline at end of file diff --git a/share_project/src/main/resources/static/pages/registerchoice.html b/share_project/src/main/resources/static/pages/registerchoice.html new file mode 100644 index 0000000000000000000000000000000000000000..4b8ec779c9b2789a655a9c3890cce4fbcbcf691d --- /dev/null +++ b/share_project/src/main/resources/static/pages/registerchoice.html @@ -0,0 +1,54 @@ + + + + + + + Document + + + + +
最share
+
+
+ +
+ +
+ 个人注册 +
Individual
+
+ +
+ +
+ +
+ 公司注册 +
Company
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + diff --git a/share_project/src/main/resources/static/pay-page.html b/share_project/src/main/resources/static/pay-page.html index d3b303d37bb21cd2598d3cad6be9d2f415b8cdfe..a2c00e606f8c206ca3905b015c2d29e422ab9c00 100644 --- a/share_project/src/main/resources/static/pay-page.html +++ b/share_project/src/main/resources/static/pay-page.html @@ -30,7 +30,7 @@ - +
    @@ -40,7 +40,7 @@
  • 退出
    • - +
--> @@ -69,7 +69,7 @@

套餐选择