diff --git a/.gitignore b/.gitignore index 72cb0b7534647201a06f79851b5fb6c35f96ef0a..b54e7c0803f8888a690d398c1902f0459bb5b52e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,19 @@ # 项目排除路径 -/target/ \ No newline at end of file +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar + +**/mvnw +**/mvnw.cmd +**/.mvn +**/target +**/.gitignore +.idea diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 35410cacdc5e87f985c93a96520f5e11a5c822e4..0000000000000000000000000000000000000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# 默认忽略的文件 -/shelf/ -/workspace.xml -# 基于编辑器的 HTTP 客户端请求 -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 4c2e95feb545652a5236a2248370d632914dd31a..0000000000000000000000000000000000000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml deleted file mode 100644 index b95c246b80b060cda71223d5c978ef0985a531a2..0000000000000000000000000000000000000000 --- a/.idea/dataSources.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - mysql.8 - true - com.mysql.cj.jdbc.Driver - jdbc:mysql://8.136.81.47:3306 - $ProjectFileDir$ - - - \ No newline at end of file diff --git a/.idea/deployment.xml b/.idea/deployment.xml deleted file mode 100644 index a46789b17cdb420efb2e5a28e3ff8ea5ac8d3368..0000000000000000000000000000000000000000 --- a/.idea/deployment.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 63e900193296f8ed911a1b9f5b051cf908099431..0000000000000000000000000000000000000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 742577db159b9387c8a9ab4d02b274807fb2b090..0000000000000000000000000000000000000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index 712ab9d985c20018a0c97b93d2148ac1ffe588a5..0000000000000000000000000000000000000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/jpa-buddy.xml b/.idea/jpa-buddy.xml deleted file mode 100644 index d08f40080caa9b3126ee8385c13832d2e63f4ad6..0000000000000000000000000000000000000000 --- a/.idea/jpa-buddy.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml deleted file mode 100644 index f56442a464e8cdd9e8358d857012792244f316ec..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_7.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_7.xml deleted file mode 100644 index 2a7be23b6e3a548d7ae7ea3bec936e20cdcec1ab..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_7.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_7.xml deleted file mode 100644 index c86fadcbfe93cc5b1c3b624a463c6493518e41af..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__cn_hutool_hutool_all_5_3_3.xml b/.idea/libraries/Maven__cn_hutool_hutool_all_5_3_3.xml deleted file mode 100644 index c565480c9e124085c616f357817ef6f7b69de899..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__cn_hutool_hutool_all_5_3_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml deleted file mode 100644 index 42f9e5cb1f3eab00305df7ffd99925f659e8ee9d..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_auth0_java_jwt_3_11_0.xml b/.idea/libraries/Maven__com_auth0_java_jwt_3_11_0.xml deleted file mode 100644 index 20537bbe39c2afbd445b433a5e6c6f147046f827..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_auth0_java_jwt_3_11_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_2_0.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_2_0.xml deleted file mode 100644 index e4a4a680a99aa1ba8eeb45a42b0c57533618212d..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_2_0.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_2_0.xml deleted file mode 100644 index 8ae7b709ddfc3b4279538d1e049c6281373a6925..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_2_0.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_2_0.xml deleted file mode 100644 index 249af6d38f2f6aeb183ff55b0af1408af5c65f0b..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_2_0.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_2_0.xml deleted file mode 100644 index 2b498ecfd226a81c4d5a654f4962a33e274d3ecf..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_2_0.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_2_0.xml deleted file mode 100644 index abaf362ee5722f44beccaad2e9ec553f23f9f815..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_2_0.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_2_0.xml deleted file mode 100644 index 0825d9306fbb3b9943e74d41b43ddb50b6a98cbe..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 9aa1658ae392dbfe2525a6a99147a9d648befebe..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_0.xml deleted file mode 100644 index 3f740bf7038b8786f556163653422ac1650a1191..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_0.xml deleted file mode 100644 index 18462852f7909e9f3a0beec24143fdb75a4fa811..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_0.xml deleted file mode 100644 index 0348533c3a55c02fcfc10663c40a771051c12d4c..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_0.xml deleted file mode 100644 index f00ae97203816ef663fe14d80356801365d1ddf7..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_0.xml deleted file mode 100644 index 27e59b8cd27a2999d6e77370a0aece0e7e6af755..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_0.xml deleted file mode 100644 index bb52f2562ea1fe2338f583f47a6fe92eb2792afe..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_1.xml b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_1.xml deleted file mode 100644 index fc4a883d056152334d5256d63bf1e8893b2da76d..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_qcloudsms_qcloudsms_1_0_6.xml b/.idea/libraries/Maven__com_github_qcloudsms_qcloudsms_1_0_6.xml deleted file mode 100644 index e0016bf0985b83e29e95ed60867ee0637c2923a7..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_github_qcloudsms_qcloudsms_1_0_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_9.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_9.xml deleted file mode 100644 index 29081f0e9d3d21132ebabf40e80d8fdcc13c0462..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_6_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_6_0.xml deleted file mode 100644 index 510eca210c22d7ef97181911d97c239a1139b3b2..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_6_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_squareup_okhttp_logging_interceptor_2_7_5.xml b/.idea/libraries/Maven__com_squareup_okhttp_logging_interceptor_2_7_5.xml deleted file mode 100644 index 18b0c0d1197e6efe46957ce800dbc90bb324d055..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_squareup_okhttp_logging_interceptor_2_7_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_squareup_okhttp_okhttp_2_5_0.xml b/.idea/libraries/Maven__com_squareup_okhttp_okhttp_2_5_0.xml deleted file mode 100644 index 63272b6f5deefabeefc52c2a119b07f348494e2b..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_squareup_okhttp_okhttp_2_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_squareup_okio_okio_1_12_0.xml b/.idea/libraries/Maven__com_squareup_okio_okio_1_12_0.xml deleted file mode 100644 index e2064dfa2c3c0b7bd38e5e8a30b73b8b82164278..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_squareup_okio_okio_1_12_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 03d08ff739f2f104718e1d045804c65ef84cc66f..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_12.xml b/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_12.xml deleted file mode 100644 index f20b35fbe54aec2a1951437372157960ae306b18..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_tencentcloudapi_tencentcloud_sdk_java_3_1_111.xml b/.idea/libraries/Maven__com_tencentcloudapi_tencentcloud_sdk_java_3_1_111.xml deleted file mode 100644 index 28d24dd12bd781b802b8220dae1e5340b35f228f..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_tencentcloudapi_tencentcloud_sdk_java_3_1_111.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml deleted file mode 100644 index 389997788e9e1a4163d1a7ab38d824ac08f96847..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml deleted file mode 100644 index b5eceb8455c91113fbee6165abb92414b35187a6..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_15.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_15.xml deleted file mode 100644 index 7b02399a780d9f7cea0de9ea39f3fc73edabe889..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__commons_codec_commons_codec_1_15.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_lettuce_lettuce_core_6_1_5_RELEASE.xml b/.idea/libraries/Maven__io_lettuce_lettuce_core_6_1_5_RELEASE.xml deleted file mode 100644 index 418ea3fefc03535f548435c63db09e37d7293d36..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__io_lettuce_lettuce_core_6_1_5_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_70_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_70_Final.xml deleted file mode 100644 index 2d1e684bb5e172c3eb40dc3c28515b7b2892340c..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_70_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_4_1_70_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_1_70_Final.xml deleted file mode 100644 index 20a5d8b2c807135ad7f1fdf68d0bf83297139d13..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__io_netty_netty_codec_4_1_70_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_common_4_1_70_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_1_70_Final.xml deleted file mode 100644 index 4feeb1f3e0da9876e34578dc0943daeaa9973504..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__io_netty_netty_common_4_1_70_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_handler_4_1_70_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_4_1_70_Final.xml deleted file mode 100644 index 4a7d9651947367f9875af772b23e64136ce89ebc..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__io_netty_netty_handler_4_1_70_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_70_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_70_Final.xml deleted file mode 100644 index 78499eab3572e7179e392105d4b61bc41e82f144..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_70_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_4_1_70_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_1_70_Final.xml deleted file mode 100644 index 81d7c2d86158c25fe660345ff88830fceef1d33b..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__io_netty_netty_transport_4_1_70_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_4_12.xml b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_4_12.xml deleted file mode 100644 index d9049f98b9cca43bc17a110f1e49d368f8ff2970..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_4_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 4b21a7628ad8930ff50b7eabf6132c0a81fffcc6..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 39760fa7ecd383df1f7b06ecdc8262fcbdedaa38..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml b/.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml deleted file mode 100644 index 1dfde191bf741ce0dfe3a02a98a5fdba2684a8e9..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml b/.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml deleted file mode 100644 index 9127f871c0d2859e833c56c139e402bdbf022caf..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml b/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml deleted file mode 100644 index 54f9c8a29c3c438facdf652610753a01e1b02474..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 61d47cfb8f3dbc76ee9925bd7d4f6082329e4659..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml b/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml deleted file mode 100644 index c37b881710d1fb5dc58bacc243aa2aac72fb4ade..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml b/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml deleted file mode 100644 index 5f94227c5434975853b480463a4d128d36ee6b5a..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__log4j_log4j_1_2_17.xml b/.idea/libraries/Maven__log4j_log4j_1_2_17.xml deleted file mode 100644 index abf1ff97de2f42f7c22fbcd8bb31f293c789f3ca..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__log4j_log4j_1_2_17.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_27.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_27.xml deleted file mode 100644 index ec13012fb3ed1da19eecd5b61c42829c6acd87ea..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_27.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_11_22.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_11_22.xml deleted file mode 100644 index 055803924665f8c35e52467192abd2e58dd30fc4..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_11_22.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_11_22.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_11_22.xml deleted file mode 100644 index c334ffedc7286f7697831eb44132edb553d7cab4..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_11_22.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_7.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_7.xml deleted file mode 100644 index 6bf0b54fe3b125344e8e286884de0e2194833af8..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_4_7.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_4_7.xml deleted file mode 100644 index 87c5dc1f728b17baa06d67f7096c4ad26b202838..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__net_minidev_json_smart_2_4_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_11_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_11_1.xml deleted file mode 100644 index 55ad8f166470d5585db33e42e945f3bafc5f44ab..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_11_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_13.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_13.xml deleted file mode 100644 index 5620ea9d6871a94e28539421df68dddb3611ef50..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_14.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_14.xml deleted file mode 100644 index 707c9bfd24f4dc0665ade68a0778bc217b2811f5..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_14.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_13.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_13.xml deleted file mode 100644 index cc7d508b38204da808cf09a27e73cc6472fb8d7e..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_14_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_14_1.xml deleted file mode 100644 index 89d0d4fe0faa5d82d28e81710d0b90573010ca07..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_14_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_14_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_14_1.xml deleted file mode 100644 index 9c1e2d1f925d9f227899c5d085078454d8dd2950..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_14_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_55.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_55.xml deleted file mode 100644 index d3920c32080d07e8496e9144a8f9307a43eb42fb..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_55.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_55.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_55.xml deleted file mode 100644 index 316c5997a732daf87415c98ec61d2cd184e6936e..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_55.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_55.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_55.xml deleted file mode 100644 index 89dd40146ec8c35c68eeb41c1394b94db7d50328..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_55.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml deleted file mode 100644 index 645e245589454def16f59e4a7aeb2cdc3f7d8a31..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_7.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_7.xml deleted file mode 100644 index bb8fa1905e9f1c08fb2303c4766b09892a7ba4e0..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_21_0.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_21_0.xml deleted file mode 100644 index 58fe1f5cdcb9c7374a2e9eaebc77140ee41a4c0f..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_assertj_assertj_core_3_21_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_freemarker_freemarker_2_3_31.xml b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_31.xml deleted file mode 100644 index 53045c3482edffa0dd68e6b37ba77189bce5ab8e..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_freemarker_freemarker_2_3_31.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_5.xml b/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_5.xml deleted file mode 100644 index 2b1ceb63d72fa541116a5fdbb16ddfa6ed0e64a9..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_5.xml b/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_5.xml deleted file mode 100644 index 51ad2d61091c623602e6c9e5a80797cbd929544e..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index ae33eaf23b956babfe768e19e88129322e5c479e..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_2_Final.xml deleted file mode 100644 index b17d24b3ea352d3083fc6f5e26e7b32df444d9af..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_2_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_5_6_1_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_5_6_1_Final.xml deleted file mode 100644 index 83830f4d4298ff589d143ff1c43e62400875ce23..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_hibernate_hibernate_core_5_6_1_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_2_0_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_2_0_Final.xml deleted file mode 100644 index 462684d397584762db6da82eb22298ca7d234bb4..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_2_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_2_2_3_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_2_2_3_Final.xml deleted file mode 100644 index 0d343df5084691db80b336abe5ba08f21158a1c5..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_jboss_jandex_2_2_3_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_2_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_2_Final.xml deleted file mode 100644 index 776cdc1ac26de4500d7a7919fa33273057062b1c..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_2_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20170516.xml b/.idea/libraries/Maven__org_json_json_20170516.xml deleted file mode 100644 index dfe40bf219c5a286947a489c11b525c0222bccf8..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_json_json_20170516.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_1.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_1.xml deleted file mode 100644 index d275b1a0a8e4adaeb1d57665c190aba30e3cf0e3..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_1.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_1.xml deleted file mode 100644 index 623e7d33008b54a3172a211801d5fb9954dd0f18..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_1.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_1.xml deleted file mode 100644 index 2fc8e302d139fc354a369fecdfe53996a59780a9..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_1.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_1.xml deleted file mode 100644 index 18eac21c461aecd8cab0648c770fe8ae74ee16fa..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_1.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_1.xml deleted file mode 100644 index 483e914a03f84c78ff01feba7aa67daf03536f31..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_1.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_1.xml deleted file mode 100644 index 4f26a1241244ea40ed416c68b17d141418eb5a5c..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_4_0_0.xml b/.idea/libraries/Maven__org_mockito_mockito_core_4_0_0.xml deleted file mode 100644 index 43f70cfcad7ffc657b20a8c1906c3b10a8b4eda5..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_mockito_mockito_core_4_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_4_0_0.xml b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_4_0_0.xml deleted file mode 100644 index cedd96c59c2051d5e7e69c9c9487caa835533fbc..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_4_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_2.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_2.xml deleted file mode 100644 index bfcc44e9a565078aee7f46b70bc5fb7b4833e843..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_2.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_2.xml deleted file mode 100644 index 230090d7c5bd31c04a5e753757f7c126c6e1fa85..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml b/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml deleted file mode 100644 index d106a5e8bddb188d05a46058bdfe1566f0c4261a..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 5b7d0e0981001fff6e1c1ee314fc348fad5b429d..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml deleted file mode 100644 index 2c5c1261aa71b8d0c972260bcaac05bfdd47c692..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_22.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_22.xml deleted file mode 100644 index 7ebafb5c691fc78fb434af0e5bf0265ca8a35be1..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_22.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml deleted file mode 100644 index b9b3e6127f582c5d5725855598f7627eda8f1764..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml deleted file mode 100644 index 05fb21c930117faa019420229a6399af3855bd91..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_32.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_32.xml deleted file mode 100644 index 0051c44f6dcd71e358622457f6a0bd3a410c275d..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_32.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_32.xml deleted file mode 100644 index b94efe1d28a3ff52af28df54fe3728a4064914a6..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_6_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_6_1.xml deleted file mode 100644 index 41e6cb7e6deb51c76b221528cebe31055a969142..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_6_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_6_1.xml deleted file mode 100644 index f4ab6e86a9b7893795b71d3671bcb2aa4f2d72d2..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_6_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_6_1.xml deleted file mode 100644 index f8325df466068322a844f01ac16e3ca207547eb5..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_6_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_6_1.xml deleted file mode 100644 index b06346f75668993257e16fad918873b74aed16ab..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_6_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_6_1.xml deleted file mode 100644 index a270219c1cade320c6bb2d0872e0e1a8dc2851b6..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_6_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_6_1.xml deleted file mode 100644 index ab43ecfb88dbbb2412b5f6262b3932152d9bc53a..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_6_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_6_1.xml deleted file mode 100644 index a5ca88bf7002821914f7645299016494f10b7f11..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_6_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_6_1.xml deleted file mode 100644 index a8a1b9dd7a09a2445a599db2dcce8e8f7e8671f2..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_6_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_6_1.xml deleted file mode 100644 index 10553ae22ed6d35fe16f378cdcd380eaed573014..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_6_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_6_1.xml deleted file mode 100644 index 5c1c7c6791a3cd0bffe86549833c328faaa31ee7..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_6_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_6_1.xml deleted file mode 100644 index 675cdeaf17287317b698ca9ff29ab1990dc8e33e..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_6_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_6_1.xml deleted file mode 100644 index 24a9d7df4bec3e52cd69d52a0864d0a84729b383..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_6_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_6_1.xml deleted file mode 100644 index b1aa34c8478ca6c1d13d90997ce876d8d1149755..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_6_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_6_1.xml deleted file mode 100644 index d32205f43fed34ad1a57dde87306f75c26fc9d97..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_6_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_6_1.xml deleted file mode 100644 index 4dcd1c3ff403cdbe3b6b2471d11049a3e11050c1..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_6_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_6_1.xml deleted file mode 100644 index 9c157f362709d8210fa3de45a7c7d387f255908d..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_6_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_6_1.xml deleted file mode 100644 index 8dcf40c80f91cfef4d94886a7b38e070601dd26f..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_6_0.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_6_0.xml deleted file mode 100644 index 2de922f8997fc253fb6d0f882a6d8eadffa6c4c8..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_6_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_6_0.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_6_0.xml deleted file mode 100644 index fe7925a3cbd143bc14163101f8e99ab345556e44..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_6_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_6_0.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_6_0.xml deleted file mode 100644 index 77450ce91290863819affa8b6a665d946d121f31..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_6_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_6_0.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_6_0.xml deleted file mode 100644 index ba10bc75e9062e89f83b0b2bfe67ea3aba82623f..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_6_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_3_13.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_3_13.xml deleted file mode 100644 index 56374d9e1e7e4ecfffdd82d4e1a060bd1f160737..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_spring_aop_5_3_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aspects_5_3_13.xml b/.idea/libraries/Maven__org_springframework_spring_aspects_5_3_13.xml deleted file mode 100644 index e7fc8cf0f55875b3c833a8c41da7cf0b5a3effee..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_spring_aspects_5_3_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_3_13.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_3_13.xml deleted file mode 100644 index a929c7484998fca9daecc37bc4218e0c96e33252..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_spring_beans_5_3_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_3_13.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_3_13.xml deleted file mode 100644 index 44ee227a6e9e88bf5ea305542017855557818b08..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_spring_context_5_3_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_13.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_13.xml deleted file mode 100644 index c5e184f3189e344606dd71f982fadfd57e6a1c4b..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_3_13.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_3_13.xml deleted file mode 100644 index 1891c47b6489d67e6f12115ab3573992b68c4919..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_spring_core_5_3_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_3_13.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_3_13.xml deleted file mode 100644 index 448d62625d764277e9c39d4d3b5ccd4882f19a7f..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_spring_expression_5_3_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_13.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_13.xml deleted file mode 100644 index 7278cca01e8af1b1824cae9c7162f5883dd043f3..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_13.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_13.xml deleted file mode 100644 index 0ecde7bfd64e90d4f69398ad33e9ce925bed20a9..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_5_3_13.xml b/.idea/libraries/Maven__org_springframework_spring_orm_5_3_13.xml deleted file mode 100644 index d9d571340569bd7a0fefdd1d5d006b04041bbef2..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_spring_orm_5_3_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_oxm_5_3_13.xml b/.idea/libraries/Maven__org_springframework_spring_oxm_5_3_13.xml deleted file mode 100644 index 766a74ef14fc74fb420bb211f8141faa8c75b792..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_spring_oxm_5_3_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_3_13.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_3_13.xml deleted file mode 100644 index 2a6853fef4d3ccd0b3bef10cf8151bf7b07c3c01..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_spring_test_5_3_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_3_13.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_3_13.xml deleted file mode 100644 index fc9142fc196d7689a766e1503ba9c41589a4b8a5..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_spring_tx_5_3_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_3_13.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_3_13.xml deleted file mode 100644 index 9d967de87857805bd541858fc7390faa8105998e..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_spring_web_5_3_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_13.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_13.xml deleted file mode 100644 index a4c7c75d22f7794b8e52138cfdf3239ac8ea76fe..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_3.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_3.xml deleted file mode 100644 index 5de598dfcb6351b795b09bf28571adcfec61cadf..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_29.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_29.xml deleted file mode 100644 index 246aa4d39962b2823c394c4195ad8a4b2a20ba56..0000000000000000000000000000000000000000 --- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_29.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 5755a998780a3352b3706bc6c89e9280257b8d39..0000000000000000000000000000000000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 94bc3e30079c0bf461f5b1ef4b79486879836724..0000000000000000000000000000000000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 797acea53eb091cf5b30518802c3073f544adeed..0000000000000000000000000000000000000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/sshConfigs.xml b/.idea/sshConfigs.xml deleted file mode 100644 index 4ae4d799a06349396f2f5821bd748d1ba3d2c0a7..0000000000000000000000000000000000000000 --- a/.idea/sshConfigs.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534fb27b68192f27f985d3879e173ec77adb8..0000000000000000000000000000000000000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f4cb416c083d265558da75d457237d671..0000000000000000000000000000000000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/webServers.xml b/.idea/webServers.xml deleted file mode 100644 index 7c1d6bfe066e468af7d072dab0d4dcb764cd7ed0..0000000000000000000000000000000000000000 --- a/.idea/webServers.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/BaoGe_backend.iml b/BaoGe_backend.iml new file mode 100644 index 0000000000000000000000000000000000000000..b869b366cffe1a6879351c352e09822044477a3c --- /dev/null +++ b/BaoGe_backend.iml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Baoge-common/Baoge-common.iml b/Baoge-common/Baoge-common.iml new file mode 100644 index 0000000000000000000000000000000000000000..d8f4bb1a17d7901fd32979a99eac40f79a55c0d5 --- /dev/null +++ b/Baoge-common/Baoge-common.iml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Baoge-common/pom.xml b/Baoge-common/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..28d77b8018a38437b48c995326e20bfbbd2cf8c3 --- /dev/null +++ b/Baoge-common/pom.xml @@ -0,0 +1,67 @@ + + + + BaoGe_backend + cn.edu.zjut.baoge + 1.0-SNAPSHOT + + 4.0.0 + + Baoge-common + 每一个微服务公共的依赖，bean，工具类等 + + 8 + 8 + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + javax.validation + validation-api + 2.0.1.Final + + + org.projectlombok + lombok + RELEASE + compile + + + org.apache.httpcomponents + httpcore + 4.4.15 + compile + + + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + 2.1.0.RELEASE + pom + import + + + com.alibaba.cloud + aliyun-spring-boot-dependencies + 1.0.0 + pom + import + + + + diff --git a/src/main/java/com/markerhub/common/RedisKey.java b/Baoge-common/src/main/java/cn/edu/zjut/baoge/RedisKey.java similarity index 73% rename from src/main/java/com/markerhub/common/RedisKey.java rename to Baoge-common/src/main/java/cn/edu/zjut/baoge/RedisKey.java index 111165be0057c71ec1f4c94e2ac3990aae94a8de..e2b33253fe53e76b0b3745ae9a110b6ef5790b75 100644 --- a/src/main/java/com/markerhub/common/RedisKey.java +++ b/Baoge-common/src/main/java/cn/edu/zjut/baoge/RedisKey.java @@ -1,4 +1,4 @@ -package com.markerhub.common; +package cn.edu.zjut.baoge; /** * @Author by MaXiaofeng @@ -10,4 +10,5 @@ package com.markerhub.common; public class RedisKey { public static final String WX_SESSION_ID = "wx_session_id"; public static final Object TOKEN = "token_"; + public static final Object WX_SMS_SIGN = "wxSms_sign_"; } diff --git a/src/main/java/com/markerhub/common/dto/LoginDto.java b/Baoge-common/src/main/java/cn/edu/zjut/baoge/dto/LoginDto.java similarity index 97% rename from src/main/java/com/markerhub/common/dto/LoginDto.java rename to Baoge-common/src/main/java/cn/edu/zjut/baoge/dto/LoginDto.java index a7213249fa05f73405bab9bb324749e54069de5e..a564ffb0bb70bc8313ffeffa5b3409390a37dc95 100644 --- a/src/main/java/com/markerhub/common/dto/LoginDto.java +++ b/Baoge-common/src/main/java/cn/edu/zjut/baoge/dto/LoginDto.java @@ -1,4 +1,4 @@ -package com.markerhub.common.dto; +package cn.edu.zjut.baoge.dto; import lombok.Data; diff --git a/src/main/java/com/markerhub/common/lang/Result.java b/Baoge-common/src/main/java/cn/edu/zjut/baoge/lang/Result.java similarity index 97% rename from src/main/java/com/markerhub/common/lang/Result.java rename to Baoge-common/src/main/java/cn/edu/zjut/baoge/lang/Result.java index 9e52faa22947edb48d36e7d3878a3c50ea4828a2..ff7d1f6efdcf1b36f62dfca2a79f6655bfa996a1 100644 --- a/src/main/java/com/markerhub/common/lang/Result.java +++ b/Baoge-common/src/main/java/cn/edu/zjut/baoge/lang/Result.java @@ -1,4 +1,4 @@ -package com.markerhub.common.lang; +package cn.edu.zjut.baoge.lang; import lombok.Data; diff --git a/Baoge-common/src/main/java/cn/edu/zjut/baoge/lang/ResultBean.java b/Baoge-common/src/main/java/cn/edu/zjut/baoge/lang/ResultBean.java new file mode 100644 index 0000000000000000000000000000000000000000..889b2367cd8238036f787edf0c60bb9549323d96 --- /dev/null +++ b/Baoge-common/src/main/java/cn/edu/zjut/baoge/lang/ResultBean.java @@ -0,0 +1,65 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package cn.edu.zjut.baoge.lang; + +import org.apache.http.HttpStatus; + +import java.util.HashMap; +import java.util.Map; + +/** + * @Author: 张坤 + * @DateTime: 2022/2/15 17:44 + * @Description: 该类用于 返回值格式规范 + */ +public class ResultBean extends HashMap { + private static final long serialVersionUID = 1L; + + public ResultBean() { + put("code", 0); + put("msg", "success"); + } + + public static ResultBean error() { + return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, "未知异常，请联系管理员"); + } + + public static ResultBean error(String msg) { + return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, msg); + } + + public static ResultBean error(int code, String msg) { + ResultBean resultBean = new ResultBean(); + resultBean.put("code", code); + resultBean.put("msg", msg); + return resultBean; + } + + public static ResultBean ok(String msg) { + ResultBean resultBean = new ResultBean(); + resultBean.put("msg", msg); + return resultBean; + } + + public static ResultBean ok(Map map) { + ResultBean resultBean = new ResultBean(); + resultBean.putAll(map); + return resultBean; + } + + public static ResultBean ok() { + return new ResultBean(); + } + + @Override + public ResultBean put(String key, Object value) { + super.put(key, value); + return this; + } +} diff --git a/HELP.md b/HELP.md deleted file mode 100644 index aab00760c63e44a1df5e7c64caff839eaa60b03d..0000000000000000000000000000000000000000 --- a/HELP.md +++ /dev/null @@ -1,21 +0,0 @@ -# Getting Started - -### Reference Documentation - -For further reference, please consider the following sections: - -* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html) -* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.6.1/maven-plugin/reference/html/) -* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.6.1/maven-plugin/reference/html/#build-image) -* [Spring Boot DevTools](https://docs.spring.io/spring-boot/docs/2.6.1/reference/htmlsingle/#using-boot-devtools) -* [Spring Web](https://docs.spring.io/spring-boot/docs/2.6.1/reference/htmlsingle/#boot-features-developing-web-applications) - -### Guides - -The following guides illustrate how to use some features concretely: - -* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/) -* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/) -* [Building REST services with Spring](https://spring.io/guides/tutorials/bookmarks/) -* [Accessing data with MySQL](https://spring.io/guides/gs/accessing-data-mysql/) - diff --git a/README.md b/README.md new file mode 100644 index 0000000000000000000000000000000000000000..3d221e4875f9415e216ff4639d2043cd1709fa1d --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# 饱格后端-微服务版本 + diff --git a/SpringBoot_vue_test01.iml b/gateway/gateway.iml similarity index 37% rename from SpringBoot_vue_test01.iml rename to gateway/gateway.iml index 8df7cd5a85e6f1f56980e16d678d44af1994f9ab..be78013ef86848daa889e28e0cd0780ceaad465a 100644 --- a/SpringBoot_vue_test01.iml +++ b/gateway/gateway.iml @@ -1,29 +1,9 @@ - - - - - - - - - - - - - - - - - - - - @@ -36,137 +16,158 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - + + - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gateway/pom.xml b/gateway/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..5d22a8ca9bc35d1e49d61e7d3ce208b5d6beea50 --- /dev/null +++ b/gateway/pom.xml @@ -0,0 +1,46 @@ + + + 4.0.0 + + BaoGe_backend + cn.edu.zjut.baoge + 1.0-SNAPSHOT + + + gateway + 0.0.1-SNAPSHOT + gateway + 网关 + + 1.8 + + + + cn.edu.zjut.baoge + Baoge-common + 1.0-SNAPSHOT + + + org.springframework.cloud + spring-cloud-starter-gateway + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/gateway/src/main/java/cn/edu/zjut/baoge/gateway/GatewayApplication.java b/gateway/src/main/java/cn/edu/zjut/baoge/gateway/GatewayApplication.java new file mode 100644 index 0000000000000000000000000000000000000000..6b2fb3863f63288f3b70519878ae5632a8059ec8 --- /dev/null +++ b/gateway/src/main/java/cn/edu/zjut/baoge/gateway/GatewayApplication.java @@ -0,0 +1,16 @@ +package cn.edu.zjut.baoge.gateway; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +@EnableDiscoveryClient +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +public class GatewayApplication { + + public static void main(String[] args) { + SpringApplication.run(GatewayApplication.class, args); + } + +} diff --git a/gateway/src/main/java/cn/edu/zjut/baoge/gateway/config/CorsConfiguration.java b/gateway/src/main/java/cn/edu/zjut/baoge/gateway/config/CorsConfiguration.java new file mode 100644 index 0000000000000000000000000000000000000000..f9662d32620a60e35baec9721934de8eecc556b0 --- /dev/null +++ b/gateway/src/main/java/cn/edu/zjut/baoge/gateway/config/CorsConfiguration.java @@ -0,0 +1,34 @@ +package cn.edu.zjut.baoge.gateway.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.cors.reactive.CorsWebFilter; +import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource; + +/** + * @Author: 张坤 + * @DateTime: 2022/2/5 18:33 + * @Description: 该类用于 配置网关跨域 + */ +@Configuration // gateway +public class CorsConfiguration extends org.springframework.web.cors.CorsConfiguration { + @Bean // 添加过滤器 + public CorsWebFilter corsWebFilter(){ + // 基于url跨域，选择reactive包下的 + UrlBasedCorsConfigurationSource source=new UrlBasedCorsConfigurationSource(); + // 跨域配置信息 + CorsConfiguration corsConfiguration = new CorsConfiguration(); + // 允许跨域的头 + corsConfiguration.addAllowedHeader("*"); + // 允许跨域的请求方式 + corsConfiguration.addAllowedMethod("*"); + // 允许跨域的请求来源 + corsConfiguration.addAllowedOrigin("*"); + // 是否允许携带cookie跨域 + corsConfiguration.setAllowCredentials(true); + + // 任意url都要进行跨域配置 + source.registerCorsConfiguration("/**",corsConfiguration); + return new CorsWebFilter(source); + } +} diff --git a/gateway/src/main/resources/bootstrap.properties b/gateway/src/main/resources/bootstrap.properties new file mode 100644 index 0000000000000000000000000000000000000000..efea2cfafb2d4d9bc0ebca20f1c144039419a2e1 --- /dev/null +++ b/gateway/src/main/resources/bootstrap.properties @@ -0,0 +1,13 @@ +spring.application.name=baoge-gateway + +spring.cloud.nacos.config.file-extension=yml +spring.cloud.nacos.config.server-addr=118.31.71.148:8848 +spring.cloud.nacos.config.namespace=gateway +spring.cloud.nacos.config.group=BaoGe + + +spring.cloud.nacos.config.ext-config[0].data-id=gateway.yml +spring.cloud.nacos.config.ext-config[0].group=BaoGe +spring.cloud.nacos.config.ext-config[0].refresh=true + + diff --git a/src/test/java/com/markerhub/springboot_vue_test01/SpringBootVueTest01ApplicationTests.java b/gateway/src/test/java/cn/edu/zjut/baoge/gateway/GatewayApplicationTests.java similarity index 50% rename from src/test/java/com/markerhub/springboot_vue_test01/SpringBootVueTest01ApplicationTests.java rename to gateway/src/test/java/cn/edu/zjut/baoge/gateway/GatewayApplicationTests.java index c1979968125967d06c54bf95cfa33a9adf1d64ad..e03c5fa3b6e5e68c87842a593682470be67f11bc 100644 --- a/src/test/java/com/markerhub/springboot_vue_test01/SpringBootVueTest01ApplicationTests.java +++ b/gateway/src/test/java/cn/edu/zjut/baoge/gateway/GatewayApplicationTests.java @@ -1,10 +1,10 @@ -package com.markerhub.springboot_vue_test01; +package cn.edu.zjut.baoge.gateway; -import org.junit.jupiter.api.Test; +import org.junit.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class SpringBootVueTest01ApplicationTests { +class GatewayApplicationTests { @Test void contextLoads() { diff --git a/pom.xml b/pom.xml index e53607fe3968db4c86e2099b762dcae54937bb14..ebc9d0577fd69ef7fb8a07f58e8c5f126bd31772 100644 --- a/pom.xml +++ b/pom.xml @@ -1,139 +1,235 @@ - + 4.0.0 + + cn.edu.zjut.baoge + BaoGe_backend + pom + 1.0-SNAPSHOT + + Baoge-common + gateway + third-party + org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.3.0.RELEASE - com.markerhub - SpringBoot_vue_test01 - 0.0.1-SNAPSHOT - SpringBoot_vue_test01 - SpringBoot_vue_test01 + 8 + 8 + UTF-8 + UTF-8 + true + http://192.168.3.101:2375 + 1.2.2 1.8 + Hoxton.SR5 + 2.2.0.RELEASE + 1.3.0 + 5.2.0 + 1.1.23 + 5.4.0 + 1.4.0 + 3.5.5 + 8.0.20 + 2.3.0.RELEASE + 0.9.0 + 2.5.0 + 5.3 + 2.2.3 + 7.1.0 + 2.0.4 + 8.16 + 1.0-SNAPSHOT + 1.0-SNAPSHOT + org.springframework.boot - spring-boot-starter-web + spring-boot-starter-actuator - org.springframework.boot - spring-boot-devtools - runtime - true - - - mysql - mysql-connector-java - runtime - - - org.projectlombok - lombok - true + spring-boot-starter-aop org.springframework.boot spring-boot-starter-test test - - - com.baomidou - mybatis-plus-boot-starter - 3.2.0 - - - com.baomidou - mybatis-plus - 3.2.0 - - - com.baomidou - mybatis-plus-generator - 3.2.0 - - - - org.springframework.boot - spring-boot-starter-freemarker - - cn.hutool hutool-all - 5.3.3 - - - - org.springframework.boot - spring-boot-starter-validation - - - org.apache.httpcomponents - httpclient - test - org.springframework.boot - spring-boot-starter-data-jpa + org.projectlombok + lombok - org.springframework.boot - spring-boot-starter-data-redis - - - org.apache.commons - commons-pool2 - - - - - com.alibaba - fastjson - 1.2.47 - - - com.auth0 - java-jwt - 3.11.0 - - - - com.tencentcloudapi - tencentcloud-sdk-java - 3.1.111 - - - com.github.qcloudsms - qcloudsms - 1.0.6 + spring-boot-configuration-processor + true - + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + + + + com.github.pagehelper + pagehelper-spring-boot-starter + ${pagehelper-starter.version} + + + + com.github.pagehelper + pagehelper + ${pagehelper.version} + + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + + cn.hutool + hutool-all + ${hutool.version} + + + + com.github.xiaoymin + knife4j-micro-spring-boot-starter + ${knife4j.version} + + + com.github.xiaoymin + knife4j-spring-boot-starter + ${knife4j.version} + + + + org.mybatis.generator + mybatis-generator-core + ${mybatis-generator.version} + + + + org.mybatis + mybatis + ${mybatis.version} + + + + mysql + mysql-connector-java + ${mysql-connector.version} + + + + org.springframework.data + spring-data-commons + ${spring-data-commons.version} + + + + io.jsonwebtoken + jjwt + ${jjwt.version} + + + + com.nimbusds + nimbus-jose-jwt + ${nimbus-jose-jwt.version} + + + + com.aliyun.oss + aliyun-sdk-oss + ${aliyun-oss.version} + + + + net.logstash.logback + logstash-logback-encoder + ${logstash-logback.version} + + + + de.codecentric + spring-boot-admin-starter-server + ${admin-starter-server.version} + + + + io.minio + minio + ${minio.version} + + + + - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - - + + + + org.springframework.boot + spring-boot-maven-plugin + + + com.spotify + docker-maven-plugin + ${docker.maven.plugin.version} + + + + + + + + + + + mall/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + + + diff --git a/src/main/java/com/markerhub/CodeGenerator.java b/src/main/java/com/markerhub/CodeGenerator.java deleted file mode 100644 index 0528a81eee90183c44e3a2aeece78782d0ac8207..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/CodeGenerator.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.markerhub; - -import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; -import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.baomidou.mybatisplus.generator.AutoGenerator; -import com.baomidou.mybatisplus.generator.InjectionConfig; -import com.baomidou.mybatisplus.generator.config.*; -import com.baomidou.mybatisplus.generator.config.po.TableInfo; -import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; -import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine; - -import java.util.ArrayList; -import java.util.List; -import java.util.Scanner; - -// 演示例子，执行 main 方法控制台输入模块表名回车自动生成对应项目目录中 -public class CodeGenerator { - - /** - * - * 读取控制台内容 - * - */ - public static String scanner(String tip) { - Scanner scanner = new Scanner(System.in); - StringBuilder help = new StringBuilder(); - help.append("请输入" + tip + "："); - System.out.println(help.toString()); - if (scanner.hasNext()) { - String ipt = scanner.next(); - if (StringUtils.isNotEmpty(ipt)) { - return ipt; - } - } - throw new MybatisPlusException("请输入正确的" + tip + "！"); - } - - public static void main(String[] args) { - // 代码生成器 - AutoGenerator mpg = new AutoGenerator(); - - // 全局配置 - GlobalConfig gc = new GlobalConfig(); - String projectPath = System.getProperty("user.dir"); - gc.setOutputDir(projectPath + "/src/main/java"); -// gc.setOutputDir("D:\\test"); - gc.setAuthor("MaXiaofeng"); - gc.setOpen(false); - // gc.setSwagger2(true); 实体属性 Swagger2 注解 - gc.setServiceName("%sService"); - mpg.setGlobalConfig(gc); - - // 数据源配置 - DataSourceConfig dsc = new DataSourceConfig(); - dsc.setUrl("jdbc:mysql://localhost:3306/vueblog?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=UTC"); - // dsc.setSchemaName("public"); - dsc.setDriverName("com.mysql.cj.jdbc.Driver"); - dsc.setUsername("root"); - dsc.setPassword("123456"); - mpg.setDataSource(dsc); - - // 包配置 - PackageConfig pc = new PackageConfig(); - pc.setModuleName(null); - pc.setParent("com.markerhub"); - mpg.setPackageInfo(pc); - - // 自定义配置 - InjectionConfig cfg = new InjectionConfig() { - @Override - public void initMap() { - // to do nothing - } - }; - - // 如果模板引擎是 freemarker - String templatePath = "/templates/mapper.xml.ftl"; - // 如果模板引擎是 velocity - // String templatePath = "/templates/mapper.xml.vm"; - - // 自定义输出配置 - List focList = new ArrayList<>(); - // 自定义配置会被优先输出 - focList.add(new FileOutConfig(templatePath) { - @Override - public String outputFile(TableInfo tableInfo) { - // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！ - return projectPath + "/src/main/resources/mapper/" - + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML; - } - }); - - cfg.setFileOutConfigList(focList); - mpg.setCfg(cfg); - - // 配置模板 - TemplateConfig templateConfig = new TemplateConfig(); - - templateConfig.setXml(null); - mpg.setTemplate(templateConfig); - - // 策略配置 - StrategyConfig strategy = new StrategyConfig(); - strategy.setNaming(NamingStrategy.underline_to_camel); - strategy.setColumnNaming(NamingStrategy.underline_to_camel); - strategy.setEntityLombokModel(true); - strategy.setRestControllerStyle(true); - strategy.setInclude(scanner("表名，多个英文逗号分割").split(",")); - strategy.setControllerMappingHyphenStyle(true); - strategy.setTablePrefix("m_"); - mpg.setStrategy(strategy); - mpg.setTemplateEngine(new FreemarkerTemplateEngine()); - mpg.execute(); - } -} diff --git a/src/main/java/com/markerhub/common/exception/GlobalExceptionHandler.java b/src/main/java/com/markerhub/common/exception/GlobalExceptionHandler.java deleted file mode 100644 index 1dee20f815405ad307d09a0ed9d1db36443aaf27..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/common/exception/GlobalExceptionHandler.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.markerhub.common.exception; - -import com.markerhub.common.lang.Result; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.validation.BindingResult; -import org.springframework.validation.ObjectError; -import org.springframework.web.bind.MethodArgumentNotValidException; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.web.bind.annotation.RestControllerAdvice; - -/** - * @author XiaoFeng - * @version 1.0 - * @Description 全局异常处理 - * Create by 2021/12/14 22:39 - */ - -/** - * 日志输出 @Slf4j - */ -@Slf4j -@RestControllerAdvice -public class GlobalExceptionHandler { - /** - * 对实体类校验抛出的异常的捕获 - * @param e - * @return - */ - @ResponseStatus(HttpStatus.BAD_REQUEST) - @ExceptionHandler(value = MethodArgumentNotValidException.class) - public Result handler(MethodArgumentNotValidException e) { - log.error("实体类校验异常:------------------{}", e); - BindingResult bindingResult = e.getBindingResult(); - ObjectError objectError = bindingResult.getAllErrors().stream().findFirst().get(); - - return Result.fail(401, objectError.getDefaultMessage(), null); - } - - /** - * 返回状态码 - */ - @ResponseStatus(HttpStatus.BAD_REQUEST) - @ExceptionHandler(value = RuntimeException.class) - public Result handler(RuntimeException e) { - log.error("运行时异常:------------------{}", e); - return Result.fail(e.getMessage()); - } - - /** - * 当用户登录时，用户名密码都不为空则进入登录校验 - * 但如果在数据库中查找该用户不存在，则会抛出 IllegalArgumentException 异常，在此处捕获，返回异常信息 - * @param e - * @return Result.fail(e.getMessage()) - */ - @ResponseStatus(HttpStatus.BAD_REQUEST) - @ExceptionHandler(value = IllegalArgumentException.class) - public Result handler(IllegalArgumentException e) { - log.error("Assert时异常:------------------{}", e); - return Result.fail(e.getMessage()); - } -} diff --git a/src/main/java/com/markerhub/config/CorsConfig.java b/src/main/java/com/markerhub/config/CorsConfig.java deleted file mode 100644 index 42d14e9563fb3b320a4052bb25ccc4c63357bb2b..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/config/CorsConfig.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.markerhub.config; - -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -/** - * @author XiaoFeng - * @version 1.0 - * @Description 解决跨域问题 - * Create by 2021/12/15 13:45 - */ - -public class CorsConfig implements WebMvcConfigurer { - @Override - public void addCorsMappings(CorsRegistry registry){ - registry.addMapping("/**") - .allowedOrigins("*") - .allowedMethods("GET","HEAD","POST","DELETE","PUT","OPTIONS") - .allowCredentials(true) - .maxAge(3600) - .allowedHeaders("*"); - } - -} diff --git a/src/main/java/com/markerhub/config/MybatisPlusConfig.java b/src/main/java/com/markerhub/config/MybatisPlusConfig.java deleted file mode 100644 index a4967bd16f51919d4f3ff4db76ef88b1de7c13ea..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/config/MybatisPlusConfig.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.markerhub.config; - -import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -/** - * @author XiaoFeng - * @version 1.0 - * @Description Create by 2021/12/5 17:37 - */ -@Configuration -@EnableTransactionManagement -@MapperScan("com.markerhub.mapper") -public class MybatisPlusConfig { - @Bean - public PaginationInterceptor paginationInterceptor(){ - PaginationInterceptor paginationInterceptor = new PaginationInterceptor(); - return paginationInterceptor; - } -} diff --git a/src/main/java/com/markerhub/config/RedisConfig.java b/src/main/java/com/markerhub/config/RedisConfig.java deleted file mode 100644 index f72adf5785ec337fbb4c98779ed938ed14d1dfb3..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/config/RedisConfig.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.markerhub.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; -import org.springframework.data.redis.serializer.StringRedisSerializer; - -import java.io.Serializable; - -/** - * @Author by MaXiaofeng - * @Description redis的相关配置 - * @Date 2022/2/8 20:33 - * @Version 1.0.0 - */ -@Configuration -public class RedisConfig { - @Bean - public RedisTemplate redisTemplate(RedisConnectionFactory redisConnectionFactory) { - RedisTemplate redisTemplate = new RedisTemplate<>(); - //指定key的序列化方式 - redisTemplate.setKeySerializer(new StringRedisSerializer()); - redisTemplate.setValueSerializer(new GenericJackson2JsonRedisSerializer()); - redisTemplate.setConnectionFactory(redisConnectionFactory); - return redisTemplate; - - } -} diff --git a/src/main/java/com/markerhub/config/SmsConfig.java b/src/main/java/com/markerhub/config/SmsConfig.java deleted file mode 100644 index 2febfb88e69597e1f588d6184f7609db85e1f95a..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/config/SmsConfig.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.markerhub.config; - -/** - * @Author by MaXiaofeng - * @Description 腾讯云发送短信配置类 - * @Date 2022/2/13 15:46 - * @Version 1.0.0 - */ - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Data -@Configuration -@ConfigurationProperties(prefix = "sms-config") -public class SmsConfig { - /** - * 腾讯云账户密钥对secretId（在访问管理中配置） - */ - private String secretId; - - /** - * 腾讯云账户密钥对secretKey（在访问管理中配置） - */ - private String secretKey; - - /** - * 短信应用appId - */ - private String appId; - - /** - * 短信应用appKey - */ - private String appKey; - - /** - * 签名 - */ - private String smsSign; - - /** - * 过期时间 - */ - private String expireTime; - - /** - * redis存储前缀 - */ - private String phonePrefix; -} diff --git a/src/main/java/com/markerhub/config/SmsLengthEnum.java b/src/main/java/com/markerhub/config/SmsLengthEnum.java deleted file mode 100644 index fc698eca3b7f20d76627ba9503e5e372c7fa6caf..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/config/SmsLengthEnum.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.markerhub.config; - - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@AllArgsConstructor -@NoArgsConstructor -public enum SmsLengthEnum { - /** - * 4位短信验证码 - */ - SMS_LENGTH_4(4), - /** - * 6位短信验证码 - */ - SMS_LENGTH_6(6), - - ; - - private int length; -} diff --git a/src/main/java/com/markerhub/config/SmsResponseCodeEnum.java b/src/main/java/com/markerhub/config/SmsResponseCodeEnum.java deleted file mode 100644 index 523d0e7f7be92568039f34e5dc7e06dc7776fe13..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/config/SmsResponseCodeEnum.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.markerhub.config; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@AllArgsConstructor -@NoArgsConstructor -public enum SmsResponseCodeEnum { - /** - * 发送成功 - * 数据结构 "SendStatusSet":[{"Code":"Ok"}] - */ - OK("Ok", "send success"), - - /* - 失败数据结构 - { - "Response": { - "Error": { - "Code": "AuthFailure.SignatureFailure", - "Message": "The provided credentials could not be validated. Please check your signature is - correct." - }, - "RequestId": "ed93f3cb-f35e-473f-b9f3-0d451b8b79c6" - } - } - 详情参考：https://cloud.tencent.com/document/product/382/38780 - */; - /** - * 状态码 - */ - private String code; - - /** - * 描述信息 - */ - private String message; -} diff --git a/src/main/java/com/markerhub/config/WebMvcConfig.java b/src/main/java/com/markerhub/config/WebMvcConfig.java deleted file mode 100644 index 94b6d4926db3e676bb2cb11dd243cc5daf29425e..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/config/WebMvcConfig.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.markerhub.config; - -import com.markerhub.handler.LoginHandler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -/** - * @Author by MaXiaofeng - * @Description TODO - * @Date 2022/2/10 13:09 - * @Version 1.0.0 - */ -@Configuration -public class WebMvcConfig implements WebMvcConfigurer { - - @Autowired - private LoginHandler loginHandler; - - @Override - public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(loginHandler); - } -} diff --git a/src/main/java/com/markerhub/constant/ApiExceptionCodes.java b/src/main/java/com/markerhub/constant/ApiExceptionCodes.java deleted file mode 100644 index ac3ba8f2b3f2dead3c2c3b63f7063fa0faa0d748..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/constant/ApiExceptionCodes.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.markerhub.constant; - -import lombok.Getter; - -/** - * @author : Ma XiaoFeng - * @date : Created in 2021/11/15 - * @description: 错误码枚举类 - */ -@Getter //自动生成Get方法 -public enum ApiExceptionCodes { - /** - * 未找到token - */ - TOKEN_NOT_FOUND(101, "未找到token！"), - /** - * token校验失败 - */ - TOKEN_CHECK_FAIL(102, "token校验失败！"), - /** - * token已过期 - */ - TOKEN_EXPIRED(103, "token已过期！"), - /** - * 无权限访问 - */ - ACCESS_FORBIDDEN(104, "无权限访问！"), - /** - * 无权限操作 - */ - PERMISSION_DENIED(105, "无权限操作！"), - /** - * 未签署服务协议 - */ - NOTICE_NOT_SIGNED(106, "未签署服务协议！"), - /** - * 未进行实名认证 - */ - NOT_AUTHENTICATED(107, "未进行实名认证！"), - /** - * 用户不存在 - */ - USER_NOT_FOUND(301, "用户不存在！"), - /** - * 用户名或密码错误 - */ - INVALID_USER_PASSWORD(302, "用户名或密码错误！"), - /** - * 该用户已经存在 - */ - ACCOUNT_EXISTED(303, "该用户已经存在！"), - /** - * 绑定手机号不一致 - */ - DIFFERENT_PHONE(304, "绑定手机号不一致！"), - /** - * 重复注册 - */ - MULTI_REGISTER(305, "重复注册！"), - /** - * 创建失败 - */ - INSERT_ERROR(401, "创建失败！"), - /** - * 修改失败 - */ - UPDATE_ERROR(402, "修改失败！"), - /** - * 删除失败 - */ - DELETE_ERROR(403, "删除失败"), - /** - * 未找到结果 - */ - SELECT_ERROR(404, "未找到结果！"), - /** - * 验证短信发送失败 - */ - MESSAGE_SEND_FAIL(501, "验证短信发送失败！"), - /** - * 短信验证码错误 - */ - MESSAGE_CHECK_FAIL(502, "短信验证码错误！"), - /** - * 参数校验失败 - */ - ARGUMENTS_VALID_FAIL(601, "参数校验失败！"), - /** - * 访问次数超限 - */ - REQUEST_TIMES_EXCEEDED(701, "访问次数超限！"), - /** - * 授权失败 - */ - AUTHORIZATION_FAIL(801, "授权失败！"), - /** - * 解密为空错误 - */ - DECRYPT_NULL(901, "解密数据为空！"); - - private final Integer value; - private final String desc; - - ApiExceptionCodes(Integer value, String desc) { - this.value = value; - this.desc = desc; - } -} diff --git a/src/main/java/com/markerhub/constant/Constant.java b/src/main/java/com/markerhub/constant/Constant.java deleted file mode 100644 index 61efb052359aa941e081ae9ef58575e3f207eca7..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/constant/Constant.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.markerhub.constant; - -/** - * @Classname Constant - * @Description - * @Version 1.0.0 - * @Date 2022/1/28 20:19 - * @Created by XiooFeng - */ - -public class Constant { - -} diff --git a/src/main/java/com/markerhub/controller/AccountController.java b/src/main/java/com/markerhub/controller/AccountController.java deleted file mode 100644 index ea0edb65909a6380a054e483e0abde58c4c198df..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/controller/AccountController.java +++ /dev/null @@ -1,90 +0,0 @@ -//package com.markerhub.controller; -// -//import cn.hutool.core.lang.Assert; -//import cn.hutool.core.map.MapUtil; -//import cn.hutool.crypto.SecureUtil; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.markerhub.common.dto.LoginDto; -//import com.markerhub.common.lang.Result; -//import com.markerhub.entity.User; -//import com.markerhub.service.UserService; -//import com.markerhub.utils.JwtUtils; -//import org.apache.catalina.security.SecurityUtil; -//import org.apache.shiro.SecurityUtils; -//import org.apache.shiro.authz.annotation.RequiresAuthentication; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.web.bind.annotation.GetMapping; -//import org.springframework.web.bind.annotation.PostMapping; -//import org.springframework.web.bind.annotation.RequestBody; -//import org.springframework.web.bind.annotation.RestController; -// -//import javax.servlet.http.HttpServletResponse; -// -///** -// * @author XiaoFeng -// * @version 1.0 -// * @Description Create by 2021/12/15 13:54 -// */ -// -//@RestController -//public class AccountController { -// @Autowired -// UserService userService;//userService注入 -// -// @Autowired -// JwtUtils jwtUtils; -// -// /** -// * 登录处理 获取的参数是loginDto 需要进行封装 从RequestBody中获取 -// * -// * @param loginDto -// * @return -// */ -// @PostMapping("/login") -// public Result login(@RequestBody LoginDto loginDto, HttpServletResponse response) { -// User user = userService.getOne(new QueryWrapper().eq("username", loginDto.getUsername())); -// /** -// * 判断用户是否存在，如果不存在会抛出 IllegalArgumentException 的异常 -// * 所以需要在全局异常中进行捕获 -// */ -// Assert.notNull(user, "用户不存在"); -// /** -// * public static T notNull(T object, String errorMsgTemplate, Object... params) throws IllegalArgumentException { -// * if (object == null) { -// * throw new IllegalArgumentException(StrUtil.format(errorMsgTemplate, params)); -// * } else { -// * return object; -// * } -// * } -// */ -// -// /** -// * 对登录的密码进行md5加密 -// */ -// if (!user.getPassword().equals(SecureUtil.md5(loginDto.getPassword()))) { -// return Result.fail("密码不正确"); -// } -// String jwt = jwtUtils.generateToken(user.getId()); -// -// response.setHeader("Authorization", jwt); -// response.setHeader("Access-Control-Expose-Headers", "Authorization"); -// return Result.success(MapUtil.builder() -// .put("id", user.getId()) -// .put("username", user.getUsername()) -// .put("email", user.getEmail()) -// .put("avatar", user.getAvatar()) -// .map() -// ); -// } -// -// /** -// * 退出处理 -// * @return -// */ -// @RequiresAuthentication -// @GetMapping("/logout") -// public Result logout() { -// SecurityUtils.getSubject().logout(); -// return Result.success(null); -// } -//} diff --git a/src/main/java/com/markerhub/controller/UserController.java b/src/main/java/com/markerhub/controller/UserController.java deleted file mode 100644 index 62a75496540fa76848338e06e85bbb81070d778f..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/controller/UserController.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.markerhub.controller; - - -import com.markerhub.common.lang.Result; -import com.markerhub.entity.Wx_User; -import com.markerhub.entity.LoginUser; -import com.markerhub.handler.NoAuth; -import com.markerhub.repository.LoginUserRepository; -import com.markerhub.repository.UserRepository; -import com.markerhub.service.UserService; -import com.markerhub.vo.WXAuth; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.Optional; - -/** - * 前端控制器 - */ -@Slf4j -@RestController -@RequestMapping("/user") -public class UserController { - - @Autowired - private UserService userService; - - @Resource - private LoginUserRepository loginUserRepository; - - @Resource - private UserRepository userRepository; - - /** - * 获取sessionId - * - * @param code - * @return - */ - @NoAuth - @PostMapping("code") - public Result getSessionId(@RequestBody String code) { - return userService.getSessionId(code); - } - - /** - * 调用 auth.code2Session 接口，换取 用户唯一标识 OpenID - * 用户在微信开放平台帐号下的唯一标识UnionID（若当前小程序已绑定到微信开放平台帐号） 和 会话密钥 session_key - * - * @param wxAuth - * @return - */ - @PostMapping("/authLogin") - @NoAuth - public Result authLogin(@RequestBody WXAuth wxAuth) { - Result result = userService.authLogin(wxAuth); - //绑定日志 - log.info("{}", result); - return result; - } - //6203c566-25e683fa-0f5bef82 - - /** - * url ://user/1 - * 根据id查询user信息 - * - * @param id - * @return null或者user - */ - @GetMapping("/{id}") - public Wx_User getUserById(@PathVariable Integer id) { - Optional user = userRepository.findById(id); - /** - * 如果user是null则返回null，否则返回user - */ - return user.orElseGet(null); - } - - /** - * @param loginUser - * @return - */ - @PostMapping("/login") - public LoginUser login(@RequestBody LoginUser loginUser) { - return loginUserRepository.findByUsernameAndPassword(loginUser.getUsername(), loginUser.getPassword()); - } - - /** - * 根据token来验证此token是否有效 - * - * @param refresh - * @return - */ - @GetMapping("userinfo") - public Result userinfo(@RequestHeader("Authorization") String token, Boolean refresh) { - return userService.userInfo(refresh); - } - - -} diff --git a/src/main/java/com/markerhub/entity/Blog.java b/src/main/java/com/markerhub/entity/Blog.java deleted file mode 100644 index 6cc85ddd6898f4ce02d615e07cc926513cfdfbf5..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/entity/Blog.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.markerhub.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * - * - * - * - * @author MaXiaofeng - * @since 2022-1-28 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("m_blog") -public class Blog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - private Long userId; - - private String title; - - private String description; - - private String content; - - private LocalDateTime created; - - private Integer status; - - -} diff --git a/src/main/java/com/markerhub/entity/LoginUser.java b/src/main/java/com/markerhub/entity/LoginUser.java deleted file mode 100644 index f330a70c23fade7c3caa1788f638a1cafb1011e5..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/entity/LoginUser.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.markerhub.entity; - -import lombok.Data; - -import javax.persistence.*; -import java.io.Serializable; - -/** - * @Author by MaXiaofeng - * @Description 需要账号密码登录的用户表 - * @Date 2022/2/6 15:46 - * @Version 1.0.0 - */ - -@Entity -@Table(name = "login_user") -@Data -public class LoginUser implements Serializable { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private int id; - - private String username; - private String password; -} diff --git a/src/main/java/com/markerhub/entity/User.java b/src/main/java/com/markerhub/entity/User.java deleted file mode 100644 index 5208cd99832193fd86718523018226b0ac0f4f79..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/entity/User.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.markerhub.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; - -import javax.persistence.*; -import java.io.Serializable; - -/** - * @Author by MaXiaofeng - * @Description TODO - * @Date 2022/2/9 16:22 - * @Version 1.0.0 - */ -@Entity -@Data -@Table(name = "user") -public class User implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private long id; - private String nickname; - private String username; - private String password; - private String gender; - //头像 - private String portrait; - //背景图片 - private String background; - private String phone_number; - private String open_id; - private String wx_union_id; -} diff --git a/src/main/java/com/markerhub/entity/Wx_User.java b/src/main/java/com/markerhub/entity/Wx_User.java deleted file mode 100644 index ccc4bb3d8d1f4fe313c0344abd6267dcbfe08c3c..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/entity/Wx_User.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.markerhub.entity; - -import lombok.Data; - -import javax.persistence.*; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - * @author MaXiaofeng - * @since 2022-1-28 - */ -@Entity -@Table(name = "wx_user") -@Data -public class Wx_User implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private int id; - - private int openid; - private String nickname;//用户昵称 - private String avatarurl;//用户头像 - private int gender;//性别 - private String province;//所在国家 - private String city;//省份 - private String language;//语言 - private int ctime;//创建时间 - private String mobile;//手机类型 - private int telnum;//手机号码 - -} diff --git a/src/main/java/com/markerhub/exception/ApiException.java b/src/main/java/com/markerhub/exception/ApiException.java deleted file mode 100644 index c2fce37f8ad970488bb50c05594aba35a5e0bcfb..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/ApiException.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.markerhub.exception; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 服务器抛出（接口）异常类 - * - * @author Ma Xiaofeng - * @date : Created in 2021/11/16 - **/ -@EqualsAndHashCode(callSuper = true) -/* - 此注解会生成equals(Object other) 和 hashCode()方法。 - 它默认使用非静态，非瞬态的属性 - 可通过参数exclude排除一些属性 - 可通过参数of指定仅使用哪些属性 - 它默认仅使用该类中定义的属性且不调用父类的方法 - 可通过callSuper=true解决上一点问题。让其生成的方法中调用父类的方法 - */ -@Data -public class ApiException extends Exception { - private Integer code; - //报错方法的父类 - public ApiException(String message, Integer code) { - super(message); - //给前端返回的状态码 404 200 501 - this.code = code; - } - - public ApiException() { - super(); - } -} diff --git a/src/main/java/com/markerhub/exception/RuntimeApiException.java b/src/main/java/com/markerhub/exception/RuntimeApiException.java deleted file mode 100644 index 137d9230019f59c4f323533356bc96165a832d14..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/RuntimeApiException.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.markerhub.exception; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 运行期间API异常类 - * - * @author Ma Xiaofeng - * @date : Created in 2021/11/10 - **/ -@EqualsAndHashCode(callSuper = true) -/** - * 使用在使用@Data时同时加上@EqualsAndHashCode(callSuper=true)注解。 - * @Data : 注解在类上, 为类提供读写属性, 此外还提供了 equals()、hashCode()、toString() 方法 - * 有多个类有相同的部分属性，把它们定义到父类中，恰好id（数据库主键）也在父类中， - * 那么就会存在部分对象在比较时，它们并不相等，却因为lombok自动生成的equals(Object other) 和 hashCode()方法判定为相等，从而导致出错 - */ -@Data -public class RuntimeApiException extends RuntimeException { - //定义给前端返回的状态码 - private Integer code; - - public RuntimeApiException(String message, Integer code) { - //将message消息放到RuntimeException的构造方法中 - super(message); - this.code = code; - } - - public RuntimeApiException() { - super(); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/AuthenticationException.java b/src/main/java/com/markerhub/exception/apiException/AuthenticationException.java deleted file mode 100644 index 0830c94782eb9b746e8d166f45b2442b76588a98..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/AuthenticationException.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.markerhub.exception.apiException; - - -import com.markerhub.exception.ApiException; - -/** - * 鉴权相关的异常类 - * - * @author Ma Xiaofeng - * @date : Created in 2021/11/15 - **/ -public class AuthenticationException extends ApiException { - - public AuthenticationException() { - } - - public AuthenticationException(String message, Integer code) { - super(message, code); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/AuthorizationException.java b/src/main/java/com/markerhub/exception/apiException/AuthorizationException.java deleted file mode 100644 index 7b521619c7fe62b3f32e599ced4b53e5c1f56387..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/AuthorizationException.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.markerhub.exception.apiException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.ApiException; - - -/** - * 授权异常类 - * - * @author Ma Xiaofeng - * @date : Created in 2021/11/23 - **/ -public class AuthorizationException extends ApiException { - public AuthorizationException() { - super(ApiExceptionCodes.AUTHORIZATION_FAIL.getDesc(), ApiExceptionCodes.AUTHORIZATION_FAIL.getValue()); - } - - public AuthorizationException(String message) { - super(message, ApiExceptionCodes.AUTHORIZATION_FAIL.getValue()); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/DaoException.java b/src/main/java/com/markerhub/exception/apiException/DaoException.java deleted file mode 100644 index 3d77b6e78bc939850b04f6281d695efe653c0a47..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/DaoException.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.markerhub.exception.apiException; - -import com.markerhub.exception.ApiException; - -/** - * 数据库操作异常类 - * 子类 数据库操作异常类 - * @author Ma Xiaofeng - * @date : Created in 2021/11/17 - **/ -public class DaoException extends ApiException { - public DaoException() { - } - - public DaoException(String message, Integer code) { - super(message, code); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/DecryptException.java b/src/main/java/com/markerhub/exception/apiException/DecryptException.java deleted file mode 100644 index 111c53b028fdf86e9d26d1653ce403c107505e05..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/DecryptException.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.markerhub.exception.apiException; - -import com.markerhub.exception.ApiException; - -/** - * @author : Ma Xiaofeng - * @date : Created in 2021/11/25 - * @description: 解密异常类 - */ -public class DecryptException extends ApiException { - - public DecryptException() { - - } - - public DecryptException(String message, Integer code) { - super(message, code); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/ForbiddenException.java b/src/main/java/com/markerhub/exception/apiException/ForbiddenException.java deleted file mode 100644 index 7d66ec7c32b337e82c401db5fe269d7e5f5c7235..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/ForbiddenException.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.markerhub.exception.apiException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.ApiException; - -/** - * 鉴权错误异常类，对应HTTP403 - * - * @author Ma Xiaofeng - * @date : Created in 2021/10/23 - **/ -public class ForbiddenException extends ApiException { - public ForbiddenException() { - super(ApiExceptionCodes.ACCESS_FORBIDDEN.getDesc(), ApiExceptionCodes.ACCESS_FORBIDDEN.getValue()); - } - - public ForbiddenException(String message) { - super(message, ApiExceptionCodes.ACCESS_FORBIDDEN.getValue()); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/SmsException.java b/src/main/java/com/markerhub/exception/apiException/SmsException.java deleted file mode 100644 index ec8408756c5201b9a8774fe4bcc04c9590c26ab0..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/SmsException.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.markerhub.exception.apiException; - -import com.markerhub.exception.ApiException; - -/** - * 短信业务异常类 - * - * @author Ma Xiaofeng - * @date : Created in 2021/11/24 - **/ -public class SmsException extends ApiException { - - public SmsException() { - } - - public SmsException(String message, Integer code) { - super(message, code); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/authenticationException/AccountNotFoundException.java b/src/main/java/com/markerhub/exception/apiException/authenticationException/AccountNotFoundException.java deleted file mode 100644 index f72f0a75fbe5e0c9fe0aeba202fd8df5bcede57f..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/authenticationException/AccountNotFoundException.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.markerhub.exception.apiException.authenticationException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.apiException.AuthenticationException; - -/** - * 用户未找到异常类 - * - * @author Ma Xiaofeng - * @date : Created in 2021/11/15 - **/ -public class AccountNotFoundException extends AuthenticationException { - - public AccountNotFoundException(String message) { - super(message, ApiExceptionCodes.USER_NOT_FOUND.getValue()); - } - - public AccountNotFoundException() { - super(ApiExceptionCodes.USER_NOT_FOUND.getDesc(), ApiExceptionCodes.USER_NOT_FOUND.getValue()); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/authenticationException/DifferentPhoneException.java b/src/main/java/com/markerhub/exception/apiException/authenticationException/DifferentPhoneException.java deleted file mode 100644 index 73d3f2d18f0879ebbdae61b929749abe95843cf7..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/authenticationException/DifferentPhoneException.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.markerhub.exception.apiException.authenticationException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.apiException.AuthenticationException; - -/** - * @author : Ma Xiaofeng - * @date : Created in 2021/11/15 - * @description: 绑定手机号异常类 - */ -public class DifferentPhoneException extends AuthenticationException { - public DifferentPhoneException(String message) { - super(message, ApiExceptionCodes.DIFFERENT_PHONE.getValue()); - } - - public DifferentPhoneException() { - super(ApiExceptionCodes.DIFFERENT_PHONE.getDesc(), ApiExceptionCodes.DIFFERENT_PHONE.getValue()); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/authenticationException/InvalidPasswordException.java b/src/main/java/com/markerhub/exception/apiException/authenticationException/InvalidPasswordException.java deleted file mode 100644 index d794656561d7d9d2d2295a88380b93820ce905b1..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/authenticationException/InvalidPasswordException.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.markerhub.exception.apiException.authenticationException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.apiException.AuthenticationException; - -/** - * 密码错误异常类 - * - * @author Ma Xiaofeng - * @date : Created in 2021/11/16 - **/ -public class InvalidPasswordException extends AuthenticationException { - - public InvalidPasswordException(String message) { - super(message, ApiExceptionCodes.INVALID_USER_PASSWORD.getValue()); - } - - public InvalidPasswordException() { - super(ApiExceptionCodes.INVALID_USER_PASSWORD.getDesc(), ApiExceptionCodes.INVALID_USER_PASSWORD.getValue()); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/authenticationException/JwtExpiredException.java b/src/main/java/com/markerhub/exception/apiException/authenticationException/JwtExpiredException.java deleted file mode 100644 index 78e488614f475827efa2cdfd3162e24f39f6bd98..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/authenticationException/JwtExpiredException.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.markerhub.exception.apiException.authenticationException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.apiException.AuthenticationException; -import com.markerhub.exception.apiException.AuthenticationException; - -/** - * token过期异常类 - * - * @author Ma Xiaofeng - * @date : Created in 2021/11/22 - **/ -public class JwtExpiredException extends AuthenticationException { - public JwtExpiredException() { - super(ApiExceptionCodes.TOKEN_EXPIRED.getDesc(), ApiExceptionCodes.TOKEN_EXPIRED.getValue()); - } - - public JwtExpiredException(String message) { - super(message, ApiExceptionCodes.TOKEN_EXPIRED.getValue()); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/authenticationException/MultiRegisterException.java b/src/main/java/com/markerhub/exception/apiException/authenticationException/MultiRegisterException.java deleted file mode 100644 index 5e2dcda5bb87bba14d522b0210cda34ceb04ebe3..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/authenticationException/MultiRegisterException.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.markerhub.exception.apiException.authenticationException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.apiException.AuthenticationException; - -/** - * @author : Ma Xiaofeng - * @date : Created in 2021/11/15 - * @description: 重复注册异常 - */ -public class MultiRegisterException extends AuthenticationException { - - public MultiRegisterException(String message) { - super(message, ApiExceptionCodes.MULTI_REGISTER.getValue()); - } - - public MultiRegisterException() { - super(ApiExceptionCodes.MULTI_REGISTER.getDesc(), ApiExceptionCodes.MULTI_REGISTER.getValue()); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/authenticationException/NotAuthenticatedException.java b/src/main/java/com/markerhub/exception/apiException/authenticationException/NotAuthenticatedException.java deleted file mode 100644 index f31a61a7d32034b0417d453124f0a912874815e6..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/authenticationException/NotAuthenticatedException.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.markerhub.exception.apiException.authenticationException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.apiException.AuthenticationException; - -/** - * 未进行实名认证异常 - * - * @author Ma Xiaofeng - * @date : Created in 2021/11/23 - **/ -public class NotAuthenticatedException extends AuthenticationException { - public NotAuthenticatedException() { - super(ApiExceptionCodes.NOT_AUTHENTICATED.getDesc(), ApiExceptionCodes.NOT_AUTHENTICATED.getValue()); - } - - public NotAuthenticatedException(String message) { - super(message, ApiExceptionCodes.NOT_AUTHENTICATED.getValue()); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/authenticationException/NoticeNotSignedException.java b/src/main/java/com/markerhub/exception/apiException/authenticationException/NoticeNotSignedException.java deleted file mode 100644 index ecb36a94c4e6d076effef6ba4da8cee7e40cef53..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/authenticationException/NoticeNotSignedException.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.markerhub.exception.apiException.authenticationException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.apiException.AuthenticationException; - -/** - * 用户未签署服务协议的异常类 - * - * @author Ma Xiaofeng - * @date : Created in 2021/11/15 - **/ -public class NoticeNotSignedException extends AuthenticationException { - //如果用户上传资质认证没有勾选认同服务协议返回对应报错值 - //一般在前端就直接上传时候进行校验 - //但是如果存在异常输入则进行抛出异常处理 - public NoticeNotSignedException() { - super(ApiExceptionCodes.NOTICE_NOT_SIGNED.getDesc(), ApiExceptionCodes.NOTICE_NOT_SIGNED.getValue()); - } - - public NoticeNotSignedException(String message) { - super(message, ApiExceptionCodes.NOTICE_NOT_SIGNED.getValue()); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/authenticationException/PermissionDeniedException.java b/src/main/java/com/markerhub/exception/apiException/authenticationException/PermissionDeniedException.java deleted file mode 100644 index 9d11596a3ef32becb7198352bb9f39dfdd22e500..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/authenticationException/PermissionDeniedException.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.markerhub.exception.apiException.authenticationException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.apiException.AuthenticationException; - -/** - * 无权限异常 - * - * @author Ma Xiaofeng - * @date : Created in 2021/11/15 - **/ -public class PermissionDeniedException extends AuthenticationException { - public PermissionDeniedException() { - super(ApiExceptionCodes.PERMISSION_DENIED.getDesc(), ApiExceptionCodes.PERMISSION_DENIED.getValue()); - } - - public PermissionDeniedException(String message) { - super(message, ApiExceptionCodes.PERMISSION_DENIED.getValue()); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/authenticationException/TokenCheckException.java b/src/main/java/com/markerhub/exception/apiException/authenticationException/TokenCheckException.java deleted file mode 100644 index c729154c3c32192191910ca18995ae47aa2b6a63..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/authenticationException/TokenCheckException.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.markerhub.exception.apiException.authenticationException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.apiException.AuthenticationException; - -/** - * token校验的异常类 - * - * @author Ma Xiaofeng - * @date : Created in 2021/12/08 - **/ -public class TokenCheckException extends AuthenticationException { - //TOKEN_CHECK_FAIL(102, "token校验失败！") - public TokenCheckException() { - super(ApiExceptionCodes.TOKEN_CHECK_FAIL.getDesc(), ApiExceptionCodes.TOKEN_CHECK_FAIL.getValue()); - } - - public TokenCheckException(String message) { - super(message, ApiExceptionCodes.TOKEN_CHECK_FAIL.getValue()); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/authenticationException/TokenNotFoundException.java b/src/main/java/com/markerhub/exception/apiException/authenticationException/TokenNotFoundException.java deleted file mode 100644 index 5161b8f8669809c01db1d3895ecbdad6a0161e42..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/authenticationException/TokenNotFoundException.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.markerhub.exception.apiException.authenticationException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.apiException.AuthenticationException; - -/** - * 未找到token字段的异常类 - * - * @author Ma Xiaofeng - * @date : Created in 2021/12/08 - **/ -public class TokenNotFoundException extends AuthenticationException { - public TokenNotFoundException() { - super(ApiExceptionCodes.TOKEN_NOT_FOUND.getDesc(), ApiExceptionCodes.TOKEN_NOT_FOUND.getValue()); - } - //TOKEN_NOT_FOUND(101, "未找到token！") - public TokenNotFoundException(String message) { - super(message, ApiExceptionCodes.TOKEN_NOT_FOUND.getValue()); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/daoException/DeleteException.java b/src/main/java/com/markerhub/exception/apiException/daoException/DeleteException.java deleted file mode 100644 index 530ecf50b5b4dadaeccc316e966dd1d4025f79b4..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/daoException/DeleteException.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.markerhub.exception.apiException.daoException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.apiException.DaoException; - -/** - * 数据库删除失败的异常类 - * @author Ma Xiaofeng - * @date : Created in 2021/12/08 - **/ -public class DeleteException extends DaoException { - public DeleteException(String message) { - super(message, ApiExceptionCodes.DELETE_ERROR.getValue()); - } - - public DeleteException() { - super(ApiExceptionCodes.DELETE_ERROR.getDesc(), ApiExceptionCodes.DELETE_ERROR.getValue()); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/daoException/InsertException.java b/src/main/java/com/markerhub/exception/apiException/daoException/InsertException.java deleted file mode 100644 index 546801d8ed5b9fddf9af81d99a3065325ca36467..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/daoException/InsertException.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.markerhub.exception.apiException.daoException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.apiException.DaoException; - -/** - * 数据库插入失败的异常类 - * - * @author Ma Xiaofeng - * @date : Created in 2021/12/08 - **/ -public class InsertException extends DaoException { - public InsertException(String message) { - super(message, ApiExceptionCodes.INSERT_ERROR.getValue()); - } - - public InsertException() { - super(ApiExceptionCodes.INSERT_ERROR.getDesc(), ApiExceptionCodes.INSERT_ERROR.getValue()); - } - - public InsertException(String message, Integer code) { - super(message, code); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/daoException/SelectException.java b/src/main/java/com/markerhub/exception/apiException/daoException/SelectException.java deleted file mode 100644 index 046380cad44fbd39a84728a932fd303af7402c04..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/daoException/SelectException.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.markerhub.exception.apiException.daoException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.apiException.DaoException; - -/** - * 数据库查询失败的异常类 - * - * @author Ma Xiaofeng - * @date : Created in 2021/12/08 - **/ -public class SelectException extends DaoException { - public SelectException(String message) { - super(message, ApiExceptionCodes.SELECT_ERROR.getValue()); - } - - public SelectException() { - super(ApiExceptionCodes.INSERT_ERROR.getDesc(), ApiExceptionCodes.SELECT_ERROR.getValue()); - } - - public SelectException(String message, Integer code) { - super(message, code); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/daoException/UpdateException.java b/src/main/java/com/markerhub/exception/apiException/daoException/UpdateException.java deleted file mode 100644 index 88b8c36b7aaec3d96e77e1b7499fd05433dd8265..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/daoException/UpdateException.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.markerhub.exception.apiException.daoException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.apiException.DaoException; - -/** - * 数据库修改失败的异常类 - * - * @author Ma Xiaofeng - * @date : Created in 2021/12/08 - **/ -public class UpdateException extends DaoException { - public UpdateException() { - super(ApiExceptionCodes.UPDATE_ERROR.getDesc(), ApiExceptionCodes.UPDATE_ERROR.getValue()); - } - - public UpdateException(String message) { - super(message, ApiExceptionCodes.UPDATE_ERROR.getValue()); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/daoException/insertException/AccountExistedException.java b/src/main/java/com/markerhub/exception/apiException/daoException/insertException/AccountExistedException.java deleted file mode 100644 index 1f7901535d10579a62c1ba0b3d60be90fceed36b..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/daoException/insertException/AccountExistedException.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.markerhub.exception.apiException.daoException.insertException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.apiException.daoException.InsertException; - -/** - * 用户已存在异常类 - * - * @author Ma Xiaofeng - * @date : Created in 2021/12/08 - **/ -public class AccountExistedException extends InsertException { - public AccountExistedException(String message) { - super(message, ApiExceptionCodes.ACCOUNT_EXISTED.getValue()); - } - - public AccountExistedException() { - super(ApiExceptionCodes.ACCOUNT_EXISTED.getDesc(), ApiExceptionCodes.ACCOUNT_EXISTED.getValue()); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/decryptException/DecryptNullException.java b/src/main/java/com/markerhub/exception/apiException/decryptException/DecryptNullException.java deleted file mode 100644 index 5080ec7a89bbe0d402c248a9fd6635127ea5f7da..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/decryptException/DecryptNullException.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.markerhub.exception.apiException.decryptException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.apiException.DecryptException; - -/** - * @author : Ma Xiaofeng - * @date : Created in 2021/12/08 - * @description: 解密为空异常类 - */ -public class DecryptNullException extends DecryptException { - - public DecryptNullException() { - super(ApiExceptionCodes.DECRYPT_NULL.getDesc(), ApiExceptionCodes.DECRYPT_NULL.getValue()); - } - - public DecryptNullException(String message) { - super(message, ApiExceptionCodes.DECRYPT_NULL.getValue()); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/smsException/MessageCheckException.java b/src/main/java/com/markerhub/exception/apiException/smsException/MessageCheckException.java deleted file mode 100644 index ffb02c57a329b737b309764a7e6124b35cde898a..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/smsException/MessageCheckException.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.markerhub.exception.apiException.smsException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.apiException.SmsException; - -/** - * 短信验证码验证失败异常类 - * - * @author Ma Xiaofeng - * @date : Created in 2021/12/13 - **/ -public class MessageCheckException extends SmsException { - - public MessageCheckException() { - super(ApiExceptionCodes.MESSAGE_CHECK_FAIL.getDesc(), ApiExceptionCodes.MESSAGE_CHECK_FAIL.getValue()); - } - - public MessageCheckException(String message) { - super(message, ApiExceptionCodes.MESSAGE_CHECK_FAIL.getValue()); - } -} diff --git a/src/main/java/com/markerhub/exception/apiException/smsException/MessageSendException.java b/src/main/java/com/markerhub/exception/apiException/smsException/MessageSendException.java deleted file mode 100644 index 15deb67fcda1b09fb7e88a879a56159d4f96a463..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/apiException/smsException/MessageSendException.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.markerhub.exception.apiException.smsException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.apiException.SmsException; - -/** - * 短信发送失败的异常类 - * - * @author Ma Xiaofeng - * @date : Created in 2021/12/13 - **/ -public class MessageSendException extends SmsException { - public MessageSendException() { - super(ApiExceptionCodes.MESSAGE_SEND_FAIL.getDesc(), ApiExceptionCodes.MESSAGE_SEND_FAIL.getValue()); - } - - public MessageSendException(String message) { - super(message, ApiExceptionCodes.MESSAGE_SEND_FAIL.getValue()); - } -} diff --git a/src/main/java/com/markerhub/exception/runtimeApiException/RequestTimesExceededException.java b/src/main/java/com/markerhub/exception/runtimeApiException/RequestTimesExceededException.java deleted file mode 100644 index 49cb7e5c46c71595cfa76eca29715812ba1c76fb..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/exception/runtimeApiException/RequestTimesExceededException.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.markerhub.exception.runtimeApiException; - -import com.markerhub.constant.ApiExceptionCodes; -import com.markerhub.exception.RuntimeApiException; - -/** - * 访问次数限制异常类 - * - * @author Ma Xiaofeng - **/ -public class RequestTimesExceededException extends RuntimeApiException { - /** - * 默认的访问次数限制异常的状态码和状态值的回显 - * param1：返回错误码的消息，举例：访问次数超限 - * param2：返回错误码的值，举例：701 - */ - public RequestTimesExceededException() { - super(ApiExceptionCodes.REQUEST_TIMES_EXCEEDED.getDesc(), ApiExceptionCodes.REQUEST_TIMES_EXCEEDED.getValue()); - } - - /** - * 为子类提供异常类的父类接口 - * 错误码的值定为701 - * @param message 子类的消息 - */ - public RequestTimesExceededException(String message) { - super(message, ApiExceptionCodes.REQUEST_TIMES_EXCEEDED.getValue()); - } -} diff --git a/src/main/java/com/markerhub/handler/LoginHandler.java b/src/main/java/com/markerhub/handler/LoginHandler.java deleted file mode 100644 index 1a6512ea74e4935f72b058ccec8a5af0443160f2..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/handler/LoginHandler.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.markerhub.handler; - -import com.alibaba.fastjson.JSON; -import com.markerhub.common.RedisKey; -import com.markerhub.common.lang.Result; -import com.markerhub.pojo.dto.UserDto; -import com.markerhub.util.JWTUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; -import org.springframework.web.method.HandlerMethod; -import org.springframework.web.servlet.HandlerInterceptor; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - - -/** - * @Author by MaXiaofeng - * @Description 登录的拦截器，统一进行切面管理 - * @Date 2022/2/10 13:07 - * @Version 1.0.0 - */ - -/** - * 拦截器的使用需要放入mvc配置中 - */ -@Component -public class LoginHandler implements HandlerInterceptor { - @Autowired - private StringRedisTemplate redisTemplate; - - /** - * 在方法执行之前进行拦截 - * - * @param request - * @param response - * @param handler - * @return - * @throws Exception - */ - @Override - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - /** - * 1、判断请求是否是controller方法 - * 2、有些接口是不需要登录拦截，需要开发自定义注解 @NoAuth此注解不需要登录 - * 3、拿到token - * 4、token认证 redis认证 =>user信息 - * 5、如果token认证通过则放行，认证不通过则返回未登录 - * 6、得到用户信息，放入ThreadLocal中 - */ - if (!(handler instanceof HandlerMethod)) { - //如果访问的不是controller方法，则放行 - return true; - } - HandlerMethod handlerMethod = (HandlerMethod) handler; - //handlerMethod如果有我们的NoAuth注解，则放行 - if (handlerMethod.hasMethodAnnotation(NoAuth.class)) { - return true; - } - String token = request.getHeader("Authorization"); - token = token.replace("Bearer ", ""); - boolean verify = JWTUtils.verify(token); - if (!verify) { - response.setContentType("application/json;charset=utf-8"); - response.getWriter().write(JSON.toJSONString(Result.fail("未登录"))); - return false; - } - String userJson = redisTemplate.opsForValue().get(RedisKey.TOKEN + token); - if (StringUtils.isEmpty(userJson)) { - response.setContentType("application/json;charset=utf-8"); - response.getWriter().write(JSON.toJSONString(Result.fail("未登录"))); - return false; - } - UserDto userDto = JSON.parseObject(userJson, UserDto.class); - //得到了用户信息放入ThreadLocal当中 - UserThreadLocal.put(userDto); - return true; - } -} diff --git a/src/main/java/com/markerhub/handler/NoAuth.java b/src/main/java/com/markerhub/handler/NoAuth.java deleted file mode 100644 index f266c8be36b1bfa3adaf4644a6fbb455db35ca85..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/handler/NoAuth.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.markerhub.handler; - -import java.lang.annotation.*; - -/** - * @Author MaXiaofeng - * @Description 自定义注解 @NoAuth此注解不需要登录 - * @Date 2022/2/10 13:21 - * @Version 1.0.0 - */ - -@Target({ElementType.METHOD})//注解只能用于方法 -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface NoAuth { -} diff --git a/src/main/java/com/markerhub/handler/UserThreadLocal.java b/src/main/java/com/markerhub/handler/UserThreadLocal.java deleted file mode 100644 index 7638a2231cc04e2264a4704911e757431c1b7260..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/handler/UserThreadLocal.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.markerhub.handler; - -import com.markerhub.pojo.dto.UserDto; - -/** - * @Author by MaXiaofeng - * @Description TODO - * @Date 2022/2/10 16:46 - * @Version 1.0.0 - */ - -public class UserThreadLocal { - private static final ThreadLocal LOCAL = new ThreadLocal<>(); - - public static void put(UserDto userDto) { - LOCAL.set(userDto); - } - - public static UserDto get() { - return LOCAL.get(); - } - - public static void remove() { - LOCAL.remove(); - } -} diff --git a/src/main/java/com/markerhub/mapper/BlogMapper.java b/src/main/java/com/markerhub/mapper/BlogMapper.java deleted file mode 100644 index 03fca77a35431e4302c4b3699bb0e11eda1e914e..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/mapper/BlogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.markerhub.mapper; - -import com.markerhub.entity.Blog; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * - * Mapper 接口 - * - * - * @author MaXiaofeng - * @since 2022-1-28 - */ -public interface BlogMapper extends BaseMapper { - -} diff --git a/src/main/java/com/markerhub/mapper/UserMapper.java b/src/main/java/com/markerhub/mapper/UserMapper.java deleted file mode 100644 index 9fa5f3a315693786e22efdc2a402c84aae05ca99..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/mapper/UserMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.markerhub.mapper; - -import com.markerhub.entity.User; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * - * Mapper 接口 - * - * - * @author MaXiaofeng - * @since 2022-1-28 - */ -public interface UserMapper extends BaseMapper { - -} diff --git a/src/main/java/com/markerhub/pojo/dto/UserDto.java b/src/main/java/com/markerhub/pojo/dto/UserDto.java deleted file mode 100644 index a5c0bfde2e3e2d7cd567548c46ec9a1638ce413e..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/pojo/dto/UserDto.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.markerhub.pojo.dto; - -import com.markerhub.vo.WxUserInfo; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.List; - -/** - * @Author by MaXiaofeng - * @Description TODO - * @Date 2022/2/9 16:33 - * @Version 1.0.0 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -public class UserDto implements Serializable { - private long id; - private String nickname; - //更新的时候可以为NULL - private String username; - @NotNull - private String password; - private String gender; - //头像 - private String portrait; - //背景图片 - private String background; - @NotNull - private String phone_number; - - private String open_id; - - private String wx_union_id; - //dto拓展属性 - private String token; - List permissions; - List roles; - //验证码 - private String code; - - public void from(WxUserInfo wxUserInfo) { - this.nickname = wxUserInfo.getNickName(); - this.portrait = wxUserInfo.getAvatarUrl(); - this.gender = wxUserInfo.getGender(); - this.open_id = wxUserInfo.getOpenId(); - this.wx_union_id = wxUserInfo.getUnionId(); - this.username = ""; - this.password = ""; - this.phone_number = ""; - - } -} diff --git a/src/main/java/com/markerhub/repository/LoginUserRepository.java b/src/main/java/com/markerhub/repository/LoginUserRepository.java deleted file mode 100644 index 96fd597cab3f8ce3b2af2343109713ec741a349f..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/repository/LoginUserRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.markerhub.repository; - -import com.markerhub.entity.LoginUser; -import org.springframework.data.jpa.repository.JpaRepository; - -/** - * @author XiaoFeng - * @version 1.0 - * @Description 从数据库台中读取数据 参数 - * Create by 2022/2/6 15:15 - */ - -public interface LoginUserRepository extends JpaRepository { - LoginUser findByUsernameAndPassword(String username,String password); -} - diff --git a/src/main/java/com/markerhub/repository/UserRepository.java b/src/main/java/com/markerhub/repository/UserRepository.java deleted file mode 100644 index c05cb4699a55cd2e2b85e0f07fdbdddad8fcc6b5..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/repository/UserRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.markerhub.repository; - -import com.markerhub.entity.Wx_User; -import org.springframework.data.jpa.repository.JpaRepository; - -/** - * @Author by MaXiaofeng - * @Description TODO - * @Date 2022/2/6 16:01 - * @Version 1.0.0 - */ - -public interface UserRepository extends JpaRepository { -} diff --git a/src/main/java/com/markerhub/repository/Wx_UserRepository.java b/src/main/java/com/markerhub/repository/Wx_UserRepository.java deleted file mode 100644 index 708c99dbe0ae079fe50c2d060d58389ab8284ec9..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/repository/Wx_UserRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.markerhub.repository; - -import com.markerhub.entity.User; -import org.springframework.data.jpa.repository.JpaRepository; - -/** - * @author XiaoFeng - * @version 1.0 - * @Description Create by 2022/2/9 23:42 - */ - -public interface Wx_UserRepository extends JpaRepository { -} diff --git a/src/main/java/com/markerhub/service/ISmsService.java b/src/main/java/com/markerhub/service/ISmsService.java deleted file mode 100644 index 2ebc97f7c2e64ecb45d40ad6387caf9aa988232e..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/service/ISmsService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.markerhub.service; - -/** - * @Author by MaXiaofeng - * @Description 短信业务 - * @Date 2022/2/13 16:55 - * @Version 1.0.0 - */ - -public interface ISmsService { - /** - * 发送短信验证码 - * - * @param phone - */ - void sendSmsCode(String phone); - - /** - * 验证短信验证码 - * - * @param phone - * @param code - */ - void verifyCode(String phone, String code); -} diff --git a/src/main/java/com/markerhub/service/SendMsgService.java b/src/main/java/com/markerhub/service/SendMsgService.java deleted file mode 100644 index ff24ceab503de33f36a48c82ccfa73306a17f1b1..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/service/SendMsgService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.markerhub.service; - -import java.util.Map; - -/** - * @Author by MaXiaofeng - * @Description 阿里云发送短信Serviece - * @Date 2022/2/13 15:49 - * @Version 1.0.0 - */ - -public interface SendMsgService { - /** - * - * @param phoneNumbers - * @param param - * @return - */ - public Boolean sendMsg(String phoneNumbers, Map param); -} diff --git a/src/main/java/com/markerhub/service/UserService.java b/src/main/java/com/markerhub/service/UserService.java deleted file mode 100644 index 3f580f2dfb6e727bbe1c8b4742a655c7a40506cc..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/service/UserService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.markerhub.service; - -import com.markerhub.common.lang.Result; -import com.markerhub.pojo.dto.UserDto; -import com.markerhub.vo.WXAuth; - -public interface UserService { - boolean login(String username, String password); - - Result getSessionId(String code); - - Result authLogin(WXAuth wxAuth); - - Result wx_login(UserDto userDto); - - Result wx_register(UserDto userDto); - - Result userInfo(Boolean refresh); -} diff --git a/src/main/java/com/markerhub/service/WxService.java b/src/main/java/com/markerhub/service/WxService.java deleted file mode 100644 index b28f7c4e2c5d2af8dba9fbfa3ae56a634b026470..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/service/WxService.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.markerhub.service; - -import cn.hutool.core.codec.Base64; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.markerhub.common.RedisKey; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.stereotype.Component; - -import javax.crypto.Cipher; -import javax.crypto.spec.IvParameterSpec; -import javax.crypto.spec.SecretKeySpec; -import java.security.spec.AlgorithmParameterSpec; -import java.util.Random; - -/** - * @Author by MaXiaofeng - * @Description TODO - * @Date 2022/2/9 15:37 - * @Version 1.0.0 - */ -@Component -public class WxService { - - @Autowired - private StringRedisTemplate redisTemplate; - - private static String openId; - /** - * 加密数据解密算法 - * 接口如果涉及敏感数据（如wx.getUserInfo当中的 openId 和 unionId），接口的明文内容将不包含这些敏感数据。 - * 开发者如需要获取敏感数据，需要对接口返回的加密数据(encryptedData) 进行对称解密 - * - * @param encryptedData - * @param sessionId - * @param vi - * @return - * @throws Exception - */ - public String wxDecrypt(String encryptedData, String sessionId, String vi) throws Exception { - // 开始解密 - String json = redisTemplate.opsForValue().get(RedisKey.WX_SESSION_ID + sessionId).replace("\\", ""); - json = json.substring(1,json.length()-1); - System.out.println(json); - JSONObject jsonObject = JSON.parseObject(json); - String sessionKey = (String) jsonObject.get("session_key"); - openId = (String) jsonObject.get("openid"); - byte[] encData = cn.hutool.core.codec.Base64.decode(encryptedData); - byte[] iv = cn.hutool.core.codec.Base64.decode(vi); - byte[] key = Base64.decode(sessionKey); - AlgorithmParameterSpec ivSpec = new IvParameterSpec(iv); - Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); - SecretKeySpec keySpec = new SecretKeySpec(key, "AES"); - cipher.init(Cipher.DECRYPT_MODE, keySpec, ivSpec); - return new String(cipher.doFinal(encData), "UTF-8"); - } - - /** - * 生成随机用户名，数字和字母组成, - * - * @param length - * @return - */ - public String getStringRandom(int length) { - StringBuilder val = new StringBuilder(); - Random random = new Random(); - //参数length，表示生成几位随机数 - for (int i = 0; i < length; i++) { - String charOrNum = random.nextInt(2) % 2 == 0 ? "char" : "num"; - //输出字母还是数字 - if ("char".equalsIgnoreCase(charOrNum)) { - //输出是大写字母还是小写字母 - int temp = random.nextInt(2) % 2 == 0 ? 65 : 97; - val.append((char) (random.nextInt(26) + temp)); - } else { - val.append(random.nextInt(10)); - } - } - return val.toString(); - } - public static String getOpenId(){ - return openId; - } -} diff --git a/src/main/java/com/markerhub/service/impl/SmsServiceImpl.java b/src/main/java/com/markerhub/service/impl/SmsServiceImpl.java deleted file mode 100644 index a7648c4b44e115bd7455a2bd3427fa599a5e9b33..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/service/impl/SmsServiceImpl.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.markerhub.service.impl; - -import com.markerhub.config.SmsConfig; -import com.markerhub.config.SmsLengthEnum; -import com.markerhub.config.SmsResponseCodeEnum; -import com.markerhub.service.ISmsService; -import com.markerhub.util.RedisUtil; -import com.markerhub.util.SmsCodeUtil; -import com.markerhub.util.SmsUtil; -import com.tencentcloudapi.sms.v20190711.models.SendStatus; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Service; - -import java.util.concurrent.TimeUnit; - -/** - * @Author by MaXiaofeng - * @Description 短信业务实现类 - * @Date 2022/2/13 16:56 - * @Version 1.0.0 - */ -@Service -@Slf4j -@RequiredArgsConstructor -public class SmsServiceImpl implements ISmsService { - - private SmsConfig smsConfig; - private RedisUtil redisUtil; - - /** - * 腾讯云短信模板id-短信验证码 - */ - @Value("${sms-config.templateIds.code}") - private String templateIdCode; - - @Override - public void sendSmsCode(String phone) { - // redis缓存的键 - final String smsKey = SmsCodeUtil.createSmsCacheKey(smsConfig.getPhonePrefix(), phone, "wxUser_sign"); - //下发手机号码，采用 e.164 标准，+[国家或地区码][手机号] 示例如：+8613711112222， 其中前面有一个+号 ，86为国家码，13711112222为手机号，最多不要超过200个手机号 - String[] phoneNumbers = {"+86" + phone}; - //模板参数: 若无模板参数，则设置为空（第一个参数为随机验证码，第二个参数为有效时间） - final String smsRandomCode = SmsCodeUtil.createSmsRandomCode(SmsLengthEnum.SMS_LENGTH_4); - String[] templateParams = {smsRandomCode, - smsConfig.getExpireTime()}; - - SendStatus[] sendStatuses = SmsUtil.sendSms(smsConfig, templateIdCode, templateParams, phoneNumbers); - String resCode = sendStatuses[0].getCode(); - if (resCode.equals(SmsResponseCodeEnum.OK.getCode())) { - // 返回ok，缓存 - redisUtil.set(smsKey, smsRandomCode, Long.parseLong(smsConfig.getExpireTime()), TimeUnit.MINUTES); - } else { - log.error("【短信业务-发送失败】phone:" + phone + "errMsg:" + sendStatuses[0].getMessage()); - } - } - - @Override - public void verifyCode(String phone, String code) { -// redis缓存的键 - final String smsKey = SmsCodeUtil.createSmsCacheKey(smsConfig.getPhonePrefix(), phone, "wxUser_sign"); - // 如果key存在（存在并且未过期） - if (redisUtil.hasKey(smsKey)) { - String cacheCode = redisUtil.get(smsKey).toString(); - if (cacheCode.equals(code)) { - //验证码正确 - //删除验证码缓存 - redisUtil.delete(smsKey); - log.info("【短信业务-微信小程序手机认证成功】phone：" + phone); - } else { - //验证码不正确 - log.error("【短信业务-微信小程序手机认证失败】验证码错误。phone：" + phone); -// throw new BaseException(ResponseEnum.SMS_CODE_VERITY_FAIL); - } - } else { - log.error("【短信业务-微信小程序手机认证失败】验证码失效。phone：" + phone); -// throw new BaseException(ResponseEnum.SMS_CODE_EXPIRE); - } - } -} diff --git a/src/main/java/com/markerhub/service/impl/UserServiceImpl.java b/src/main/java/com/markerhub/service/impl/UserServiceImpl.java deleted file mode 100644 index b763f5c984e0fce9152f42fcb14ca826e1292e01..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/service/impl/UserServiceImpl.java +++ /dev/null @@ -1,179 +0,0 @@ -package com.markerhub.service.impl; - -import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.markerhub.common.RedisKey; -import com.markerhub.common.lang.Result; -import com.markerhub.entity.User; -import com.markerhub.handler.UserThreadLocal; -import com.markerhub.mapper.UserMapper; -import com.markerhub.pojo.dto.UserDto; -import com.markerhub.repository.UserRepository; -import com.markerhub.repository.Wx_UserRepository; -import com.markerhub.service.UserService; -import com.markerhub.service.WxService; -import com.markerhub.util.JWTUtils; -import com.markerhub.vo.WXAuth; -import com.markerhub.vo.WxUserInfo; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.env.Environment; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.TimeUnit; - -/** - * 服务实现类 - * - * @author MaXiaofeng - * @since 2022-1-28 - */ - -@Service -public class UserServiceImpl implements UserService { - - @Autowired - private Environment env; - @Autowired - private WxService wxService; - @Autowired - private RedisTemplate redisTemplate; - @Resource - private UserMapper userMapper; - @Resource - private Wx_UserRepository wx_userRepository; - - - @Override - public boolean login(String username, String password) { - return false; - } - - /** - * 微信小程序登录第一步 - * 1.首先拼接一个url 微信登陆凭证校验接口 - * 2.发起http调用，获取微信的返回结果 - * 3.存到redis中 - * 4. 生成sessionId，返回给前端，作为当前需要登陆用户的标识 - * 5.生成一个sessionId，用户在点击微信登陆的时候我们可以标识 用户是谁 - * - * @param code - * @return - */ - - @Override - public Result getSessionId(String code) { - JSONObject jsonObject = JSON.parseObject(code); - String Code = (String) jsonObject.get("code"); - String appid = env.getProperty("wxmini.appid"); - String appSecret = env.getProperty("wxmini.secret"); - String url = "https://api.weixin.qq.com/sns/jscode2session?appid={0}&secret={1}&js_code={2}&grant_type=authorization_code"; - String replaceUrl = url.replace("{0}", appid).replace("{1}", appSecret).replace("{2}", Code); - //发起http调用，获取微信的返回结果 - String res = HttpUtil.get(replaceUrl); - ///随机生成一个标识 - String uuid = UUID.randomUUID().toString(); - redisTemplate.opsForValue().set(RedisKey.WX_SESSION_ID + uuid, res, 30, TimeUnit.MINUTES); - Map map = new HashMap<>(); - map.put("sessionId", uuid); - return Result.success(map); - } - - /** - * 1、通过WXAuth中的值进行解密 - * 2、解密完成之后，获取用户信息 其中包含openID、性别、名称、头像 - * 3、openId唯一，需要去user表中查询openId是否存在，如果存在则已该用户的身份登录成功 - * 4、不存在则是新用户，注册流程登陆成功 - * 5、使用jwt技术，生成一个token，提供给前端token令牌，用户在下次访问的时候，携带token来访问 - * 6、后端通过对token的验证，知道此用户是否处于登陆状态，是哪个用户登陆的 - * - * @param wxAuth - * @return - */ - @Override - public Result authLogin(WXAuth wxAuth) { - try { - String userInfoJson = wxService.wxDecrypt(wxAuth.getEncryptedData(), wxAuth.getSessionId(), wxAuth.getIv()); - WxUserInfo wxUserInfo = JSON.parseObject(userInfoJson, WxUserInfo.class); - String openId = WxService.getOpenId(); - wxUserInfo.setOpenId(openId); - User user = userMapper.selectOne(Wrappers.lambdaQuery().eq(User::getOpen_id, openId).last("limit 1")); - UserDto userDto = new UserDto(); - if (user == null) { - userDto.from((wxUserInfo)); - //注册 - return this.wx_register(userDto); - } else { - //登录 - userDto.setId(user.getId()); - return this.wx_login(userDto); - } - - } catch (Exception e) { - e.printStackTrace(); - } - - return Result.fail(""); - } - - /** - * 微信登陆 使用jwt技术，生成一个token，提供给前端token令牌，用户在下次访问的时候，携带token来访问 - * - * @param userDto - * @return - */ - public Result wx_login(UserDto userDto) { - String token = JWTUtils.sign(userDto.getId()); - userDto.setToken(token); - //openId、unionId不予前端展示 - userDto.setOpen_id(null); - userDto.setWx_union_id(null); - //需要把token存入redis，讲value存为userDto - //下次用户访问需要登陆资源的时候，可以根据token拿到用户的详细信息 - redisTemplate.opsForValue().set(RedisKey.TOKEN + token, JSON.toJSONString(userDto), 7, TimeUnit.DAYS); - return Result.success(userDto); - } - - /** - * 微信用户注册，将新用户信息放入数据库中 - * - * @param userDto - * @return - */ - public Result wx_register(UserDto userDto) { - User user = new User(); - BeanUtils.copyProperties(userDto, user); - wx_userRepository.save(user); - userDto.setId(user.getId()); - return this.wx_login(userDto); - } - - /** - * 1、根据token来验证此token是否有效 - * 2、refresh 如果为true代表刷新 重新生成 token和 redis里面重新存储 续期 - * 3、refresh 如果为false直接返回用户信息 redis中查询出来直接返回 - * - * @param refresh - * @return - */ - @Override - public Result userInfo(Boolean refresh) { - UserDto userDto = UserThreadLocal.get(); - //refresh 如果为true代表刷新 重新生成 token和 redis里面重新存储 续期 - if (refresh) { - String token = JWTUtils.sign(userDto.getId()); - userDto.setToken(token); - redisTemplate.opsForValue().set(RedisKey.TOKEN + token, JSON.toJSONString(userDto), 7, TimeUnit.DAYS); - } - - return Result.success(userDto); - } -} diff --git a/src/main/java/com/markerhub/util/JWTUtils.java b/src/main/java/com/markerhub/util/JWTUtils.java deleted file mode 100644 index b80c6884a6edf6093ab766c5a3a28f5f54084aac..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/util/JWTUtils.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.markerhub.util; - -import com.auth0.jwt.JWT; -import com.auth0.jwt.JWTVerifier; -import com.auth0.jwt.algorithms.Algorithm; -import com.auth0.jwt.exceptions.JWTDecodeException; -import com.auth0.jwt.interfaces.DecodedJWT; - -import java.util.Date; - -/** - * @Author by MaXiaofeng - * @Description TODO - * @Date 2022/2/9 16:45 - * @Version 1.0.0 - */ - -public class JWTUtils { - public static final String AUTH_HEADER_KEY = "Authorization"; - - public static final String TOKEN_PREFIX = "Bearer "; - /** - * 过期时间一周 - */ - private static final long EXPIRE_TIME = 7 * 24 * 60 * 60 * 1000; - - private static final String secret = "43dcbc5b-8776-429e-b122-3cae6bd97020"; - - /** - * 校验token是否正确 - * - * @param token 密钥 - * @return 是否正确 - */ - public static boolean verify(String token) { - try { - Algorithm algorithm = Algorithm.HMAC256(secret); - JWTVerifier verifier = JWT.require(algorithm) - .build(); - DecodedJWT jwt = verifier.verify(token); - return true; - } catch (Exception exception) { - return false; - } - } - - /** - * 获得token中的信息无需secret解密也能获得 - * - * @return token中包含的id - */ - public static Long getUserId(String token) { - try { - DecodedJWT jwt = JWT.decode(token); - return jwt.getClaim("id").asLong(); - } catch (JWTDecodeException e) { - return null; - } - } - - /** - * 签发生成token - * - * @return 加密的token - */ - public static String sign(Long id) { - Date date = new Date(System.currentTimeMillis() + EXPIRE_TIME); - Algorithm algorithm = Algorithm.HMAC256(secret); - // 附带username信息 - return JWT.create() - .withClaim("id", id) - .withExpiresAt(date) - .sign(algorithm); - } - - /** - * 判断过期 - * - * @param token - * @return - */ - public static boolean isExpire(String token) { - DecodedJWT jwt = JWT.decode(token); - return System.currentTimeMillis() > jwt.getExpiresAt().getTime(); - } -} diff --git a/src/main/java/com/markerhub/util/RedisUtil.java b/src/main/java/com/markerhub/util/RedisUtil.java deleted file mode 100644 index 7c0cd472ce3ff2ea99727f6f4e4818b092e84e1f..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/util/RedisUtil.java +++ /dev/null @@ -1,1346 +0,0 @@ -package com.markerhub.util; - -/** - * Redis工具类 - * - * @author WangFan - * @date 2018-02-24 下午03:09:50 - * @version 1.1 (GitHub文档: https://github.com/whvcse/RedisUtil ) - */ - -import org.springframework.data.redis.connection.DataType; -import org.springframework.data.redis.core.Cursor; -import org.springframework.data.redis.core.ScanOptions; -import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.data.redis.core.ZSetOperations.TypedTuple; - -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.TimeUnit; - - -public class RedisUtil { - private StringRedisTemplate redisTemplate; - - public void setRedisTemplate(StringRedisTemplate redisTemplate) { - this.redisTemplate = redisTemplate; - } - - public StringRedisTemplate getRedisTemplate() { - return this.redisTemplate; - } - - /** -------------------key相关操作--------------------- */ - - /** - * 删除key - * - * @param key - */ - public void delete(String key) { - redisTemplate.delete(key); - } - - /** - * 批量删除key - * - * @param keys - */ - public void delete(Collection keys) { - redisTemplate.delete(keys); - } - - /** - * 序列化key - * - * @param key - * @return - */ - public byte[] dump(String key) { - return redisTemplate.dump(key); - } - - /** - * 是否存在key - * - * @param key - * @return - */ - public Boolean hasKey(String key) { - return redisTemplate.hasKey(key); - } - - /** - * 设置过期时间 - * - * @param key - * @param timeout - * @param unit - * @return - */ - public Boolean expire(String key, long timeout, TimeUnit unit) { - return redisTemplate.expire(key, timeout, unit); - } - - /** - * 设置过期时间 - * - * @param key - * @param date - * @return - */ - public Boolean expireAt(String key, Date date) { - return redisTemplate.expireAt(key, date); - } - - /** - * 查找匹配的key - * - * @param pattern - * @return - */ - public Set keys(String pattern) { - return redisTemplate.keys(pattern); - } - - /** - * 将当前数据库的 key 移动到给定的数据库 db 当中 - * - * @param key - * @param dbIndex - * @return - */ - public Boolean move(String key, int dbIndex) { - return redisTemplate.move(key, dbIndex); - } - - /** - * 移除 key 的过期时间，key 将持久保持 - * - * @param key - * @return - */ - public Boolean persist(String key) { - return redisTemplate.persist(key); - } - - /** - * 返回 key 的剩余的过期时间 - * - * @param key - * @param unit - * @return - */ - public Long getExpire(String key, TimeUnit unit) { - return redisTemplate.getExpire(key, unit); - } - - /** - * 返回 key 的剩余的过期时间 - * - * @param key - * @return - */ - public Long getExpire(String key) { - return redisTemplate.getExpire(key); - } - - /** - * 从当前数据库中随机返回一个 key - * - * @return - */ - public String randomKey() { - return redisTemplate.randomKey(); - } - - /** - * 修改 key 的名称 - * - * @param oldKey - * @param newKey - */ - public void rename(String oldKey, String newKey) { - redisTemplate.rename(oldKey, newKey); - } - - /** - * 仅当 newkey 不存在时，将 oldKey 改名为 newkey - * - * @param oldKey - * @param newKey - * @return - */ - public Boolean renameIfAbsent(String oldKey, String newKey) { - return redisTemplate.renameIfAbsent(oldKey, newKey); - } - - /** - * 返回 key 所储存的值的类型 - * - * @param key - * @return - */ - public DataType type(String key) { - return redisTemplate.type(key); - } - - /** -------------------string相关操作--------------------- */ - - /** - * 设置指定 key 的值 - * - * @param key - * @param value - */ - public void set(String key, String value) { - redisTemplate.opsForValue().set(key, value); - } - - /** - * 设置指定 key 的值 - * @param key - * @param value - * @param timeout - * @param unit - */ - public void set(String key,String value,long timeout, TimeUnit unit){ - redisTemplate.opsForValue().set(key, value,timeout,unit); - } - - /** - * 获取指定 key 的值 - * - * @param key - * @return - */ - public String get(String key) { - return redisTemplate.opsForValue().get(key); - } - - /** - * 返回 key 中字符串值的子字符 - * - * @param key - * @param start - * @param end - * @return - */ - public String getRange(String key, long start, long end) { - return redisTemplate.opsForValue().get(key, start, end); - } - - /** - * 将给定 key 的值设为 value ，并返回 key 的旧值(old value) - * - * @param key - * @param value - * @return - */ - public String getAndSet(String key, String value) { - return redisTemplate.opsForValue().getAndSet(key, value); - } - - /** - * 对 key 所储存的字符串值，获取指定偏移量上的位(bit) - * - * @param key - * @param offset - * @return - */ - public Boolean getBit(String key, long offset) { - return redisTemplate.opsForValue().getBit(key, offset); - } - - /** - * 批量获取 - * - * @param keys - * @return - */ - public List multiGet(Collection keys) { - return redisTemplate.opsForValue().multiGet(keys); - } - - /** - * 设置ASCII码, 字符串'a'的ASCII码是97, 转为二进制是'01100001', 此方法是将二进制第offset位值变为value - * - * @param key - * @param offset 位置 - * @param value 值,true为1, false为0 - * @return - */ - public boolean setBit(String key, long offset, boolean value) { - return redisTemplate.opsForValue().setBit(key, offset, value); - } - - /** - * 将值 value 关联到 key ，并将 key 的过期时间设为 timeout - * - * @param key - * @param value - * @param timeout 过期时间 - * @param unit 时间单位, 天:TimeUnit.DAYS 小时:TimeUnit.HOURS 分钟:TimeUnit.MINUTES - * 秒:TimeUnit.SECONDS 毫秒:TimeUnit.MILLISECONDS - */ - public void setEx(String key, String value, long timeout, TimeUnit unit) { - redisTemplate.opsForValue().set(key, value, timeout, unit); - } - - /** - * 只有在 key 不存在时设置 key 的值 - * - * @param key - * @param value - * @return 之前已经存在返回false, 不存在返回true - */ - public boolean setIfAbsent(String key, String value) { - return redisTemplate.opsForValue().setIfAbsent(key, value); - } - - /** - * 用 value 参数覆写给定 key 所储存的字符串值，从偏移量 offset 开始 - * - * @param key - * @param value - * @param offset 从指定位置开始覆写 - */ - public void setRange(String key, String value, long offset) { - redisTemplate.opsForValue().set(key, value, offset); - } - - /** - * 获取字符串的长度 - * - * @param key - * @return - */ - public Long size(String key) { - return redisTemplate.opsForValue().size(key); - } - - /** - * 批量添加 - * - * @param maps - */ - public void multiSet(Map maps) { - redisTemplate.opsForValue().multiSet(maps); - } - - /** - * 同时设置一个或多个 key-value 对，当且仅当所有给定 key 都不存在 - * - * @param maps - * @return 之前已经存在返回false, 不存在返回true - */ - public boolean multiSetIfAbsent(Map maps) { - return redisTemplate.opsForValue().multiSetIfAbsent(maps); - } - - /** - * 增加(自增长), 负数则为自减 - * - * @param key - * @param increment - * @return - */ - public Long incrBy(String key, long increment) { - return redisTemplate.opsForValue().increment(key, increment); - } - - /** - * @param key - * @param increment - * @return - */ - public Double incrByFloat(String key, double increment) { - return redisTemplate.opsForValue().increment(key, increment); - } - - /** - * 追加到末尾 - * - * @param key - * @param value - * @return - */ - public Integer append(String key, String value) { - return redisTemplate.opsForValue().append(key, value); - } - - /** -------------------hash相关操作------------------------- */ - - /** - * 获取存储在哈希表中指定字段的值 - * - * @param key - * @param field - * @return - */ - public Object hGet(String key, String field) { - return redisTemplate.opsForHash().get(key, field); - } - - /** - * 获取所有给定字段的值 - * - * @param key - * @return - */ - public Map hGetAll(String key) { - return redisTemplate.opsForHash().entries(key); - } - - /** - * 获取所有给定字段的值 - * - * @param key - * @param fields - * @return - */ - public List hMultiGet(String key, Collection fields) { - return redisTemplate.opsForHash().multiGet(key, fields); - } - - public void hPut(String key, String hashKey, String value) { - redisTemplate.opsForHash().put(key, hashKey, value); - } - - public void hPutAll(String key, Map maps) { - redisTemplate.opsForHash().putAll(key, maps); - } - - /** - * 仅当hashKey不存在时才设置 - * - * @param key - * @param hashKey - * @param value - * @return - */ - public Boolean hPutIfAbsent(String key, String hashKey, String value) { - return redisTemplate.opsForHash().putIfAbsent(key, hashKey, value); - } - - /** - * 删除一个或多个哈希表字段 - * - * @param key - * @param fields - * @return - */ - public Long hDelete(String key, Object... fields) { - return redisTemplate.opsForHash().delete(key, fields); - } - - /** - * 查看哈希表 key 中，指定的字段是否存在 - * - * @param key - * @param field - * @return - */ - public boolean hExists(String key, String field) { - return redisTemplate.opsForHash().hasKey(key, field); - } - - /** - * 为哈希表 key 中的指定字段的整数值加上增量 increment - * - * @param key - * @param field - * @param increment - * @return - */ - public Long hIncrBy(String key, Object field, long increment) { - return redisTemplate.opsForHash().increment(key, field, increment); - } - - /** - * 为哈希表 key 中的指定字段的整数值加上增量 increment - * - * @param key - * @param field - * @param delta - * @return - */ - public Double hIncrByFloat(String key, Object field, double delta) { - return redisTemplate.opsForHash().increment(key, field, delta); - } - - /** - * 获取所有哈希表中的字段 - * - * @param key - * @return - */ - public Set hKeys(String key) { - return redisTemplate.opsForHash().keys(key); - } - - /** - * 获取哈希表中字段的数量 - * - * @param key - * @return - */ - public Long hSize(String key) { - return redisTemplate.opsForHash().size(key); - } - - /** - * 获取哈希表中所有值 - * - * @param key - * @return - */ - public List hValues(String key) { - return redisTemplate.opsForHash().values(key); - } - - /** - * 迭代哈希表中的键值对 - * - * @param key - * @param options - * @return - */ - public Cursor> hScan(String key, ScanOptions options) { - return redisTemplate.opsForHash().scan(key, options); - } - - /** ------------------------list相关操作---------------------------- */ - - /** - * 通过索引获取列表中的元素 - * - * @param key - * @param index - * @return - */ - public String lIndex(String key, long index) { - return redisTemplate.opsForList().index(key, index); - } - - /** - * 获取列表指定范围内的元素 - * - * @param key - * @param start 开始位置, 0是开始位置 - * @param end 结束位置, -1返回所有 - * @return - */ - public List lRange(String key, long start, long end) { - return redisTemplate.opsForList().range(key, start, end); - } - - /** - * 存储在list头部 - * - * @param key - * @param value - * @return - */ - public Long lLeftPush(String key, String value) { - return redisTemplate.opsForList().leftPush(key, value); - } - - /** - * @param key - * @param value - * @return - */ - public Long lLeftPushAll(String key, String... value) { - return redisTemplate.opsForList().leftPushAll(key, value); - } - - /** - * @param key - * @param value - * @return - */ - public Long lLeftPushAll(String key, Collection value) { - return redisTemplate.opsForList().leftPushAll(key, value); - } - - /** - * 当list存在的时候才加入 - * - * @param key - * @param value - * @return - */ - public Long lLeftPushIfPresent(String key, String value) { - return redisTemplate.opsForList().leftPushIfPresent(key, value); - } - - /** - * 如果pivot存在,再pivot前面添加 - * - * @param key - * @param pivot - * @param value - * @return - */ - public Long lLeftPush(String key, String pivot, String value) { - return redisTemplate.opsForList().leftPush(key, pivot, value); - } - - /** - * @param key - * @param value - * @return - */ - public Long lRightPush(String key, String value) { - return redisTemplate.opsForList().rightPush(key, value); - } - - /** - * @param key - * @param value - * @return - */ - public Long lRightPushAll(String key, String... value) { - return redisTemplate.opsForList().rightPushAll(key, value); - } - - /** - * @param key - * @param value - * @return - */ - public Long lRightPushAll(String key, Collection value) { - return redisTemplate.opsForList().rightPushAll(key, value); - } - - /** - * 为已存在的列表添加值 - * - * @param key - * @param value - * @return - */ - public Long lRightPushIfPresent(String key, String value) { - return redisTemplate.opsForList().rightPushIfPresent(key, value); - } - - /** - * 在pivot元素的右边添加值 - * - * @param key - * @param pivot - * @param value - * @return - */ - public Long lRightPush(String key, String pivot, String value) { - return redisTemplate.opsForList().rightPush(key, pivot, value); - } - - /** - * 通过索引设置列表元素的值 - * - * @param key - * @param index 位置 - * @param value - */ - public void lSet(String key, long index, String value) { - redisTemplate.opsForList().set(key, index, value); - } - - /** - * 移出并获取列表的第一个元素 - * - * @param key - * @return 删除的元素 - */ - public String lLeftPop(String key) { - return redisTemplate.opsForList().leftPop(key); - } - - /** - * 移出并获取列表的第一个元素， 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止 - * - * @param key - * @param timeout 等待时间 - * @param unit 时间单位 - * @return - */ - public String lBLeftPop(String key, long timeout, TimeUnit unit) { - return redisTemplate.opsForList().leftPop(key, timeout, unit); - } - - /** - * 移除并获取列表最后一个元素 - * - * @param key - * @return 删除的元素 - */ - public String lRightPop(String key) { - return redisTemplate.opsForList().rightPop(key); - } - - /** - * 移出并获取列表的最后一个元素， 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止 - * - * @param key - * @param timeout 等待时间 - * @param unit 时间单位 - * @return - */ - public String lBRightPop(String key, long timeout, TimeUnit unit) { - return redisTemplate.opsForList().rightPop(key, timeout, unit); - } - - /** - * 移除列表的最后一个元素，并将该元素添加到另一个列表并返回 - * - * @param sourceKey - * @param destinationKey - * @return - */ - public String lRightPopAndLeftPush(String sourceKey, String destinationKey) { - return redisTemplate.opsForList().rightPopAndLeftPush(sourceKey, - destinationKey); - } - - /** - * 从列表中弹出一个值，将弹出的元素插入到另外一个列表中并返回它； 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止 - * - * @param sourceKey - * @param destinationKey - * @param timeout - * @param unit - * @return - */ - public String lBRightPopAndLeftPush(String sourceKey, String destinationKey, - long timeout, TimeUnit unit) { - return redisTemplate.opsForList().rightPopAndLeftPush(sourceKey, - destinationKey, timeout, unit); - } - - /** - * 删除集合中值等于value得元素 - * - * @param key - * @param index index=0, 删除所有值等于value的元素; index>0, 从头部开始删除第一个值等于value的元素; - * index<0, 从尾部开始删除第一个值等于value的元素; - * @param value - * @return - */ - public Long lRemove(String key, long index, String value) { - return redisTemplate.opsForList().remove(key, index, value); - } - - /** - * 裁剪list - * - * @param key - * @param start - * @param end - */ - public void lTrim(String key, long start, long end) { - redisTemplate.opsForList().trim(key, start, end); - } - - /** - * 获取列表长度 - * - * @param key - * @return - */ - public Long lLen(String key) { - return redisTemplate.opsForList().size(key); - } - - /** --------------------set相关操作-------------------------- */ - - /** - * set添加元素 - * - * @param key - * @param values - * @return - */ - public Long sAdd(String key, String... values) { - return redisTemplate.opsForSet().add(key, values); - } - - /** - * set移除元素 - * - * @param key - * @param values - * @return - */ - public Long sRemove(String key, Object... values) { - return redisTemplate.opsForSet().remove(key, values); - } - - /** - * 移除并返回集合的一个随机元素 - * - * @param key - * @return - */ - public String sPop(String key) { - return redisTemplate.opsForSet().pop(key); - } - - /** - * 将元素value从一个集合移到另一个集合 - * - * @param key - * @param value - * @param destKey - * @return - */ - public Boolean sMove(String key, String value, String destKey) { - return redisTemplate.opsForSet().move(key, value, destKey); - } - - /** - * 获取集合的大小 - * - * @param key - * @return - */ - public Long sSize(String key) { - return redisTemplate.opsForSet().size(key); - } - - /** - * 判断集合是否包含value - * - * @param key - * @param value - * @return - */ - public Boolean sIsMember(String key, Object value) { - return redisTemplate.opsForSet().isMember(key, value); - } - - /** - * 获取两个集合的交集 - * - * @param key - * @param otherKey - * @return - */ - public Set sIntersect(String key, String otherKey) { - return redisTemplate.opsForSet().intersect(key, otherKey); - } - - /** - * 获取key集合与多个集合的交集 - * - * @param key - * @param otherKeys - * @return - */ - public Set sIntersect(String key, Collection otherKeys) { - return redisTemplate.opsForSet().intersect(key, otherKeys); - } - - /** - * key集合与otherKey集合的交集存储到destKey集合中 - * - * @param key - * @param otherKey - * @param destKey - * @return - */ - public Long sIntersectAndStore(String key, String otherKey, String destKey) { - return redisTemplate.opsForSet().intersectAndStore(key, otherKey, - destKey); - } - - /** - * key集合与多个集合的交集存储到destKey集合中 - * - * @param key - * @param otherKeys - * @param destKey - * @return - */ - public Long sIntersectAndStore(String key, Collection otherKeys, - String destKey) { - return redisTemplate.opsForSet().intersectAndStore(key, otherKeys, - destKey); - } - - /** - * 获取两个集合的并集 - * - * @param key - * @param otherKeys - * @return - */ - public Set sUnion(String key, String otherKeys) { - return redisTemplate.opsForSet().union(key, otherKeys); - } - - /** - * 获取key集合与多个集合的并集 - * - * @param key - * @param otherKeys - * @return - */ - public Set sUnion(String key, Collection otherKeys) { - return redisTemplate.opsForSet().union(key, otherKeys); - } - - /** - * key集合与otherKey集合的并集存储到destKey中 - * - * @param key - * @param otherKey - * @param destKey - * @return - */ - public Long sUnionAndStore(String key, String otherKey, String destKey) { - return redisTemplate.opsForSet().unionAndStore(key, otherKey, destKey); - } - - /** - * key集合与多个集合的并集存储到destKey中 - * - * @param key - * @param otherKeys - * @param destKey - * @return - */ - public Long sUnionAndStore(String key, Collection otherKeys, - String destKey) { - return redisTemplate.opsForSet().unionAndStore(key, otherKeys, destKey); - } - - /** - * 获取两个集合的差集 - * - * @param key - * @param otherKey - * @return - */ - public Set sDifference(String key, String otherKey) { - return redisTemplate.opsForSet().difference(key, otherKey); - } - - /** - * 获取key集合与多个集合的差集 - * - * @param key - * @param otherKeys - * @return - */ - public Set sDifference(String key, Collection otherKeys) { - return redisTemplate.opsForSet().difference(key, otherKeys); - } - - /** - * key集合与otherKey集合的差集存储到destKey中 - * - * @param key - * @param otherKey - * @param destKey - * @return - */ - public Long sDifference(String key, String otherKey, String destKey) { - return redisTemplate.opsForSet().differenceAndStore(key, otherKey, - destKey); - } - - /** - * key集合与多个集合的差集存储到destKey中 - * - * @param key - * @param otherKeys - * @param destKey - * @return - */ - public Long sDifference(String key, Collection otherKeys, - String destKey) { - return redisTemplate.opsForSet().differenceAndStore(key, otherKeys, - destKey); - } - - /** - * 获取集合所有元素 - * @param key - * @return - */ - public Set setMembers(String key) { - return redisTemplate.opsForSet().members(key); - } - - /** - * 随机获取集合中的一个元素 - * - * @param key - * @return - */ - public String sRandomMember(String key) { - return redisTemplate.opsForSet().randomMember(key); - } - - /** - * 随机获取集合中count个元素 - * - * @param key - * @param count - * @return - */ - public List sRandomMembers(String key, long count) { - return redisTemplate.opsForSet().randomMembers(key, count); - } - - /** - * 随机获取集合中count个元素并且去除重复的 - * - * @param key - * @param count - * @return - */ - public Set sDistinctRandomMembers(String key, long count) { - return redisTemplate.opsForSet().distinctRandomMembers(key, count); - } - - /** - * @param key - * @param options - * @return - */ - public Cursor sScan(String key, ScanOptions options) { - return redisTemplate.opsForSet().scan(key, options); - } - - /**------------------zSet相关操作--------------------------------*/ - - /** - * 添加元素,有序集合是按照元素的score值由小到大排列 - * - * @param key - * @param value - * @param score - * @return - */ - public Boolean zAdd(String key, String value, double score) { - return redisTemplate.opsForZSet().add(key, value, score); - } - - /** - * @param key - * @param values - * @return - */ - public Long zAdd(String key, Set> values) { - return redisTemplate.opsForZSet().add(key, values); - } - - /** - * @param key - * @param values - * @return - */ - public Long zRemove(String key, Object... values) { - return redisTemplate.opsForZSet().remove(key, values); - } - - /** - * 增加元素的score值，并返回增加后的值 - * - * @param key - * @param value - * @param delta - * @return - */ - public Double zIncrementScore(String key, String value, double delta) { - return redisTemplate.opsForZSet().incrementScore(key, value, delta); - } - - /** - * 返回元素在集合的排名,有序集合是按照元素的score值由小到大排列 - * - * @param key - * @param value - * @return 0表示第一位 - */ - public Long zRank(String key, Object value) { - return redisTemplate.opsForZSet().rank(key, value); - } - - /** - * 返回元素在集合的排名,按元素的score值由大到小排列 - * - * @param key - * @param value - * @return - */ - public Long zReverseRank(String key, Object value) { - return redisTemplate.opsForZSet().reverseRank(key, value); - } - - /** - * 获取集合的元素, 从小到大排序 - * - * @param key - * @param start 开始位置 - * @param end 结束位置, -1查询所有 - * @return - */ - public Set zRange(String key, long start, long end) { - return redisTemplate.opsForZSet().range(key, start, end); - } - - /** - * 获取集合元素, 并且把score值也获取 - * - * @param key - * @param start - * @param end - * @return - */ - public Set> zRangeWithScores(String key, long start, - long end) { - return redisTemplate.opsForZSet().rangeWithScores(key, start, end); - } - - /** - * 根据Score值查询集合元素 - * - * @param key - * @param min 最小值 - * @param max 最大值 - * @return - */ - public Set zRangeByScore(String key, double min, double max) { - return redisTemplate.opsForZSet().rangeByScore(key, min, max); - } - - /** - * 根据Score值查询集合元素, 从小到大排序 - * - * @param key - * @param min 最小值 - * @param max 最大值 - * @return - */ - public Set> zRangeByScoreWithScores(String key, - double min, double max) { - return redisTemplate.opsForZSet().rangeByScoreWithScores(key, min, max); - } - - /** - * @param key - * @param min - * @param max - * @param start - * @param end - * @return - */ - public Set> zRangeByScoreWithScores(String key, - double min, double max, long start, long end) { - return redisTemplate.opsForZSet().rangeByScoreWithScores(key, min, max, - start, end); - } - - /** - * 获取集合的元素, 从大到小排序 - * - * @param key - * @param start - * @param end - * @return - */ - public Set zReverseRange(String key, long start, long end) { - return redisTemplate.opsForZSet().reverseRange(key, start, end); - } - - /** - * 获取集合的元素, 从大到小排序, 并返回score值 - * - * @param key - * @param start - * @param end - * @return - */ - public Set> zReverseRangeWithScores(String key, - long start, long end) { - return redisTemplate.opsForZSet().reverseRangeWithScores(key, start, - end); - } - - /** - * 根据Score值查询集合元素, 从大到小排序 - * - * @param key - * @param min - * @param max - * @return - */ - public Set zReverseRangeByScore(String key, double min, - double max) { - return redisTemplate.opsForZSet().reverseRangeByScore(key, min, max); - } - - /** - * 根据Score值查询集合元素, 从大到小排序 - * - * @param key - * @param min - * @param max - * @return - */ - public Set> zReverseRangeByScoreWithScores( - String key, double min, double max) { - return redisTemplate.opsForZSet().reverseRangeByScoreWithScores(key, - min, max); - } - - /** - * @param key - * @param min - * @param max - * @param start - * @param end - * @return - */ - public Set zReverseRangeByScore(String key, double min, - double max, long start, long end) { - return redisTemplate.opsForZSet().reverseRangeByScore(key, min, max, - start, end); - } - - /** - * 根据score值获取集合元素数量 - * - * @param key - * @param min - * @param max - * @return - */ - public Long zCount(String key, double min, double max) { - return redisTemplate.opsForZSet().count(key, min, max); - } - - /** - * 获取集合大小 - * - * @param key - * @return - */ - public Long zSize(String key) { - return redisTemplate.opsForZSet().size(key); - } - - /** - * 获取集合大小 - * - * @param key - * @return - */ - public Long zZCard(String key) { - return redisTemplate.opsForZSet().zCard(key); - } - - /** - * 获取集合中value元素的score值 - * - * @param key - * @param value - * @return - */ - public Double zScore(String key, Object value) { - return redisTemplate.opsForZSet().score(key, value); - } - - /** - * 移除指定索引位置的成员 - * - * @param key - * @param start - * @param end - * @return - */ - public Long zRemoveRange(String key, long start, long end) { - return redisTemplate.opsForZSet().removeRange(key, start, end); - } - - /** - * 根据指定的score值的范围来移除成员 - * - * @param key - * @param min - * @param max - * @return - */ - public Long zRemoveRangeByScore(String key, double min, double max) { - return redisTemplate.opsForZSet().removeRangeByScore(key, min, max); - } - - /** - * 获取key和otherKey的并集并存储在destKey中 - * - * @param key - * @param otherKey - * @param destKey - * @return - */ - public Long zUnionAndStore(String key, String otherKey, String destKey) { - return redisTemplate.opsForZSet().unionAndStore(key, otherKey, destKey); - } - - /** - * @param key - * @param otherKeys - * @param destKey - * @return - */ - public Long zUnionAndStore(String key, Collection otherKeys, - String destKey) { - return redisTemplate.opsForZSet() - .unionAndStore(key, otherKeys, destKey); - } - - /** - * 交集 - * - * @param key - * @param otherKey - * @param destKey - * @return - */ - public Long zIntersectAndStore(String key, String otherKey, - String destKey) { - return redisTemplate.opsForZSet().intersectAndStore(key, otherKey, - destKey); - } - - /** - * 交集 - * - * @param key - * @param otherKeys - * @param destKey - * @return - */ - public Long zIntersectAndStore(String key, Collection otherKeys, - String destKey) { - return redisTemplate.opsForZSet().intersectAndStore(key, otherKeys, - destKey); - } - - /** - * @param key - * @param options - * @return - */ - public Cursor> zScan(String key, ScanOptions options) { - return redisTemplate.opsForZSet().scan(key, options); - } -} diff --git a/src/main/java/com/markerhub/util/SmsCodeUtil.java b/src/main/java/com/markerhub/util/SmsCodeUtil.java deleted file mode 100644 index 54897560a953463054ac92ce2aac3e98485b5738..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/util/SmsCodeUtil.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.markerhub.util; - -import cn.hutool.core.util.RandomUtil; -import com.markerhub.config.SmsLengthEnum; - -/** - * @Author by MaXiaofeng - * @Description 腾讯云短信服务工具类 - * @Date 2022/2/13 16:35 - * @Version 1.0.0 - */ - -public class SmsCodeUtil { - /** - * 随机生成指定长度的短信的验证码 - * - * @param smsLengthEnum 短信验证码长度枚举 - * @return 随机验证码 - * @author RenShiWei - * Date: 2020/9/16 10:53 - */ - public static String createSmsRandomCode(SmsLengthEnum smsLengthEnum) { - return RandomUtil.randomNumbers(smsLengthEnum.getLength()); - } - - /** - * 创建短信验证码，缓存键策略 - * 策略：前缀_业务名_手机号 - * - * @param prefix 前缀 - * @param phone 手机号 - * @param businessStr 业务名 - * @return 短信验证码，缓存键策略 - * @author RenShiWei - * Date: 2020/9/16 10:53 - */ - public static String createSmsCacheKey(String prefix, String phone, String businessStr) { - return prefix + "_" + businessStr + "_" + phone; - } -} diff --git a/src/main/java/com/markerhub/util/SmsUtil.java b/src/main/java/com/markerhub/util/SmsUtil.java deleted file mode 100644 index 3286cf38b7331dff4eaba07773914aae8a091b57..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/util/SmsUtil.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.markerhub.util; - -import com.markerhub.config.SmsConfig; -import com.markerhub.exception.apiException.smsException.MessageSendException; -import com.tencentcloudapi.common.Credential; -import com.tencentcloudapi.common.exception.TencentCloudSDKException; -import com.tencentcloudapi.sms.v20190711.SmsClient; -import com.tencentcloudapi.sms.v20190711.models.SendSmsRequest; -import com.tencentcloudapi.sms.v20190711.models.SendSmsResponse; -import com.tencentcloudapi.sms.v20190711.models.SendStatus; - -/** - * @Author by MaXiaofeng - * @Description SmsUtil 短信工具类:发送短信封装起来，方便后续更好的进行扩展。 - * @Date 2022/2/13 16:36 - * @Version 1.0.0 - */ - -public class SmsUtil { - /** - * 腾讯云发送短信的基础服务 - * - * @param smsConfig 腾讯云短信服务配置 - * @param templateId 腾讯云短信模板id - * @param templateParams 腾讯云模板需要的参数 - * @param phoneNumbers 手机号集合 - * @return 发送短信后的状态的set集合 - */ - public static SendStatus[] sendSms(SmsConfig smsConfig, String templateId, String[] templateParams, - String[] phoneNumbers) { - /* - 实例化一个认证对象，入参需要传入腾讯云账户密钥对 secretId 和 secretKey - CAM 密钥查询：https://console.cloud.tencent.com/cam/capi - */ - Credential cred = new Credential(smsConfig.getSecretId(), smsConfig.getSecretKey()); - /* - 实例化要请求产品(以sms为例)的client对象 - 第二个参数是地域信息，可以直接填写字符串ap-guangzhou，或者引用预设的常量 - */ - SmsClient client = new SmsClient(cred, ""); - /* - 实例化一个请求对象，根据调用的接口和实际情况，可以进一步设置请求参数 - */ - SendSmsRequest req = new SendSmsRequest(); - //短信应用ID: 短信appId在 [短信控制台] 添加应用后生成的实际SdkAppid，示例如1400006666 - req.setSmsSdkAppid(smsConfig.getAppId()); - //短信签名内容: 使用 UTF-8 编码，必须填写已审核通过的签名，签名信息可登录 [短信控制台] 查看 - req.setSign(smsConfig.getSmsSign()); - //模板 ID: 必须填写已审核通过的模板 ID。模板ID可登录 [短信控制台] 查看 - req.setTemplateID(templateId); - //下发手机号码，采用 e.164 标准，+[国家或地区码][手机号] 示例如：+8613711112222， 其中前面有一个+号 ，86为国家码，13711112222为手机号，最多不要超过200个手机号 - req.setPhoneNumberSet(phoneNumbers); - //模板参数: 若无模板参数，则设置为空 - req.setTemplateParamSet(templateParams); - - /* 通过 client 对象调用 SendSms 方法发起请求。注意请求方法名与请求对象是对应的 - 返回的 res 是一个 SendSmsResponse 类的实例，与请求对象对应 - */ - SendSmsResponse res = null; - - //发送短信 - try { - res = client.SendSms(req); - } catch (TencentCloudSDKException e) { - e.printStackTrace(); - } - return res.getSendStatusSet(); - - } -} diff --git a/src/main/java/com/markerhub/vo/WXAuth.java b/src/main/java/com/markerhub/vo/WXAuth.java deleted file mode 100644 index 7cee6112c78582b818d6157d01e986eab97ab7af..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/vo/WXAuth.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.markerhub.vo; - -import lombok.Data; - -/** - * @Author by MaXiaofeng - * @Description TODO - * @Date 2022/2/9 15:34 - * @Version 1.0.0 - */ -@Data -public class WXAuth { - private String encryptedData; - private String iv; - private String sessionId; - -} diff --git a/src/main/java/com/markerhub/vo/WxUserInfo.java b/src/main/java/com/markerhub/vo/WxUserInfo.java deleted file mode 100644 index d72fb76f3a215637daa904d7e35640face7c858f..0000000000000000000000000000000000000000 --- a/src/main/java/com/markerhub/vo/WxUserInfo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.markerhub.vo; - -import lombok.Data; - -/** - * @Author by MaXiaofeng - * @Description 微信用户登录的信息 - * @Date 2022/2/9 16:03 - * @Version 1.0.0 - */ -@Data -public class WxUserInfo { - private String openId; - private String nickName; - private String gender; - private String city; - private String province; - private String country; - private String avatarUrl; - private String unionId; -} diff --git a/src/main/resources/META-INF/spring-devtools.properties b/src/main/resources/META-INF/spring-devtools.properties deleted file mode 100644 index 3e276582283d570699e12711c628d8d160faae61..0000000000000000000000000000000000000000 --- a/src/main/resources/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.shiro-redis=/shiro-[\\w-\\.]+jar diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml deleted file mode 100644 index 5f25f59abc034812f3dcd8e3d7a9e75e162db6cf..0000000000000000000000000000000000000000 --- a/src/main/resources/application.yml +++ /dev/null @@ -1,62 +0,0 @@ -#DataSource Config -spring: - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - username: root - password: 123456 - url: jdbc:mysql://8.136.81.47:3306/takeoutark?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai - #redis配置 - redis: - port: 6379 #连接端口 - host: 127.0.0.1 #连接主机 - database: 5 - lettuce: - pool: - max-active: 50 #连接池最大存活连接数 - max-wait: 5ms #客户端获取链接最大等待时间 - max-idle: 20 #最大空闲连接数 - min-idle: 2 #最小空闲连接数 - timeout: 5000 - -mybatis-plus: - mapper-locations: classpath*:/mapper/**Mapper.xml -server: - port: 8081 -#shiro-redis: -# enabled: true -# redis-manager: -# host: 127.0.0.1:6379 -markerhub: - jwt: - # ???? - secret: f4e2e52034348f86b67cde581c0f9eb5 - # token???? ???? - expire: 604800 - header: Authorization - -wxmini: - appid: wxfa6eb206635e4d92 - secret: 570488294950a89f427cb72eede89887 - - -# 腾讯云短信服务配置 -sms-config: - # 腾讯云账户密钥对 secretId 和 secretKey - secretId: AKIDFKAk35rNdcLmxrYz92g38uPedHfogHac - secretKey: nJYVDenfHcgU1II1SdX9UaPxEExPaU8V - # 短信应用appId和appKey - appId: 1400631324 - appKey: de7a07a4e4567bbde4b4e4dda7074f1c - # 签名 - smsSign: 村事宝 - # 过期时间 - expireTime: 10 # 10min - # redis存储前缀 - phonePrefix: pinganky_sms - # 模板id - templateIds: - code: 439183 - - - - diff --git a/src/main/resources/mapper/BlogMapper.xml b/src/main/resources/mapper/BlogMapper.xml deleted file mode 100644 index 4b610b7762d3a1c7b705c64be2d5cfb2eaaee512..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/BlogMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml deleted file mode 100644 index 8df9f9b3929d860192618afe5f0206f838d0996e..0000000000000000000000000000000000000000 --- a/src/main/resources/mapper/UserMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/third-party/pom.xml b/third-party/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..c6272316f2da26845efac72a101f44978c74bf87 --- /dev/null +++ b/third-party/pom.xml @@ -0,0 +1,90 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.1.8.RELEASE + + + cn.edu.zjut.baoge + third-party + 0.0.1-SNAPSHOT + third-party + 整合第三方服务 + + 1.8 + Greenwich.SR3 + + + + com.alibaba.cloud + spring-cloud-starter-alicloud-oss + + + + + + + + + cn.edu.zjut.baoge + Baoge-common + 1.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-webflux + + + org.springframework.cloud + spring-cloud-starter-gateway + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.springframework.boot + spring-boot-starter-test + test + + + io.projectreactor + reactor-test + test + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + 2.1.0.RELEASE + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/com/markerhub/SpringBootVueTest01Application.java b/third-party/src/main/java/cn/edu/zjut/baoge/thirdparty/ThirdPartyApplication.java similarity index 36% rename from src/main/java/com/markerhub/SpringBootVueTest01Application.java rename to third-party/src/main/java/cn/edu/zjut/baoge/thirdparty/ThirdPartyApplication.java index 263a6fec5f0743b8bb17c0b46136527401c74ade..d1a30402bae550a7eb5b2dbfc270408608146db3 100644 --- a/src/main/java/com/markerhub/SpringBootVueTest01Application.java +++ b/third-party/src/main/java/cn/edu/zjut/baoge/thirdparty/ThirdPartyApplication.java @@ -1,13 +1,16 @@ -package com.markerhub; +package cn.edu.zjut.baoge.thirdparty; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +@EnableDiscoveryClient @SpringBootApplication -public class SpringBootVueTest01Application { - +public class ThirdPartyApplication { public static void main(String[] args) { - SpringApplication.run(SpringBootVueTest01Application.class, args); + SpringApplication.run(ThirdPartyApplication.class, args); + System.out.println("ThirdPartyApplication Go!"); } } diff --git a/third-party/src/main/java/cn/edu/zjut/baoge/thirdparty/controller/OssController.java b/third-party/src/main/java/cn/edu/zjut/baoge/thirdparty/controller/OssController.java new file mode 100644 index 0000000000000000000000000000000000000000..331e5571871c71ae899bd0087af68da461df4ea7 --- /dev/null +++ b/third-party/src/main/java/cn/edu/zjut/baoge/thirdparty/controller/OssController.java @@ -0,0 +1,97 @@ +package cn.edu.zjut.baoge.thirdparty.controller; + +import cn.edu.zjut.baoge.lang.ResultBean; +import com.aliyun.oss.OSS; +import com.aliyun.oss.common.utils.BinaryUtil; +import com.aliyun.oss.model.MatchMode; +import com.aliyun.oss.model.PolicyConditions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.context.annotation.ScopedProxyMode; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.Map; +@RefreshScope(proxyMode = ScopedProxyMode.DEFAULT)//动态刷新获取配置中心的值 +@RestController +public class OssController { + + @Autowired + OSS ossClient; + + @Value("${spring.cloud.alicloud.oss.endpoint}") + private String endpoint; + @Value("${spring.cloud.alicloud.oss.bucket}") + private String bucket; + + @Value("${spring.cloud.alicloud.access-key}") + private String accessId; + +// @Deprecated +// public OSS OSSClient(){ +// +// } + + /** + * 阿里云OSS服务,配合前端Vue上传组件使用,获取上传到阿里云OSS存储桶的数据,格式如下 + * { + * "msg": "success", + * "code": 0, + * "data": { + * "accessid": "LTAI5tBEFj179n8Ksf7dvRgz", + * "policy": "eyJleHBpcmF0aW9uIjoiMjAyMi0wMi0xNVQxMjoxMzozMi4wNzFaIiwiY29uZGl0aW9ucyI6W1siY29udGVudC1sZW5ndGgtcmFuZ2UiLDAsMTA0ODU3NjAwMF0sWyJzdGFydHMtd2l0aCIsIiRrZXkiLCIyMDIyLTAyLTE1LyJdXX0=", + * "signature": "pYRbw3zLuk/ipqj0iX8HdZg+Xrk=", + * "dir": "2022-02-15/", + * "host": "https://zjut-baoge.https://oss-cn-hangzhou.aliyuncs.com", + * "expire": "1644927212" + * } + * } + * @author zk + * @date 2022/2/15 17:31 + * @return cn.edu.zjut.baoge.lang.R + */ + @GetMapping("/oss/policy") + public ResultBean policy() { + + String host = "https://" + bucket + "." + endpoint; // host的格式为 bucketname.endpoint + // callbackUrl为 上传回调服务器的URL，请将下面的IP和Port配置为您自己的真实信息。 + String format = new SimpleDateFormat("yyyy-MM-dd").format(new Date()); + String dir = format + "/"; // 用户上传文件时指定的前缀。 + + Map respMap = null; + try { + long expireTime = 30; + long expireEndTime = System.currentTimeMillis() + expireTime * 1000; + Date expiration = new Date(expireEndTime); + PolicyConditions policyConds = new PolicyConditions(); + policyConds.addConditionItem(PolicyConditions.COND_CONTENT_LENGTH_RANGE, 0, 1048576000); + policyConds.addConditionItem(MatchMode.StartWith, PolicyConditions.COND_KEY, dir); + + String postPolicy = ossClient.generatePostPolicy(expiration, policyConds); + byte[] binaryData = postPolicy.getBytes("utf-8"); + String encodedPolicy = BinaryUtil.toBase64String(binaryData); + String postSignature = ossClient.calculatePostSignature(postPolicy); + + respMap = new LinkedHashMap(); + respMap.put("accessid", accessId); + respMap.put("policy", encodedPolicy); + respMap.put("signature", postSignature); + respMap.put("dir", dir); + respMap.put("host", host); + respMap.put("expire", String.valueOf(expireEndTime / 1000)); + // respMap.put("expire", formatISO8601Date(expiration)); + + + } catch (Exception e) { + // Assert.fail(e.getMessage()); + System.out.println(e.getMessage()); + } + + return ResultBean.ok().put("data",respMap); + } +} diff --git a/third-party/src/main/resources/bootstrap-dev.yml b/third-party/src/main/resources/bootstrap-dev.yml new file mode 100644 index 0000000000000000000000000000000000000000..1a2f4bf178ea01b4a3247b77cc9df245579c749f --- /dev/null +++ b/third-party/src/main/resources/bootstrap-dev.yml @@ -0,0 +1,15 @@ +spring: + cloud: + nacos: + discovery: + server-addr: 118.31.71.148:8848 + config: + server-addr: 118.31.71.148:8848 + file-extension: yaml +#alibaba: +# cloud: +# access-key: LTAI5tBEFj179n8Ksf7dvRgz +# secret-key: G9ZhFaeGgG3y3n95YkEkxKdKyYkyPE +# oss: +# endpoint: https://oss-cn-hangzhou.aliyuncs.com +# bucket: zjut-baoge diff --git a/third-party/src/main/resources/bootstrap.properties b/third-party/src/main/resources/bootstrap.properties new file mode 100644 index 0000000000000000000000000000000000000000..ad4816e5251fb8ab20a7a1dc3bdb3d8fa8a17813 --- /dev/null +++ b/third-party/src/main/resources/bootstrap.properties @@ -0,0 +1,13 @@ +#spring.application.name=baoge-third-party +# +#spring.cloud.nacos.config.file-extension=yml +#spring.cloud.nacos.config.server-addr=118.31.71.148:8848 +#spring.cloud.nacos.config.namespace=third-party +#spring.cloud.nacos.config.group=BaoGe +# +# +#spring.cloud.nacos.config.extension-configs[0].data-id=oss.yml +#spring.cloud.nacos.config.extension-configs[0].group=BaoGe +#spring.cloud.nacos.config.extension-configs[0].refresh=true + + diff --git a/third-party/src/main/resources/bootstrap.yml b/third-party/src/main/resources/bootstrap.yml new file mode 100644 index 0000000000000000000000000000000000000000..ebc14a64bc14a5afcff195d68d7308ff09ee93fe --- /dev/null +++ b/third-party/src/main/resources/bootstrap.yml @@ -0,0 +1,16 @@ +spring: + profiles: + active: dev + application: + name: baoge-third-party + cloud: + nacos: + config: + file-extension: yaml + server-addr: 118.31.71.148:8848 + namespace: third-party + group: BaoGe +# extension-configs[0]: +# data-id: oss.yml +# group: BaoGe +# refresh: true diff --git a/third-party/src/test/java/cn/edu/zjut/baoge/thirdparty/ThirdPartyApplicationTests.java b/third-party/src/test/java/cn/edu/zjut/baoge/thirdparty/ThirdPartyApplicationTests.java new file mode 100644 index 0000000000000000000000000000000000000000..59e594a5e56c9a9a7833395b417a737280c61e4a --- /dev/null +++ b/third-party/src/test/java/cn/edu/zjut/baoge/thirdparty/ThirdPartyApplicationTests.java @@ -0,0 +1,17 @@ +package cn.edu.zjut.baoge.thirdparty; + + + + + +import org.junit.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class ThirdPartyApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/third-party/third-party.iml b/third-party/third-party.iml new file mode 100644 index 0000000000000000000000000000000000000000..c9f755f4f0099abe49c133a0d130719fa17a0952 --- /dev/null +++ b/third-party/third-party.iml @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file