diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 35186c6..50e555a 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -2,10 +2,13 @@ + + + \ 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 index b8d93d8..8b76492 100644 --- a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__bouncycastle_bcmail_jdk14_138.xml b/.idea/libraries/Maven__bouncycastle_bcmail_jdk14_138.xml index 0c65f5d..e5cf3d0 100644 --- a/.idea/libraries/Maven__bouncycastle_bcmail_jdk14_138.xml +++ b/.idea/libraries/Maven__bouncycastle_bcmail_jdk14_138.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__bouncycastle_bcprov_jdk14_138.xml b/.idea/libraries/Maven__bouncycastle_bcprov_jdk14_138.xml index 5197ed3..2efd82f 100644 --- a/.idea/libraries/Maven__bouncycastle_bcprov_jdk14_138.xml +++ b/.idea/libraries/Maven__bouncycastle_bcprov_jdk14_138.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_9.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_9.xml index b1becf5..32c230f 100644 --- a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_9.xml +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_9.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_9.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_9.xml index 3d568ca..fba65b6 100644 --- a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_9.xml +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_9.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__cn_hutool_hutool_core_5_3_8.xml b/.idea/libraries/Maven__cn_hutool_hutool_core_5_3_8.xml index c55670e..1d18927 100644 --- a/.idea/libraries/Maven__cn_hutool_hutool_core_5_3_8.xml +++ b/.idea/libraries/Maven__cn_hutool_hutool_core_5_3_8.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__cn_hutool_hutool_crypto_5_3_8.xml b/.idea/libraries/Maven__cn_hutool_hutool_crypto_5_3_8.xml index 339e72d..551bbe0 100644 --- a/.idea/libraries/Maven__cn_hutool_hutool_crypto_5_3_8.xml +++ b/.idea/libraries/Maven__cn_hutool_hutool_crypto_5_3_8.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_druid_1_1_22.xml b/.idea/libraries/Maven__com_alibaba_druid_1_1_22.xml index c307055..c905516 100644 --- a/.idea/libraries/Maven__com_alibaba_druid_1_1_22.xml +++ b/.idea/libraries/Maven__com_alibaba_druid_1_1_22.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_22.xml b/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_22.xml index cdd7ae4..d9ac9d2 100644 --- a/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_22.xml +++ b/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_22.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_78.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_78.xml index 2d20cad..4d0da7c 100644 --- a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_78.xml +++ b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_78.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_3_1_0.xml b/.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_3_1_0.xml index 5bec076..d30981b 100644 --- a/.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_3_1_0.xml +++ b/.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_3_1_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_4_11_33_ALL.xml b/.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_4_11_33_ALL.xml index a2920da..76f5c62 100644 --- a/.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_4_11_33_ALL.xml +++ b/.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_4_11_33_ALL.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_4_5_10.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_4_5_10.xml index 8cb1f9d..d93f778 100644 --- a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_4_5_10.xml +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_4_5_10.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_4_5_3.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_4_5_3.xml index c47cf65..54cf85d 100644 --- a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_4_5_3.xml +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_4_5_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_2_1_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_2_1_0.xml index 5d21f60..372aa62 100644 --- a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_2_1_0.xml +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_dysmsapi_2_1_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_kms_2_11_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_kms_2_11_0.xml index cfea65b..89b7373 100644 --- a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_kms_2_11_0.xml +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_kms_2_11_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_ram_3_1_0.xml b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_ram_3_1_0.xml index d6db80e..0bbac04 100644 --- a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_ram_3_1_0.xml +++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_ram_3_1_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_3_11_2.xml b/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_3_11_2.xml index cf12e95..398006f 100644 --- a/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_3_11_2.xml +++ b/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_3_11_2.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index 05df42f..d6eb6c4 100644 --- a/.idea/libraries/Maven__com_auth0_java_jwt_3_11_0.xml +++ b/.idea/libraries/Maven__com_auth0_java_jwt_3_11_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_dynamic_datasource_spring_boot_starter_3_2_0.xml b/.idea/libraries/Maven__com_baomidou_dynamic_datasource_spring_boot_starter_3_2_0.xml index d3e507e..fa534ed 100644 --- a/.idea/libraries/Maven__com_baomidou_dynamic_datasource_spring_boot_starter_3_2_0.xml +++ b/.idea/libraries/Maven__com_baomidou_dynamic_datasource_spring_boot_starter_3_2_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_5_1.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_5_1.xml index a37e6c4..997cfae 100644 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_5_1.xml +++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_5_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_5_1.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_5_1.xml index 7af4d5a..9b5a3e5 100644 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_5_1.xml +++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_5_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_5_1.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_5_1.xml index 90a6388..9f3dedb 100644 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_5_1.xml +++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_5_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_5_1.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_5_1.xml index be2490d..b208d01 100644 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_5_1.xml +++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_5_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_5_1.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_5_1.xml index bafd2b7..e62eaa5 100644 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_5_1.xml +++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_5_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_beust_jcommander_1_72.xml b/.idea/libraries/Maven__com_beust_jcommander_1_72.xml index ad12dd9..c11944a 100644 --- a/.idea/libraries/Maven__com_beust_jcommander_1_72.xml +++ b/.idea/libraries/Maven__com_beust_jcommander_1_72.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_thirdparty_simple_xml_safe_2_7_1.xml b/.idea/libraries/Maven__com_carrotsearch_thirdparty_simple_xml_safe_2_7_1.xml index a918945..955161d 100644 --- a/.idea/libraries/Maven__com_carrotsearch_thirdparty_simple_xml_safe_2_7_1.xml +++ b/.idea/libraries/Maven__com_carrotsearch_thirdparty_simple_xml_safe_2_7_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml index bc7d7fd..c0f1a28 100644 --- a/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_2.xml index 46a2dcc..47c434a 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_2.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_2.xml index aadfdc1..0e63205 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_2.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_2_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_2_2.xml index 42fc1e4..794fdd6 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_2_2.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_2_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_13_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_13_2.xml index ca7d180..fd86365 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_13_2.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_13_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_2.xml index 803846e..14e5c35 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_2.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_2.xml index c5f1f55..c364412 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_2.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_kotlin_2_13_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_kotlin_2_13_2.xml index 97c8b28..223a9db 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_kotlin_2_13_2.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_kotlin_2_13_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_2.xml index 9a59f11..56253dd 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_2.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_binarywang_qrcode_utils_1_1.xml b/.idea/libraries/Maven__com_github_binarywang_qrcode_utils_1_1.xml index 8e92a7e..9a1af23 100644 --- a/.idea/libraries/Maven__com_github_binarywang_qrcode_utils_1_1.xml +++ b/.idea/libraries/Maven__com_github_binarywang_qrcode_utils_1_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_binarywang_weixin_java_common_3_5_0.xml b/.idea/libraries/Maven__com_github_binarywang_weixin_java_common_3_5_0.xml index 591ce5d..ef3b238 100644 --- a/.idea/libraries/Maven__com_github_binarywang_weixin_java_common_3_5_0.xml +++ b/.idea/libraries/Maven__com_github_binarywang_weixin_java_common_3_5_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_binarywang_weixin_java_miniapp_3_5_0.xml b/.idea/libraries/Maven__com_github_binarywang_weixin_java_miniapp_3_5_0.xml index d2b5a97..7d51c59 100644 --- a/.idea/libraries/Maven__com_github_binarywang_weixin_java_miniapp_3_5_0.xml +++ b/.idea/libraries/Maven__com_github_binarywang_weixin_java_miniapp_3_5_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_binarywang_weixin_java_mp_3_5_0.xml b/.idea/libraries/Maven__com_github_binarywang_weixin_java_mp_3_5_0.xml index e5ad341..62b26b9 100644 --- a/.idea/libraries/Maven__com_github_binarywang_weixin_java_mp_3_5_0.xml +++ b/.idea/libraries/Maven__com_github_binarywang_weixin_java_mp_3_5_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_binarywang_weixin_java_pay_3_5_0.xml b/.idea/libraries/Maven__com_github_binarywang_weixin_java_pay_3_5_0.xml index 6f42ff8..afa5fc5 100644 --- a/.idea/libraries/Maven__com_github_binarywang_weixin_java_pay_3_5_0.xml +++ b/.idea/libraries/Maven__com_github_binarywang_weixin_java_pay_3_5_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_jai_imageio_jai_imageio_core_1_3_1.xml b/.idea/libraries/Maven__com_github_jai_imageio_jai_imageio_core_1_3_1.xml index 1e6ec30..4d93137 100644 --- a/.idea/libraries/Maven__com_github_jai_imageio_jai_imageio_core_1_3_1.xml +++ b/.idea/libraries/Maven__com_github_jai_imageio_jai_imageio_core_1_3_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_3.xml b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_3.xml index a9bdb47..1bc37a7 100644 --- a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_3.xml +++ b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_liyiorg_weixin_popular_2_8_17.xml b/.idea/libraries/Maven__com_github_liyiorg_weixin_popular_2_8_17.xml index 77ce19d..09f02e9 100644 --- a/.idea/libraries/Maven__com_github_liyiorg_weixin_popular_2_8_17.xml +++ b/.idea/libraries/Maven__com_github_liyiorg_weixin_popular_2_8_17.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml b/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml index d156c18..1a7c603 100644 --- a/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml +++ b/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_annotations_3_0_3.xml b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_annotations_3_0_3.xml index 9240687..3da1e30 100644 --- a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_annotations_3_0_3.xml +++ b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_annotations_3_0_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_core_3_0_3.xml b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_core_3_0_3.xml index aed4bed..f3d59d3 100644 --- a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_core_3_0_3.xml +++ b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_core_3_0_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_3_0_3.xml b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_3_0_3.xml index 9e7f591..c3ab025 100644 --- a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_3_0_3.xml +++ b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_3_0_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_autoconfigure_3_0_3.xml b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_autoconfigure_3_0_3.xml index c20ce79..2723ece 100644 --- a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_autoconfigure_3_0_3.xml +++ b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_autoconfigure_3_0_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_starter_3_0_3.xml b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_starter_3_0_3.xml index e2fd4df..1788af0 100644 --- a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_starter_3_0_3.xml +++ b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_starter_3_0_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_ui_3_0_3.xml b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_ui_3_0_3.xml index 0de6b4e..e6370cd 100644 --- a/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_ui_3_0_3.xml +++ b/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_ui_3_0_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml index 1c380d0..02ef94a 100644 --- a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml +++ b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index d376a88..abe905d 100644 --- 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 @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_3_4.xml b/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_3_4.xml index 848cecd..5596c69 100644 --- a/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_3_4.xml +++ b/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_3_4.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml b/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml index 36e948e..b981592 100644 --- a/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml +++ b/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_29_0_jre.xml b/.idea/libraries/Maven__com_google_guava_guava_29_0_jre.xml index f349d63..43e4169 100644 --- a/.idea/libraries/Maven__com_google_guava_guava_29_0_jre.xml +++ b/.idea/libraries/Maven__com_google_guava_guava_29_0_jre.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml b/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml index 4e15702..c9b46be 100644 --- a/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml +++ b/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml b/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml index bacaa45..4312aa9 100644 --- a/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml +++ b/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_zxing_core_3_2_1.xml b/.idea/libraries/Maven__com_google_zxing_core_3_2_1.xml index 2a53554..7632dcf 100644 --- a/.idea/libraries/Maven__com_google_zxing_core_3_2_1.xml +++ b/.idea/libraries/Maven__com_google_zxing_core_3_2_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_zxing_core_3_3_1.xml b/.idea/libraries/Maven__com_google_zxing_core_3_3_1.xml index 878fca2..88a3207 100644 --- a/.idea/libraries/Maven__com_google_zxing_core_3_3_1.xml +++ b/.idea/libraries/Maven__com_google_zxing_core_3_3_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_zxing_javase_3_3_1.xml b/.idea/libraries/Maven__com_google_zxing_javase_3_3_1.xml index 56a4844..dbde5d4 100644 --- a/.idea/libraries/Maven__com_google_zxing_javase_3_3_1.xml +++ b/.idea/libraries/Maven__com_google_zxing_javase_3_3_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_aviator_aviator_5_2_6.xml b/.idea/libraries/Maven__com_googlecode_aviator_aviator_5_2_6.xml index 02011c6..dc5ad47 100644 --- a/.idea/libraries/Maven__com_googlecode_aviator_aviator_5_2_6.xml +++ b/.idea/libraries/Maven__com_googlecode_aviator_aviator_5_2_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_itextpdf_forms_7_1_2.xml b/.idea/libraries/Maven__com_itextpdf_forms_7_1_2.xml index fd5e28f..ade4375 100644 --- a/.idea/libraries/Maven__com_itextpdf_forms_7_1_2.xml +++ b/.idea/libraries/Maven__com_itextpdf_forms_7_1_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_itextpdf_io_7_1_2.xml b/.idea/libraries/Maven__com_itextpdf_io_7_1_2.xml index 1726920..aa8f99b 100644 --- a/.idea/libraries/Maven__com_itextpdf_io_7_1_2.xml +++ b/.idea/libraries/Maven__com_itextpdf_io_7_1_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_itextpdf_kernel_7_1_2.xml b/.idea/libraries/Maven__com_itextpdf_kernel_7_1_2.xml index 8d448d1..b54fba9 100644 --- a/.idea/libraries/Maven__com_itextpdf_kernel_7_1_2.xml +++ b/.idea/libraries/Maven__com_itextpdf_kernel_7_1_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_itextpdf_layout_7_1_2.xml b/.idea/libraries/Maven__com_itextpdf_layout_7_1_2.xml index 291e1ef..ccb3a5a 100644 --- a/.idea/libraries/Maven__com_itextpdf_layout_7_1_2.xml +++ b/.idea/libraries/Maven__com_itextpdf_layout_7_1_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_itextpdf_pdfa_7_1_2.xml b/.idea/libraries/Maven__com_itextpdf_pdfa_7_1_2.xml index 1ad6737..4fd1cb9 100644 --- a/.idea/libraries/Maven__com_itextpdf_pdfa_7_1_2.xml +++ b/.idea/libraries/Maven__com_itextpdf_pdfa_7_1_2.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index 3056db8..a850bd0 100644 --- 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 @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_lowagie_itext_2_1_7.xml b/.idea/libraries/Maven__com_lowagie_itext_2_1_7.xml index ae673ea..5bc5f89 100644 --- a/.idea/libraries/Maven__com_lowagie_itext_2_1_7.xml +++ b/.idea/libraries/Maven__com_lowagie_itext_2_1_7.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_lowagie_itext_rtf_2_1_7.xml b/.idea/libraries/Maven__com_lowagie_itext_rtf_2_1_7.xml index 89803ee..2712965 100644 --- a/.idea/libraries/Maven__com_lowagie_itext_rtf_2_1_7.xml +++ b/.idea/libraries/Maven__com_lowagie_itext_rtf_2_1_7.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_15.xml b/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_15.xml index 925ebab..a1281d8 100644 --- a/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_15.xml +++ b/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_15.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_microsoft_sqlserver_sqljdbc4_4_0.xml b/.idea/libraries/Maven__com_microsoft_sqlserver_sqljdbc4_4_0.xml index 10823cd..5856caf 100644 --- a/.idea/libraries/Maven__com_microsoft_sqlserver_sqljdbc4_4_0.xml +++ b/.idea/libraries/Maven__com_microsoft_sqlserver_sqljdbc4_4_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_2_0_3.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_2_0_3.xml index a955ebd..07f622b 100644 --- a/.idea/libraries/Maven__com_oracle_ojdbc6_11_2_0_3.xml +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_2_0_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_4_4_1.xml b/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_4_4_1.xml index c575f90..9de09e9 100644 --- a/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_4_4_1.xml +++ b/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_4_4_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_squareup_okio_okio_2_4_3.xml b/.idea/libraries/Maven__com_squareup_okio_okio_2_4_3.xml index 8b115b4..33445a9 100644 --- a/.idea/libraries/Maven__com_squareup_okio_okio_2_4_3.xml +++ b/.idea/libraries/Maven__com_squareup_okio_okio_2_4_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml b/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml index fea99f0..5724d03 100644 --- 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 @@ -1,13 +1,13 @@ - + - + - + \ 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 index 9f0fc05..c61db7b 100644 --- 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 @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_mail_jakarta_mail_1_6_7.xml b/.idea/libraries/Maven__com_sun_mail_jakarta_mail_1_6_7.xml index dd2b707..73b76f9 100644 --- a/.idea/libraries/Maven__com_sun_mail_jakarta_mail_1_6_7.xml +++ b/.idea/libraries/Maven__com_sun_mail_jakarta_mail_1_6_7.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_1_12.xml b/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_1_12.xml index fca2bf0..3a147fe 100644 --- a/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_1_12.xml +++ b/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_1_12.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_11.xml b/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_11.xml index ccf8abb..db10c24 100644 --- a/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_11.xml +++ b/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_11.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml index b8581a6..6b31179 100644 --- 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 @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vdurmont_emoji_java_3_1_3.xml b/.idea/libraries/Maven__com_vdurmont_emoji_java_3_1_3.xml index f50e5cd..b8f6868 100644 --- a/.idea/libraries/Maven__com_vdurmont_emoji_java_3_1_3.xml +++ b/.idea/libraries/Maven__com_vdurmont_emoji_java_3_1_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_xkcoding_http_simple_http_1_0_2.xml b/.idea/libraries/Maven__com_xkcoding_http_simple_http_1_0_2.xml index 4b8b6e7..b07860d 100644 --- a/.idea/libraries/Maven__com_xkcoding_http_simple_http_1_0_2.xml +++ b/.idea/libraries/Maven__com_xkcoding_http_simple_http_1_0_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_xkcoding_justauth_justauth_spring_boot_starter_1_3_4.xml b/.idea/libraries/Maven__com_xkcoding_justauth_justauth_spring_boot_starter_1_3_4.xml index f9b22d1..a199ca1 100644 --- a/.idea/libraries/Maven__com_xkcoding_justauth_justauth_spring_boot_starter_1_3_4.xml +++ b/.idea/libraries/Maven__com_xkcoding_justauth_justauth_spring_boot_starter_1_3_4.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index 9314c36..31c4e88 100644 --- a/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml +++ b/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml b/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml index 6ce4aae..76ff309 100644 --- a/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml +++ b/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml index 84eb115..bc5ba5a 100644 --- a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index c88c2b7..e75e033 100644 --- a/.idea/libraries/Maven__commons_codec_commons_codec_1_15.xml +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_15.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml index 3caee7e..e8740cb 100644 --- a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml index 13afda2..c89cce8 100644 --- a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml index 3b9dcc0..1577323 100644 --- a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_5.xml b/.idea/libraries/Maven__commons_io_commons_io_2_5.xml index 67c2ad2..b479808 100644 --- a/.idea/libraries/Maven__commons_io_commons_io_2_5.xml +++ b/.idea/libraries/Maven__commons_io_commons_io_2_5.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_6.xml b/.idea/libraries/Maven__commons_io_commons_io_2_6.xml index d722698..fa0698c 100644 --- a/.idea/libraries/Maven__commons_io_commons_io_2_6.xml +++ b/.idea/libraries/Maven__commons_io_commons_io_2_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml index 2ec8376..518aec9 100644 --- a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml index b770f56..a1cd1d4 100644 --- a/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml +++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml index eab40b3..20e9aec 100644 --- a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml +++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_83.xml b/.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_83.xml index 7af89b1..a638989 100644 --- a/.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_83.xml +++ b/.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_83.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_core_11_7.xml b/.idea/libraries/Maven__io_github_openfeign_feign_core_11_7.xml index 0a702fe..ecc5840 100644 --- a/.idea/libraries/Maven__io_github_openfeign_feign_core_11_7.xml +++ b/.idea/libraries/Maven__io_github_openfeign_feign_core_11_7.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_11_7.xml b/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_11_7.xml index 365b609..b9ecfba 100644 --- a/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_11_7.xml +++ b/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_11_7.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_8_0.xml b/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_8_0.xml index 0534476..1e9ec8b 100644 --- a/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_8_0.xml +++ b/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_8_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_8_0.xml b/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_8_0.xml index 47e101e..a9a5769 100644 --- a/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_8_0.xml +++ b/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_8_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_lettuce_lettuce_core_6_1_8_RELEASE.xml b/.idea/libraries/Maven__io_lettuce_lettuce_core_6_1_8_RELEASE.xml index 67c4c89..2b14c3c 100644 --- a/.idea/libraries/Maven__io_lettuce_lettuce_core_6_1_8_RELEASE.xml +++ b/.idea/libraries/Maven__io_lettuce_lettuce_core_6_1_8_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_micrometer_micrometer_core_1_8_4.xml b/.idea/libraries/Maven__io_micrometer_micrometer_core_1_8_4.xml index 7e8a255..84ce84a 100644 --- a/.idea/libraries/Maven__io_micrometer_micrometer_core_1_8_4.xml +++ b/.idea/libraries/Maven__io_micrometer_micrometer_core_1_8_4.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_micrometer_micrometer_registry_prometheus_1_8_4.xml b/.idea/libraries/Maven__io_micrometer_micrometer_registry_prometheus_1_8_4.xml index c22972f..c40e11a 100644 --- a/.idea/libraries/Maven__io_micrometer_micrometer_registry_prometheus_1_8_4.xml +++ b/.idea/libraries/Maven__io_micrometer_micrometer_registry_prometheus_1_8_4.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_minio_minio_8_0_3.xml b/.idea/libraries/Maven__io_minio_minio_8_0_3.xml index c8743c4..3b3dc69 100644 --- a/.idea/libraries/Maven__io_minio_minio_8_0_3.xml +++ b/.idea/libraries/Maven__io_minio_minio_8_0_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_75_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_75_Final.xml index e61e5b4..90fca43 100644 --- a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_75_Final.xml +++ b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_75_Final.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_4_1_75_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_1_75_Final.xml index 4e9e9ea..f50d44d 100644 --- a/.idea/libraries/Maven__io_netty_netty_codec_4_1_75_Final.xml +++ b/.idea/libraries/Maven__io_netty_netty_codec_4_1_75_Final.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_common_4_1_75_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_1_75_Final.xml index 68221aa..4ca6d0b 100644 --- a/.idea/libraries/Maven__io_netty_netty_common_4_1_75_Final.xml +++ b/.idea/libraries/Maven__io_netty_netty_common_4_1_75_Final.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_handler_4_1_75_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_4_1_75_Final.xml index a9a36a8..0943bcd 100644 --- a/.idea/libraries/Maven__io_netty_netty_handler_4_1_75_Final.xml +++ b/.idea/libraries/Maven__io_netty_netty_handler_4_1_75_Final.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_75_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_75_Final.xml index 14714d3..664cd25 100644 --- a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_75_Final.xml +++ b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_75_Final.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_4_1_75_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_1_75_Final.xml index b427c4f..44a695c 100644 --- a/.idea/libraries/Maven__io_netty_netty_transport_4_1_75_Final.xml +++ b/.idea/libraries/Maven__io_netty_netty_transport_4_1_75_Final.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_opentracing_opentracing_api_0_33_0.xml b/.idea/libraries/Maven__io_opentracing_opentracing_api_0_33_0.xml index 97e8076..c742c31 100644 --- a/.idea/libraries/Maven__io_opentracing_opentracing_api_0_33_0.xml +++ b/.idea/libraries/Maven__io_opentracing_opentracing_api_0_33_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_opentracing_opentracing_noop_0_33_0.xml b/.idea/libraries/Maven__io_opentracing_opentracing_noop_0_33_0.xml index 79842e2..63337dc 100644 --- a/.idea/libraries/Maven__io_opentracing_opentracing_noop_0_33_0.xml +++ b/.idea/libraries/Maven__io_opentracing_opentracing_noop_0_33_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_opentracing_opentracing_util_0_33_0.xml b/.idea/libraries/Maven__io_opentracing_opentracing_util_0_33_0.xml index 4add45d..f7a1cdc 100644 --- a/.idea/libraries/Maven__io_opentracing_opentracing_util_0_33_0.xml +++ b/.idea/libraries/Maven__io_opentracing_opentracing_util_0_33_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_4_16.xml b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_4_16.xml index ced775e..dda0771 100644 --- a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_4_16.xml +++ b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_4_16.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_prometheus_simpleclient_0_12_0.xml b/.idea/libraries/Maven__io_prometheus_simpleclient_0_12_0.xml index 517124b..a73cf1b 100644 --- a/.idea/libraries/Maven__io_prometheus_simpleclient_0_12_0.xml +++ b/.idea/libraries/Maven__io_prometheus_simpleclient_0_12_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_prometheus_simpleclient_common_0_12_0.xml b/.idea/libraries/Maven__io_prometheus_simpleclient_common_0_12_0.xml index ea5fcf5..3515a57 100644 --- a/.idea/libraries/Maven__io_prometheus_simpleclient_common_0_12_0.xml +++ b/.idea/libraries/Maven__io_prometheus_simpleclient_common_0_12_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_prometheus_simpleclient_tracer_common_0_12_0.xml b/.idea/libraries/Maven__io_prometheus_simpleclient_tracer_common_0_12_0.xml index cd1b812..afe5b28 100644 --- a/.idea/libraries/Maven__io_prometheus_simpleclient_tracer_common_0_12_0.xml +++ b/.idea/libraries/Maven__io_prometheus_simpleclient_tracer_common_0_12_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_prometheus_simpleclient_tracer_otel_0_12_0.xml b/.idea/libraries/Maven__io_prometheus_simpleclient_tracer_otel_0_12_0.xml index c33ce7a..c661cba 100644 --- a/.idea/libraries/Maven__io_prometheus_simpleclient_tracer_otel_0_12_0.xml +++ b/.idea/libraries/Maven__io_prometheus_simpleclient_tracer_otel_0_12_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_prometheus_simpleclient_tracer_otel_agent_0_12_0.xml b/.idea/libraries/Maven__io_prometheus_simpleclient_tracer_otel_agent_0_12_0.xml index f48c838..5cb736c 100644 --- a/.idea/libraries/Maven__io_prometheus_simpleclient_tracer_otel_agent_0_12_0.xml +++ b/.idea/libraries/Maven__io_prometheus_simpleclient_tracer_otel_agent_0_12_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_bean_validators_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_bean_validators_3_0_0.xml index 0eb2c0a..34a7693 100644 --- a/.idea/libraries/Maven__io_springfox_springfox_bean_validators_3_0_0.xml +++ b/.idea/libraries/Maven__io_springfox_springfox_bean_validators_3_0_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_boot_starter_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_boot_starter_3_0_0.xml index 1271e96..e26e7c8 100644 --- a/.idea/libraries/Maven__io_springfox_springfox_boot_starter_3_0_0.xml +++ b/.idea/libraries/Maven__io_springfox_springfox_boot_starter_3_0_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_core_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_core_3_0_0.xml index f709493..dd2fa2a 100644 --- a/.idea/libraries/Maven__io_springfox_springfox_core_3_0_0.xml +++ b/.idea/libraries/Maven__io_springfox_springfox_core_3_0_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_data_rest_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_data_rest_3_0_0.xml index 48549e7..586e918 100644 --- a/.idea/libraries/Maven__io_springfox_springfox_data_rest_3_0_0.xml +++ b/.idea/libraries/Maven__io_springfox_springfox_data_rest_3_0_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_oas_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_oas_3_0_0.xml index ae61434..9202cba 100644 --- a/.idea/libraries/Maven__io_springfox_springfox_oas_3_0_0.xml +++ b/.idea/libraries/Maven__io_springfox_springfox_oas_3_0_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_schema_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_schema_3_0_0.xml index 62167e6..c83da23 100644 --- a/.idea/libraries/Maven__io_springfox_springfox_schema_3_0_0.xml +++ b/.idea/libraries/Maven__io_springfox_springfox_schema_3_0_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spi_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spi_3_0_0.xml index ea2a427..f198a61 100644 --- a/.idea/libraries/Maven__io_springfox_springfox_spi_3_0_0.xml +++ b/.idea/libraries/Maven__io_springfox_springfox_spi_3_0_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_web_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_web_3_0_0.xml index 9c61e39..b87db8e 100644 --- a/.idea/libraries/Maven__io_springfox_springfox_spring_web_3_0_0.xml +++ b/.idea/libraries/Maven__io_springfox_springfox_spring_web_3_0_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_webflux_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_webflux_3_0_0.xml index bace373..a76b1bb 100644 --- a/.idea/libraries/Maven__io_springfox_springfox_spring_webflux_3_0_0.xml +++ b/.idea/libraries/Maven__io_springfox_springfox_spring_webflux_3_0_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_webmvc_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_webmvc_3_0_0.xml index 62f8918..c4d6df0 100644 --- a/.idea/libraries/Maven__io_springfox_springfox_spring_webmvc_3_0_0.xml +++ b/.idea/libraries/Maven__io_springfox_springfox_spring_webmvc_3_0_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger2_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger2_3_0_0.xml index 22a1ee5..8c79281 100644 --- a/.idea/libraries/Maven__io_springfox_springfox_swagger2_3_0_0.xml +++ b/.idea/libraries/Maven__io_springfox_springfox_swagger2_3_0_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_3_0_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_3_0_0.xml index 906a7d8..5013434 100644 --- a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_3_0_0.xml +++ b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_3_0_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_2.xml b/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_2.xml index feefbab..0b9ed27 100644 --- a/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_2.xml +++ b/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_core_v3_swagger_models_2_1_2.xml b/.idea/libraries/Maven__io_swagger_core_v3_swagger_models_2_1_2.xml index 606a7a5..22ed0e1 100644 --- a/.idea/libraries/Maven__io_swagger_core_v3_swagger_models_2_1_2.xml +++ b/.idea/libraries/Maven__io_swagger_core_v3_swagger_models_2_1_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_22.xml b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_22.xml index b4e45d3..c0c2eff 100644 --- a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_22.xml +++ b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_22.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_core_1_5_22.xml b/.idea/libraries/Maven__io_swagger_swagger_core_1_5_22.xml index 764185c..44dce73 100644 --- a/.idea/libraries/Maven__io_swagger_swagger_core_1_5_22.xml +++ b/.idea/libraries/Maven__io_swagger_swagger_core_1_5_22.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_22.xml b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_22.xml index 9d254f7..e9368fe 100644 --- a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_22.xml +++ b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_22.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml index be90656..d1d2a2d 100644 --- 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 @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml index cba9dd2..74579e0 100644 --- 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 @@ -1,13 +1,13 @@ - + - + - + \ 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 index e66afb9..d0d3489 100644 --- 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 @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml index 04213f7..df7ba74 100644 --- 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 @@ -1,13 +1,13 @@ - + - + - + \ 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 index ff49512..0a23c09 100644 --- 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 @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_persistence_javax_persistence_api_2_2.xml b/.idea/libraries/Maven__javax_persistence_javax_persistence_api_2_2.xml index b7d39c6..801003e 100644 --- a/.idea/libraries/Maven__javax_persistence_javax_persistence_api_2_2.xml +++ b/.idea/libraries/Maven__javax_persistence_javax_persistence_api_2_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml index 6978c0b..c74f3bb 100644 --- a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml +++ b/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index 059f88f..4d534f2 100644 --- 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 @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_13_2.xml b/.idea/libraries/Maven__junit_junit_4_13_2.xml index 606c352..32abf35 100644 --- a/.idea/libraries/Maven__junit_junit_4_13_2.xml +++ b/.idea/libraries/Maven__junit_junit_4_13_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__me_zhyd_oauth_JustAuth_1_15_7.xml b/.idea/libraries/Maven__me_zhyd_oauth_JustAuth_1_15_7.xml index 6a0064f..a7c2afc 100644 --- a/.idea/libraries/Maven__me_zhyd_oauth_JustAuth_1_15_7.xml +++ b/.idea/libraries/Maven__me_zhyd_oauth_JustAuth_1_15_7.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index 5c1fc59..8ec9a9f 100644 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_27.xml +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_27.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_28.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_28.xml index c117a77..c535a18 100644 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_28.xml +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_28.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index c957e32..0dca801 100644 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_11_22.xml +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_11_22.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index b67ac50..cac56ee 100644 --- 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 @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_8.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_8.xml index 6b7b59a..f6637e7 100644 --- a/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_8.xml +++ b/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_8.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_4_8.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_4_8.xml index 7479a40..3bd8afc 100644 --- a/.idea/libraries/Maven__net_minidev_json_smart_2_4_8.xml +++ b/.idea/libraries/Maven__net_minidev_json_smart_2_4_8.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml index 546e6cf..8ff5aad 100644 --- a/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml +++ b/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml index 7c6b3e6..36233cc 100644 --- a/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml +++ b/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__ognl_ognl_3_2_21.xml b/.idea/libraries/Maven__ognl_ognl_3_2_21.xml index e11aa2e..76d183a 100644 --- a/.idea/libraries/Maven__ognl_ognl_3_2_21.xml +++ b/.idea/libraries/Maven__ognl_ognl_3_2_21.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml index 5871c95..8003be6 100644 --- a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml +++ b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml index 7c25fef..71134d7 100644 --- a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml +++ b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_12_0.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_12_0.xml index 28b8682..582c5f3 100644 --- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_12_0.xml +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_12_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml index ebfe0a8..9efdcf3 100644 --- a/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml +++ b/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index 3983bb9..1c97940 100644 --- 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 @@ -1,13 +1,13 @@ - + - + - + \ 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 index 63bee0e..48a5a58 100644 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_13.xml +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_13.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_15.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_15.xml index c511a85..745aafa 100644 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_15.xml +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_15.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index 3343278..8f2d447 100644 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_13.xml +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_13.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_0.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_0.xml index d566167..be2aeb6 100644 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_0.xml +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_0.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_0.xml index cac21c8..6958886 100644 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_0.xml +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_ooxml_schemas_1_4.xml b/.idea/libraries/Maven__org_apache_poi_ooxml_schemas_1_4.xml index aca2261..7d6d844 100644 --- a/.idea/libraries/Maven__org_apache_poi_ooxml_schemas_1_4.xml +++ b/.idea/libraries/Maven__org_apache_poi_ooxml_schemas_1_4.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml b/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml index c706d5b..e33c5d7 100644 --- a/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml +++ b/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml index 905ca0c..f64e7ee 100644 --- a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml index 93d965d..ea754db 100644 --- a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml +++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_scratchpad_4_1_2.xml b/.idea/libraries/Maven__org_apache_poi_poi_scratchpad_4_1_2.xml index 9a0567b..f6250f4 100644 --- a/.idea/libraries/Maven__org_apache_poi_poi_scratchpad_4_1_2.xml +++ b/.idea/libraries/Maven__org_apache_poi_poi_scratchpad_4_1_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_8_0.xml index 5272a36..55afec2 100644 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_8_0.xml +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_8_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_8_0.xml index 4578d1b..81597bd 100644 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_8_0.xml +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_8_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_8_0.xml index e699787..e9f12c6 100644 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_8_0.xml +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_8_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_8_0.xml index aa3fdcf..7e1a2b0 100644 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_8_0.xml +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_8_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_8_0.xml index 77a90b8..1c3c9c7 100644 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_8_0.xml +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_8_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_8_0.xml index dddd497..9104ead 100644 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_8_0.xml +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_8_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_8_0.xml index ece1eae..af61d61 100644 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_8_0.xml +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_8_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_8_0.xml index b7a65df..f281d31 100644 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_8_0.xml +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_8_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_8_0.xml index 499eb00..83c05e0 100644 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_8_0.xml +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_8_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_8_0.xml index 264c53f..9f203ac 100644 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_8_0.xml +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_8_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_spring_boot_starter_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_spring_boot_starter_1_8_0.xml index 0946e78..8cf356e 100644 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_spring_boot_starter_1_8_0.xml +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_spring_boot_starter_1_8_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_8_0.xml index 7be49ba..d3efc46 100644 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_8_0.xml +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_8_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_60.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_60.xml index f0ad621..79e6c28 100644 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_60.xml +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_60.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_60.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_60.xml index 6952c57..1477025 100644 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_60.xml +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_60.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_60.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_60.xml index 20657bf..986fa13 100644 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_60.xml +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_60.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml index 0695d4b..7297161 100644 --- a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml +++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index 6ac1c42..232e7d0 100644 --- a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml +++ b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_7.xml b/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_7.xml index cc946d7..7edb268 100644 --- a/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_7.xml +++ b/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_7.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index bbaf9a7..32416b8 100644 --- a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_7.xml +++ b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_7.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index 03e3cae..f3556c2 100644 --- a/.idea/libraries/Maven__org_assertj_assertj_core_3_21_0.xml +++ b/.idea/libraries/Maven__org_assertj_assertj_core_3_21_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcmail_jdk14_1_38.xml b/.idea/libraries/Maven__org_bouncycastle_bcmail_jdk14_1_38.xml index 19a76d3..ab467f0 100644 --- a/.idea/libraries/Maven__org_bouncycastle_bcmail_jdk14_1_38.xml +++ b/.idea/libraries/Maven__org_bouncycastle_bcmail_jdk14_1_38.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_59.xml b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_59.xml index 7495776..3571f32 100644 --- a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_59.xml +++ b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_59.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_68.xml b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_68.xml index 65b4c2f..8664477 100644 --- a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_68.xml +++ b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_68.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk14_1_38.xml b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk14_1_38.xml index cb79152..fd27da3 100644 --- a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk14_1_38.xml +++ b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk14_1_38.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_59.xml b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_59.xml index ad03790..19c3fbb 100644 --- a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_59.xml +++ b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_59.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_62.xml b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_62.xml index f546c7a..9547535 100644 --- a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_62.xml +++ b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_62.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_68.xml b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_68.xml index c7f7fce..aa13a47 100644 --- a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_68.xml +++ b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_68.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bctsp_jdk14_1_38.xml b/.idea/libraries/Maven__org_bouncycastle_bctsp_jdk14_1_38.xml index 755a52c..fe4b036 100644 --- a/.idea/libraries/Maven__org_bouncycastle_bctsp_jdk14_1_38.xml +++ b/.idea/libraries/Maven__org_bouncycastle_bctsp_jdk14_1_38.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_checkerframework_checker_qual_2_11_1.xml b/.idea/libraries/Maven__org_checkerframework_checker_qual_2_11_1.xml index 6d622d2..735c872 100644 --- a/.idea/libraries/Maven__org_checkerframework_checker_qual_2_11_1.xml +++ b/.idea/libraries/Maven__org_checkerframework_checker_qual_2_11_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_1.xml b/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_1.xml index d62802e..efacf57 100644 --- a/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_1.xml +++ b/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_crazycake_shiro_redis_3_1_0.xml b/.idea/libraries/Maven__org_crazycake_shiro_redis_3_1_0.xml index dde7047..920cbf5 100644 --- a/.idea/libraries/Maven__org_crazycake_shiro_redis_3_1_0.xml +++ b/.idea/libraries/Maven__org_crazycake_shiro_redis_3_1_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dom4j_dom4j_2_1_1.xml b/.idea/libraries/Maven__org_dom4j_dom4j_2_1_1.xml index 6c8b371..3f01145 100644 --- a/.idea/libraries/Maven__org_dom4j_dom4j_2_1_1.xml +++ b/.idea/libraries/Maven__org_dom4j_dom4j_2_1_1.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index 6ffac07..ad39064 100644 --- a/.idea/libraries/Maven__org_freemarker_freemarker_2_3_31.xml +++ b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_31.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_6.xml b/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_6.xml index 44758be..a706ac9 100644 --- a/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_6.xml +++ b/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_6.xml b/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_6.xml index be58d42..84c8d72 100644 --- a/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_6.xml +++ b/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml index 6b5496f..d99d31c 100644 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml index 15f1e4c..8fbba4c 100644 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_12.xml b/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_12.xml index 6908885..d0288dd 100644 --- a/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_12.xml +++ b/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_12.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index a775836..92f6a0d 100644 --- 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 @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_5_6_7_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_5_6_7_Final.xml index c553a30..0ab2cae 100644 --- a/.idea/libraries/Maven__org_hibernate_hibernate_core_5_6_7_Final.xml +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_5_6_7_Final.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_2_3_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_2_3_Final.xml index 15f3bed..db9fd3a 100644 --- a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_2_3_Final.xml +++ b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_2_3_Final.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ini4j_ini4j_0_5_4.xml b/.idea/libraries/Maven__org_ini4j_ini4j_0_5_4.xml index 9e114a8..4b80a8c 100644 --- a/.idea/libraries/Maven__org_ini4j_ini4j_0_5_4.xml +++ b/.idea/libraries/Maven__org_ini4j_ini4j_0_5_4.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_5.xml b/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_5.xml index f370504..5556bd7 100644 --- a/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_5.xml +++ b/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_5.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_25_0_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_25_0_GA.xml index a24c34c..66a967d 100644 --- a/.idea/libraries/Maven__org_javassist_javassist_3_25_0_GA.xml +++ b/.idea/libraries/Maven__org_javassist_javassist_3_25_0_GA.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_2_4_2_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_2_4_2_Final.xml index e65fbd0..b3bd994 100644 --- a/.idea/libraries/Maven__org_jboss_jandex_2_4_2_Final.xml +++ b/.idea/libraries/Maven__org_jboss_jandex_2_4_2_Final.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_3_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_3_Final.xml index 5845c01..14e5c59 100644 --- a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_3_Final.xml +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_3_Final.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_1_1_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_1_1_Final.xml index ec03510..c8c0dfc 100644 --- a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_1_1_Final.xml +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_1_1_Final.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jdom_jdom2_2_0_6_1.xml b/.idea/libraries/Maven__org_jdom_jdom2_2_0_6_1.xml index 162e512..adf3d23 100644 --- a/.idea/libraries/Maven__org_jdom_jdom2_2_0_6_1.xml +++ b/.idea/libraries/Maven__org_jdom_jdom2_2_0_6_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jdom_jdom_1_1.xml b/.idea/libraries/Maven__org_jdom_jdom_1_1.xml index a6eefaf..f496125 100644 --- a/.idea/libraries/Maven__org_jdom_jdom_1_1.xml +++ b/.idea/libraries/Maven__org_jdom_jdom_1_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jeecgframework_autopoi_1_3_9.xml b/.idea/libraries/Maven__org_jeecgframework_autopoi_1_3_9.xml index 3408c5e..fe75d6f 100644 --- a/.idea/libraries/Maven__org_jeecgframework_autopoi_1_3_9.xml +++ b/.idea/libraries/Maven__org_jeecgframework_autopoi_1_3_9.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jeecgframework_autopoi_1_4_0.xml b/.idea/libraries/Maven__org_jeecgframework_autopoi_1_4_0.xml index 3b35c10..8c9ba33 100644 --- a/.idea/libraries/Maven__org_jeecgframework_autopoi_1_4_0.xml +++ b/.idea/libraries/Maven__org_jeecgframework_autopoi_1_4_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jeecgframework_autopoi_web_1_3_9.xml b/.idea/libraries/Maven__org_jeecgframework_autopoi_web_1_3_9.xml index 8d1a233..8ed8766 100644 --- a/.idea/libraries/Maven__org_jeecgframework_autopoi_web_1_3_9.xml +++ b/.idea/libraries/Maven__org_jeecgframework_autopoi_web_1_3_9.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jeecgframework_autopoi_web_1_4_0.xml b/.idea/libraries/Maven__org_jeecgframework_autopoi_web_1_4_0.xml index 37df35e..9b55901 100644 --- a/.idea/libraries/Maven__org_jeecgframework_autopoi_web_1_4_0.xml +++ b/.idea/libraries/Maven__org_jeecgframework_autopoi_web_1_4_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jeecgframework_boot_codegenerate_1_3_8.xml b/.idea/libraries/Maven__org_jeecgframework_boot_codegenerate_1_3_8.xml index ccc3861..dd3f336 100644 --- a/.idea/libraries/Maven__org_jeecgframework_boot_codegenerate_1_3_8.xml +++ b/.idea/libraries/Maven__org_jeecgframework_boot_codegenerate_1_3_8.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jeecgframework_boot_hibernate_re_3_2_0_beta.xml b/.idea/libraries/Maven__org_jeecgframework_boot_hibernate_re_3_2_0_beta.xml index 74f1a99..97048b0 100644 --- a/.idea/libraries/Maven__org_jeecgframework_boot_hibernate_re_3_2_0_beta.xml +++ b/.idea/libraries/Maven__org_jeecgframework_boot_hibernate_re_3_2_0_beta.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jeecgframework_jeewx_api_1_4_7.xml b/.idea/libraries/Maven__org_jeecgframework_jeewx_api_1_4_7.xml index 4a13263..6a95152 100644 --- a/.idea/libraries/Maven__org_jeecgframework_jeewx_api_1_4_7.xml +++ b/.idea/libraries/Maven__org_jeecgframework_jeewx_api_1_4_7.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jeecgframework_jimureport_jimureport_font_1_1_0.xml b/.idea/libraries/Maven__org_jeecgframework_jimureport_jimureport_font_1_1_0.xml index 391e072..bd19327 100644 --- a/.idea/libraries/Maven__org_jeecgframework_jimureport_jimureport_font_1_1_0.xml +++ b/.idea/libraries/Maven__org_jeecgframework_jimureport_jimureport_font_1_1_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jeecgframework_jimureport_jimureport_spring_boot_starter_1_5_0_beta.xml b/.idea/libraries/Maven__org_jeecgframework_jimureport_jimureport_spring_boot_starter_1_5_0_beta.xml index f1d1d7f..4ae83a6 100644 --- a/.idea/libraries/Maven__org_jeecgframework_jimureport_jimureport_spring_boot_starter_1_5_0_beta.xml +++ b/.idea/libraries/Maven__org_jeecgframework_jimureport_jimureport_spring_boot_starter_1_5_0_beta.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jeecgframework_minidao_pe_1_9_0.xml b/.idea/libraries/Maven__org_jeecgframework_minidao_pe_1_9_0.xml index 49aea0e..bf1d10b 100644 --- a/.idea/libraries/Maven__org_jeecgframework_minidao_pe_1_9_0.xml +++ b/.idea/libraries/Maven__org_jeecgframework_minidao_pe_1_9_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jeecgframework_minidao_spring_boot_starter_1_9_0.xml b/.idea/libraries/Maven__org_jeecgframework_minidao_spring_boot_starter_1_9_0.xml index 6772dc6..1535b63 100644 --- a/.idea/libraries/Maven__org_jeecgframework_minidao_spring_boot_starter_1_9_0.xml +++ b/.idea/libraries/Maven__org_jeecgframework_minidao_spring_boot_starter_1_9_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jetbrains_annotations_13_0.xml b/.idea/libraries/Maven__org_jetbrains_annotations_13_0.xml index e2c8297..4f7e9f9 100644 --- a/.idea/libraries/Maven__org_jetbrains_annotations_13_0.xml +++ b/.idea/libraries/Maven__org_jetbrains_annotations_13_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_6_10.xml b/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_6_10.xml index 6309284..1432550 100644 --- a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_6_10.xml +++ b/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_6_10.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_6_10.xml b/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_6_10.xml index f1749be..923eeaa 100644 --- a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_6_10.xml +++ b/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_6_10.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_10.xml b/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_10.xml index 188563d..67bf48b 100644 --- a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_10.xml +++ b/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_10.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jodd_jodd_core_3_7_1.xml b/.idea/libraries/Maven__org_jodd_jodd_core_3_7_1.xml index 203484b..48cf883 100644 --- a/.idea/libraries/Maven__org_jodd_jodd_core_3_7_1.xml +++ b/.idea/libraries/Maven__org_jodd_jodd_core_3_7_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jodd_jodd_http_3_7_1.xml b/.idea/libraries/Maven__org_jodd_jodd_http_3_7_1.xml index 1d00e5f..16d8c7f 100644 --- a/.idea/libraries/Maven__org_jodd_jodd_http_3_7_1.xml +++ b/.idea/libraries/Maven__org_jodd_jodd_http_3_7_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jodd_jodd_upload_3_7_1.xml b/.idea/libraries/Maven__org_jodd_jodd_upload_3_7_1.xml index a961485..1faf80d 100644 --- a/.idea/libraries/Maven__org_jodd_jodd_upload_3_7_1.xml +++ b/.idea/libraries/Maven__org_jodd_jodd_upload_3_7_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20140107.xml b/.idea/libraries/Maven__org_json_json_20140107.xml index 0092a09..3ca3068 100644 --- a/.idea/libraries/Maven__org_json_json_20140107.xml +++ b/.idea/libraries/Maven__org_json_json_20140107.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml index 4f367e7..de5e62e 100644 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml index 8e50783..b5dcbb0 100644 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml index fc8291b..8ee419d 100644 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml index 4b3ffb1..67f3551 100644 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml index 181d095..6fe6600 100644 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml index 5f3aebe..96214f8 100644 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml b/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml index bf68169..da7ffae 100644 --- a/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml +++ b/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_3_1_Final.xml b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_3_1_Final.xml index 7ee5fee..d9ed522 100644 --- a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_3_1_Final.xml +++ b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_3_1_Final.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index cf13209..774b921 100644 --- a/.idea/libraries/Maven__org_mockito_mockito_core_4_0_0.xml +++ b/.idea/libraries/Maven__org_mockito_mockito_core_4_0_0.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index 49e3f23..48dde43 100644 --- 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 @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mongodb_bson_4_4_2.xml b/.idea/libraries/Maven__org_mongodb_bson_4_4_2.xml index de7ca0a..0d52b3e 100644 --- a/.idea/libraries/Maven__org_mongodb_bson_4_4_2.xml +++ b/.idea/libraries/Maven__org_mongodb_bson_4_4_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_4_4_2.xml b/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_4_4_2.xml index 2e652e1..20545d8 100644 --- a/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_4_4_2.xml +++ b/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_4_4_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mongodb_mongodb_driver_sync_4_4_2.xml b/.idea/libraries/Maven__org_mongodb_mongodb_driver_sync_4_4_2.xml index 5c5d4d6..40fe745 100644 --- a/.idea/libraries/Maven__org_mongodb_mongodb_driver_sync_4_4_2.xml +++ b/.idea/libraries/Maven__org_mongodb_mongodb_driver_sync_4_4_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_9.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_9.xml index 16b7682..51ed20e 100644 --- a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_9.xml +++ b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_9.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml index a359305..3157ffe 100644 --- a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml +++ b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index 6613def..5877329 100644 --- a/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml +++ b/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml index fbc1b16..4a56154 100644 --- a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml +++ b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index 67127c2..0545609 100644 --- a/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml +++ b/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_owasp_encoder_encoder_1_2_2.xml b/.idea/libraries/Maven__org_owasp_encoder_encoder_1_2_2.xml index c21f786..57aa768 100644 --- a/.idea/libraries/Maven__org_owasp_encoder_encoder_1_2_2.xml +++ b/.idea/libraries/Maven__org_owasp_encoder_encoder_1_2_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_postgresql_postgresql_42_2_6.xml b/.idea/libraries/Maven__org_postgresql_postgresql_42_2_6.xml index 97d7125..3c72639 100644 --- a/.idea/libraries/Maven__org_postgresql_postgresql_42_2_6.xml +++ b/.idea/libraries/Maven__org_postgresql_postgresql_42_2_6.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index 72b596e..b86fd8c 100644 --- a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_22.xml +++ b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_22.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_24.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_24.xml index d43fa18..2932cc1 100644 --- a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_24.xml +++ b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_24.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_2.xml b/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_2.xml index fb5bfe9..8d7b94b 100644 --- a/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_2.xml +++ b/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml index f17253b..970c72b 100644 --- a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml +++ b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml index c4c54d6..e4fbcde 100644 --- a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml +++ b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_36.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_36.xml index aabb86f..4f1f696 100644 --- a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_36.xml +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_36.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml index 5d5c14b..6f1eae3 100644 --- a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml index 2d759c1..01ea354 100644 --- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_6_6.xml index 512289c..ab17d82 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_6_6.xml index 94a1ec8..8d9b40d 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_6_6.xml index 52a088e..250680b 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_6_6.xml index 00bb9da..45116a0 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_6_6.xml index 2ed0547..44726ef 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_6_6.xml index d3850f3..116cb61 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_6_6.xml index 0c8e2d3..cbb9a77 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_6_6.xml index 6b758f2..ba207b4 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_6_6.xml index e2e8ba2..77e9bea 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_6_6.xml index 5eaee39..ffa8172 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_6_6.xml index 9b274ec..de26059 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_6_6.xml index 50680c4..ca16657 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_6_6.xml index 6846bf5..e39a9c0 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_quartz_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_quartz_2_6_6.xml index 8da6409..92b58aa 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_quartz_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_quartz_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_6_6.xml index c9b0002..c54d0e4 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_6_6.xml index 5036d1e..9d498f1 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_6_6.xml index f9e6ab7..c8a9e62 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_6_6.xml index ff1999f..6f43da9 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_6_6.xml index 1f3ea9b..cafce67 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_6_6.xml index 6a451a6..3a55719 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_6_6.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_6_6.xml index 3556e5b..2875d33 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_6_6.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_6_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_3_1_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_3_1_0.xml index f01a029..ca76d4a 100644 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_3_1_0.xml +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_3_1_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_3_1_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_3_1_0.xml index 0e01042..be6dc50 100644 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_3_1_0.xml +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_3_1_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_3_1_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_3_1_0.xml index 2047d53..5690ede 100644 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_3_1_0.xml +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_3_1_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_3_1_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_3_1_0.xml index 580d209..ba3e75a 100644 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_3_1_0.xml +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_3_1_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_3_1_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_3_1_0.xml index 5a94ba2..302f051 100644 --- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_3_1_0.xml +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_3_1_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_6_3.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_6_3.xml index 2d3aadd..e1f943a 100644 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_6_3.xml +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_6_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_6_3.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_6_3.xml index f2213e4..89ebb26 100644 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_6_3.xml +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_6_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_6_3.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_6_3.xml index 285bee0..59a9564 100644 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_6_3.xml +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_6_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_2_0_0_RELEASE.xml index 28f52d3..4a54417 100644 --- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_2_0_0_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_2_0_0_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_2_0_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_2_0_0_RELEASE.xml index fa302bf..c8e871e 100644 --- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_2_0_0_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_2_0_0_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_6_2.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_6_2.xml index d7aa501..e2054d7 100644 --- a/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_6_2.xml +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_6_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_10_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_10_RELEASE.xml index 314b3ba..f65538b 100644 --- a/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_10_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_10_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_3_18.xml index a0e36b6..e013456 100644 --- a/.idea/libraries/Maven__org_springframework_spring_aop_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_aop_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_3_18.xml index 644de4d..e12cbce 100644 --- a/.idea/libraries/Maven__org_springframework_spring_beans_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_beans_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_3_18.xml index 2a5838f..d981d27 100644 --- a/.idea/libraries/Maven__org_springframework_spring_context_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_context_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_18.xml index df6e618..648e956 100644 --- a/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_3_18.xml index 78b1303..8f58441 100644 --- a/.idea/libraries/Maven__org_springframework_spring_core_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_core_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_3_18.xml index 7e96f06..2415b37 100644 --- a/.idea/libraries/Maven__org_springframework_spring_expression_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_expression_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_18.xml index 4f4fc2b..65b64e6 100644 --- a/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_18.xml index 8f3ce39..a496c69 100644 --- a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_messaging_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_messaging_5_3_18.xml index e3871c6..c6e73ef 100644 --- a/.idea/libraries/Maven__org_springframework_spring_messaging_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_messaging_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_oxm_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_oxm_5_3_18.xml index d6422f4..70b086f 100644 --- a/.idea/libraries/Maven__org_springframework_spring_oxm_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_oxm_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_3_18.xml index 1d576a9..4535c1e 100644 --- a/.idea/libraries/Maven__org_springframework_spring_test_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_test_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_3_18.xml index 39af211..27bdac4 100644 --- a/.idea/libraries/Maven__org_springframework_spring_tx_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_tx_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_3_18.xml index 00d2b00..eb1430a 100644 --- a/.idea/libraries/Maven__org_springframework_spring_web_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_web_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_18.xml index b2dab0c..0200248 100644 --- a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_websocket_5_3_18.xml b/.idea/libraries/Maven__org_springframework_spring_websocket_5_3_18.xml index 7379e86..91f9a07 100644 --- a/.idea/libraries/Maven__org_springframework_spring_websocket_5_3_18.xml +++ b/.idea/libraries/Maven__org_springframework_spring_websocket_5_3_18.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_4.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_4.xml index 23e67e6..2a876fd 100644 --- a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_4.xml +++ b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_4.xml @@ -1,13 +1,13 @@ - + - + - + \ 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 index c871529..8e39163 100644 --- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_29.xml +++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_29.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__redis_clients_jedis_3_7_1.xml b/.idea/libraries/Maven__redis_clients_jedis_3_7_1.xml index 9417fab..8c43e26 100644 --- a/.idea/libraries/Maven__redis_clients_jedis_3_7_1.xml +++ b/.idea/libraries/Maven__redis_clients_jedis_3_7_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml index 0b13335..a195d44 100644 --- a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml +++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml b/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml index 19d39db..0f9a29c 100644 --- a/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml +++ b/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__xml_apis_xml_apis_1_3_04.xml b/.idea/libraries/Maven__xml_apis_xml_apis_1_3_04.xml index 891caa2..5fc8272 100644 --- a/.idea/libraries/Maven__xml_apis_xml_apis_1_3_04.xml +++ b/.idea/libraries/Maven__xml_apis_xml_apis_1_3_04.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml b/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml index 0f2d9ef..fe1b0c1 100644 --- a/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml +++ b/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml b/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml index 6726a2d..6c2e5da 100644 --- a/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml +++ b/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml b/jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml index 4e855fc..f2a1109 100644 --- a/jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml +++ b/jeecg-boot-base/jeecg-boot-base-api/jeecg-boot-base-api.iml @@ -214,6 +214,7 @@ + @@ -248,7 +249,6 @@ - diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml index 23004b3..0d06433 100644 --- a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml +++ b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/jeecg-system-cloud-api.iml @@ -239,6 +239,7 @@ + @@ -273,7 +274,6 @@ - diff --git a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml index 1f0efd3..bfc382d 100644 --- a/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml +++ b/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/jeecg-system-local-api.iml @@ -225,6 +225,7 @@ + @@ -259,7 +260,6 @@ - diff --git a/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml b/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml index ae7037c..d9f3c37 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml +++ b/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml @@ -235,6 +235,7 @@ + @@ -259,7 +260,6 @@ - diff --git a/jeecg-boot-base/jeecg-boot-base-core/pom.xml b/jeecg-boot-base/jeecg-boot-base-core/pom.xml index be7b740..98ec833 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/pom.xml +++ b/jeecg-boot-base/jeecg-boot-base-core/pom.xml @@ -260,6 +260,12 @@ 138 compile + + com.vaadin.external.google + android-json + 0.0.20131108.vaadin1 + compile + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/controller/EmployConfigController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/controller/EmployConfigController.java new file mode 100644 index 0000000..4dcc061 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/controller/EmployConfigController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.employConfig.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.employConfig.entity.EmployConfig; +import org.jeecg.modules.employConfig.service.IEmployConfigService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 参数配置表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +@Api(tags="参数配置表") +@RestController +@RequestMapping("/employConfig/employConfig") +@Slf4j +public class EmployConfigController extends JeecgController { + @Autowired + private IEmployConfigService employConfigService; + + /** + * 分页列表查询 + * + * @param employConfig + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "参数配置表-分页列表查询") + @ApiOperation(value="参数配置表-分页列表查询", notes="参数配置表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(EmployConfig employConfig, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employConfig, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = employConfigService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param employConfig + * @return + */ + @AutoLog(value = "参数配置表-添加") + @ApiOperation(value="参数配置表-添加", notes="参数配置表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody EmployConfig employConfig) { + employConfigService.save(employConfig); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param employConfig + * @return + */ + @AutoLog(value = "参数配置表-编辑") + @ApiOperation(value="参数配置表-编辑", notes="参数配置表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody EmployConfig employConfig) { + employConfigService.updateById(employConfig); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "参数配置表-通过id删除") + @ApiOperation(value="参数配置表-通过id删除", notes="参数配置表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + employConfigService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "参数配置表-批量删除") + @ApiOperation(value="参数配置表-批量删除", notes="参数配置表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.employConfigService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "参数配置表-通过id查询") + @ApiOperation(value="参数配置表-通过id查询", notes="参数配置表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + EmployConfig employConfig = employConfigService.getById(id); + if(employConfig==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(employConfig); + } + + /** + * 导出excel + * + * @param request + * @param employConfig + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EmployConfig employConfig) { + return super.exportXls(request, employConfig, EmployConfig.class, "参数配置表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EmployConfig.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/entity/EmployConfig.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/entity/EmployConfig.java new file mode 100644 index 0000000..39a5484 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/entity/EmployConfig.java @@ -0,0 +1,62 @@ +package org.jeecg.modules.employConfig.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 参数配置表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +@Data +@TableName("employ_config") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="employ_config对象", description="参数配置表") +public class EmployConfig implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**参数编码*/ + @Excel(name = "参数编码", width = 15) + @ApiModelProperty(value = "参数编码") + private java.lang.String paramCode; + /**参数值*/ + @Excel(name = "参数值", width = 15) + @ApiModelProperty(value = "参数值") + private java.lang.String paramValue; + /**参数描述*/ + @Excel(name = "参数描述", width = 15) + @ApiModelProperty(value = "参数描述") + private java.lang.String paramDescription; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/mapper/EmployConfigMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/mapper/EmployConfigMapper.java new file mode 100644 index 0000000..6d0004c --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/mapper/EmployConfigMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.employConfig.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.employConfig.entity.EmployConfig; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 参数配置表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface EmployConfigMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/mapper/xml/EmployConfigMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/mapper/xml/EmployConfigMapper.xml new file mode 100644 index 0000000..a562ef3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/mapper/xml/EmployConfigMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/service/IEmployConfigService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/service/IEmployConfigService.java new file mode 100644 index 0000000..311c391 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/service/IEmployConfigService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.employConfig.service; + +import org.jeecg.modules.employConfig.entity.EmployConfig; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 参数配置表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +public interface IEmployConfigService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/service/impl/EmployConfigServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/service/impl/EmployConfigServiceImpl.java new file mode 100644 index 0000000..4222abe --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/service/impl/EmployConfigServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.employConfig.service.impl; + +import org.jeecg.modules.employConfig.entity.EmployConfig; +import org.jeecg.modules.employConfig.mapper.EmployConfigMapper; +import org.jeecg.modules.employConfig.service.IEmployConfigService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 参数配置表 + * @Author: jeecg-boot + * @Date: 2024-12-19 + * @Version: V1.0 + */ +@Service +public class EmployConfigServiceImpl extends ServiceImpl implements IEmployConfigService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue/EmployConfigList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue/EmployConfigList.vue new file mode 100644 index 0000000..4f97a51 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue/EmployConfigList.vue @@ -0,0 +1,183 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue/modules/EmployConfigForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue/modules/EmployConfigForm.vue new file mode 100644 index 0000000..28c724b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue/modules/EmployConfigForm.vue @@ -0,0 +1,114 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue/modules/EmployConfigModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue/modules/EmployConfigModal.Style#Drawer.vue new file mode 100644 index 0000000..279516d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue/modules/EmployConfigModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue/modules/EmployConfigModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue/modules/EmployConfigModal.vue new file mode 100644 index 0000000..ef36d61 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue/modules/EmployConfigModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue3/EmployConfig.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue3/EmployConfig.api.ts new file mode 100644 index 0000000..0ed7b03 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue3/EmployConfig.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/employConfig/employConfig/list', + save='/employConfig/employConfig/add', + edit='/employConfig/employConfig/edit', + deleteOne = '/employConfig/employConfig/delete', + deleteBatch = '/employConfig/employConfig/deleteBatch', + importExcel = '/employConfig/employConfig/importExcel', + exportXls = '/employConfig/employConfig/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue3/EmployConfig.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue3/EmployConfig.data.ts new file mode 100644 index 0000000..97c2c38 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue3/EmployConfig.data.ts @@ -0,0 +1,43 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '参数编码', + align:"center", + dataIndex: 'paramCode' + }, + { + title: '参数值', + align:"center", + dataIndex: 'paramValue' + }, + { + title: '参数描述', + align:"center", + dataIndex: 'paramDescription' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '参数编码', + field: 'paramCode', + component: 'Input', + }, + { + label: '参数值', + field: 'paramValue', + component: 'Input', + }, + { + label: '参数描述', + field: 'paramDescription', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue3/EmployConfigList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue3/EmployConfigList.vue new file mode 100644 index 0000000..327dd6a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue3/EmployConfigList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue3/components/EmployConfigModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue3/components/EmployConfigModal.vue new file mode 100644 index 0000000..6a00bed --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employConfig/vue3/components/EmployConfigModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/controller/EmployScoreController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/controller/EmployScoreController.java index 8d07df3..53f610b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/controller/EmployScoreController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/controller/EmployScoreController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 积分表 * @Author: jeecg-boot - * @Date: 2024-10-21 + * @Date: 2024-10-31 * @Version: V1.0 */ @Api(tags="积分表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/entity/EmployScore.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/entity/EmployScore.java index 203d571..5c4fde6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/entity/EmployScore.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/entity/EmployScore.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 积分表 * @Author: jeecg-boot - * @Date: 2024-10-21 + * @Date: 2024-10-31 * @Version: V1.0 */ @Data @@ -51,10 +51,6 @@ public class EmployScore implements Serializable { @Excel(name = "积分", width = 15) @ApiModelProperty(value = "积分") private java.lang.Double score; - /**积分类型(0-正式 1-临时)*/ - @Excel(name = "积分类型(0-正式 1-临时)", width = 15) - @ApiModelProperty(value = "积分类型(0-正式 1-临时)") - private java.lang.String type; /**关联用户id*/ @Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/mapper/EmployScoreMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/mapper/EmployScoreMapper.java index eee2541..b183c72 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/mapper/EmployScoreMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/mapper/EmployScoreMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 积分表 * @Author: jeecg-boot - * @Date: 2024-10-21 + * @Date: 2024-10-31 * @Version: V1.0 */ public interface EmployScoreMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/service/IEmployScoreService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/service/IEmployScoreService.java index 6a04e94..e1f83cd 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/service/IEmployScoreService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/service/IEmployScoreService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 积分表 * @Author: jeecg-boot - * @Date: 2024-10-21 + * @Date: 2024-10-31 * @Version: V1.0 */ public interface IEmployScoreService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/service/impl/EmployScoreServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/service/impl/EmployScoreServiceImpl.java index 16c91d6..7892b1e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/service/impl/EmployScoreServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/service/impl/EmployScoreServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 积分表 * @Author: jeecg-boot - * @Date: 2024-10-21 + * @Date: 2024-10-31 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/EmployScoreList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/EmployScoreList.vue index 99e7ed7..0c98606 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/EmployScoreList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/EmployScoreList.vue @@ -127,11 +127,6 @@ align:"center", dataIndex: 'score' }, - { - title:'积分类型(0-正式 1-临时)', - align:"center", - dataIndex: 'type' - }, { title:'关联用户id', align:"center", @@ -172,7 +167,6 @@ getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'double',value:'score',text:'积分',dictCode:''}) - fieldList.push({type:'string',value:'type',text:'积分类型(0-正式 1-临时)',dictCode:''}) fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"}) this.superFieldList = fieldList } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/modules/EmployScoreForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/modules/EmployScoreForm.vue index 2d63c48..23e0ac7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/modules/EmployScoreForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue/modules/EmployScoreForm.vue @@ -8,11 +8,6 @@ - - - - - diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue3/EmployScore.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue3/EmployScore.data.ts index cc22411..210b483 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue3/EmployScore.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScore/vue3/EmployScore.data.ts @@ -9,11 +9,6 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'score' }, - { - title: '积分类型(0-正式 1-临时)', - align:"center", - dataIndex: 'type' - }, { title: '关联用户id', align:"center", @@ -30,11 +25,6 @@ export const formSchema: FormSchema[] = [ field: 'score', component: 'InputNumber', }, - { - label: '积分类型(0-正式 1-临时)', - field: 'type', - component: 'Input', - }, { label: '关联用户id', field: 'userId', diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/controller/EmployScoreRecordController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/controller/EmployScoreRecordController.java index 259d666..47037b2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/controller/EmployScoreRecordController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/controller/EmployScoreRecordController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 积分记录表 * @Author: jeecg-boot - * @Date: 2024-10-21 + * @Date: 2024-10-31 * @Version: V1.0 */ @Api(tags="积分记录表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/entity/EmployScoreRecord.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/entity/EmployScoreRecord.java index cdc99c8..d811f90 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/entity/EmployScoreRecord.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/entity/EmployScoreRecord.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 积分记录表 * @Author: jeecg-boot - * @Date: 2024-10-21 + * @Date: 2024-10-31 * @Version: V1.0 */ @Data @@ -54,7 +54,7 @@ public class EmployScoreRecord implements Serializable { /**积分*/ @Excel(name = "积分", width = 15) @ApiModelProperty(value = "积分") - private java.lang.String score; + private java.lang.Double score; /**积分类型(0-收入 1-消耗)*/ @Excel(name = "积分类型(0-收入 1-消耗)", width = 15) @ApiModelProperty(value = "积分类型(0-收入 1-消耗)") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/mapper/EmployScoreRecordMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/mapper/EmployScoreRecordMapper.java index de3c5a2..0792f46 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/mapper/EmployScoreRecordMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/mapper/EmployScoreRecordMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 积分记录表 * @Author: jeecg-boot - * @Date: 2024-10-21 + * @Date: 2024-10-31 * @Version: V1.0 */ public interface EmployScoreRecordMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/service/IEmployScoreRecordService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/service/IEmployScoreRecordService.java index 110cd97..eeedf39 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/service/IEmployScoreRecordService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/service/IEmployScoreRecordService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 积分记录表 * @Author: jeecg-boot - * @Date: 2024-10-21 + * @Date: 2024-10-31 * @Version: V1.0 */ public interface IEmployScoreRecordService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/service/impl/EmployScoreRecordServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/service/impl/EmployScoreRecordServiceImpl.java index 85b7b35..c6fafac 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/service/impl/EmployScoreRecordServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/service/impl/EmployScoreRecordServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 积分记录表 * @Author: jeecg-boot - * @Date: 2024-10-21 + * @Date: 2024-10-31 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/EmployScoreRecordList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/EmployScoreRecordList.vue index 5b8f067..e3064f8 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/EmployScoreRecordList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/EmployScoreRecordList.vue @@ -177,7 +177,7 @@ getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'string',value:'title',text:'积分标题',dictCode:''}) - fieldList.push({type:'string',value:'score',text:'积分',dictCode:''}) + fieldList.push({type:'double',value:'score',text:'积分',dictCode:''}) fieldList.push({type:'string',value:'type',text:'积分类型(0-收入 1-消耗)',dictCode:''}) fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"}) this.superFieldList = fieldList diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/modules/EmployScoreRecordForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/modules/EmployScoreRecordForm.vue index 0146640..4a03ed0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/modules/EmployScoreRecordForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue/modules/EmployScoreRecordForm.vue @@ -10,7 +10,7 @@ - + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue3/EmployScoreRecord.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue3/EmployScoreRecord.data.ts index d1d2c1b..2bdb226 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue3/EmployScoreRecord.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employScoreRecord/vue3/EmployScoreRecord.data.ts @@ -38,7 +38,7 @@ export const formSchema: FormSchema[] = [ { label: '积分', field: 'score', - component: 'Input', + component: 'InputNumber', }, { label: '积分类型(0-收入 1-消耗)', diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/controller/EmployVipTypeController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/controller/EmployVipTypeController.java index 2f2bdea..e5d0219 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/controller/EmployVipTypeController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/controller/EmployVipTypeController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 会员类型表 * @Author: jeecg-boot - * @Date: 2024-10-22 + * @Date: 2024-10-31 * @Version: V1.0 */ @Api(tags="会员类型表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/entity/EmployVipType.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/entity/EmployVipType.java index 4bc2f44..05d50a5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/entity/EmployVipType.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/entity/EmployVipType.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 会员类型表 * @Author: jeecg-boot - * @Date: 2024-10-22 + * @Date: 2024-10-31 * @Version: V1.0 */ @Data @@ -63,4 +63,8 @@ public class EmployVipType implements Serializable { @Excel(name = "专属特权", width = 15) @ApiModelProperty(value = "专属特权") private java.lang.String perquisite; + /**会员类型(0-个人 1-企业)*/ + @Excel(name = "会员类型(0-个人 1-企业)", width = 15) + @ApiModelProperty(value = "会员类型(0-个人 1-企业)") + private java.lang.String type; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/mapper/EmployVipTypeMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/mapper/EmployVipTypeMapper.java index f2f8738..6576c0f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/mapper/EmployVipTypeMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/mapper/EmployVipTypeMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 会员类型表 * @Author: jeecg-boot - * @Date: 2024-10-22 + * @Date: 2024-10-31 * @Version: V1.0 */ public interface EmployVipTypeMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/IEmployVipTypeService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/IEmployVipTypeService.java index bdf756e..5f0c998 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/IEmployVipTypeService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/IEmployVipTypeService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 会员类型表 * @Author: jeecg-boot - * @Date: 2024-10-22 + * @Date: 2024-10-31 * @Version: V1.0 */ public interface IEmployVipTypeService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/impl/EmployVipTypeServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/impl/EmployVipTypeServiceImpl.java index 7cbfefa..bb1ea53 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/impl/EmployVipTypeServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/service/impl/EmployVipTypeServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 会员类型表 * @Author: jeecg-boot - * @Date: 2024-10-22 + * @Date: 2024-10-31 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/EmployVipTypeList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/EmployVipTypeList.vue index e49ce19..84e6c85 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/EmployVipTypeList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/EmployVipTypeList.vue @@ -141,6 +141,11 @@ align:"center", dataIndex: 'perquisite' }, + { + title:'会员类型(0-个人 1-企业)', + align:"center", + dataIndex: 'type' + }, { title: '操作', dataIndex: 'action', @@ -179,6 +184,7 @@ fieldList.push({type:'BigDecimal',value:'price',text:'会员开通金额',dictCode:''}) fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''}) fieldList.push({type:'string',value:'perquisite',text:'专属特权',dictCode:''}) + fieldList.push({type:'string',value:'type',text:'会员类型(0-个人 1-企业)',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/modules/EmployVipTypeForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/modules/EmployVipTypeForm.vue index bde6348..d33f9af 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/modules/EmployVipTypeForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue/modules/EmployVipTypeForm.vue @@ -23,6 +23,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/EmployVipType.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/EmployVipType.data.ts index 7d1dfad..44440cd 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/EmployVipType.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipType/vue3/EmployVipType.data.ts @@ -24,6 +24,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'perquisite' }, + { + title: '会员类型(0-个人 1-企业)', + align:"center", + dataIndex: 'type' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -50,4 +55,9 @@ export const formSchema: FormSchema[] = [ field: 'perquisite', component: 'InputTextArea',//TODO 注意string转换问题 }, + { + label: '会员类型(0-个人 1-企业)', + field: 'type', + component: 'Input', + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java index 5af6465..4f83ff6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java @@ -12,10 +12,10 @@ public interface AppletLoginService { Result appletLogin(LoginReq loginReq); -// /** -// * 微信小程序登录绑定手机号码接口 -// * @param loginReq -// * @return -// */ -// Result bindPhone(LoginReq loginReq); + /** + * 微信小程序登录绑定手机号码接口 + * @param code + * @return + */ + Result bindPhone(String code); } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java index c4aefe2..7c04efb 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java @@ -16,6 +16,12 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; @@ -106,6 +112,66 @@ public class AppletLoginServiceImpl implements AppletLoginService { return result; } + @Transactional(rollbackFor = Exception.class) + @Override + public Result bindPhone(String code) { + try { + String phoneNumber = this.getPhoneNumber(code); + return Result.OK(phoneNumber); + }catch (Exception e){ + return Result.error(e.getMessage()); + } + } + + private static final String API_URL = "https://api.weixin.qq.com/wxa/business/getuserphonenumber"; + public String getPhoneNumber(String code) throws Exception { + URL url = new URL(API_URL + "?access_token=" + this.getAccessToken()); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + conn.setRequestMethod("POST"); + conn.setRequestProperty("Content-Type", "application/json; utf-8"); + conn.setRequestProperty("Accept", "application/json"); + conn.setDoOutput(true); + + JSONObject jsonInput = new JSONObject(); + jsonInput.put("code", code); + + try (DataOutputStream os = new DataOutputStream(conn.getOutputStream())) { + byte[] input = jsonInput.toString().getBytes(StandardCharsets.UTF_8); + os.write(input, 0, input.length); + } + + try (BufferedReader br = new BufferedReader( + new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) { + StringBuilder response = new StringBuilder(); + String responseLine; + while ((responseLine = br.readLine()) != null) { + response.append(responseLine.trim()); + } + //获取手机号码 + return response.toString(); + } + } + + private static final String TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s"; + public String getAccessToken() throws Exception { + String requestUrl = String.format(TOKEN_URL, mpAppId, mpAppSecret); + URL url = new URL(requestUrl); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + conn.setRequestMethod("GET"); + + try (BufferedReader br = new BufferedReader( + new InputStreamReader(conn.getInputStream(), "UTF-8"))) { + StringBuilder response = new StringBuilder(); + String responseLine; + while ((responseLine = br.readLine()) != null) { + response.append(responseLine.trim()); + } + + org.json.JSONObject jsonResponse = new org.json.JSONObject(response.toString()); + return jsonResponse.getString("access_token"); + } + } + // /** // * 微信小程序登录绑定手机号码接口 diff --git a/jeecg-boot-module-system/jeecg-boot-module-system.iml b/jeecg-boot-module-system/jeecg-boot-module-system.iml index 4a1bf6f..23022c4 100644 --- a/jeecg-boot-module-system/jeecg-boot-module-system.iml +++ b/jeecg-boot-module-system/jeecg-boot-module-system.iml @@ -163,6 +163,7 @@ + @@ -323,7 +324,6 @@ - diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/AuthenticationController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/AuthenticationController.java new file mode 100644 index 0000000..70e76ba --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/AuthenticationController.java @@ -0,0 +1,75 @@ +package org.jeecg.modules.api.controller2; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiService.AuthenticationService; +import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; +import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="实名认证相关接口") +@RestController +@RequestMapping("/employ/authentication") +@Slf4j +public class AuthenticationController { + /******************************************************************************************************************/ + //实名认证信息 + @Resource + private AuthenticationService authenticationService; + /******************************************************************************************************************/ + + //我的服务-个人实名认证 + @ApiOperation(value="我的服务-个人实名认证", notes="我的服务-个人实名认证") + @RequestMapping(value = "/addAuthenticationPerson", method = {RequestMethod.POST}) + public Result addAuthenticationPerson(@RequestHeader("X-Access-Token") String token, EmployAuthenticationPerson employAuthenticationPerson){ + String message = null; + //参数校验 + if(null == employAuthenticationPerson.getCerNo()){ + message = "证件号码为空，请输入正确的证件号码"; + }else if(null == employAuthenticationPerson.getName()){ + message = "姓名为空，请输入姓名"; + }else if(null == employAuthenticationPerson.getPhone()){ + message = "联系方式为空，请输入手机号码"; + } + //参数输入有误，返回错误信息 + if(null != message){ + return Result.OK(message); + } + + //业务处理 + return authenticationService.addAuthenticationPerson(token, employAuthenticationPerson); + } + + //我的服务-企业实名认证 + @ApiOperation(value="我的服务-企业实名认证", notes="我的服务-企业实名认证") + @RequestMapping(value = "/addAuthenticationCompany", method = {RequestMethod.POST}) + public Result addAuthenticationCompany(@RequestHeader("X-Access-Token") String token, EmployAhthenticationCompany employAhthenticationCompany){ + String message = null; + //参数校验 + if(null == employAhthenticationCompany.getBusinessLicense()){ + message = "营业执照未上传，请上传营业执照"; + }else if(null == employAhthenticationCompany.getCompanyName()){ + message = "企业名称为空，请填写企业名称"; + }else if(null == employAhthenticationCompany.getLegalPerson()){ + message = "法定代表人姓名为空，请填写法定代表人姓名"; + }else if(null == employAhthenticationCompany.getCompanyAddress()){ + message = "企业地址为空，请填写企业地址"; + } + //参数输入有误，返回错误信息 + if(null != message){ + return Result.OK(message); + } + + //业务处理 + return authenticationService.addAuthenticationCompany(token, employAhthenticationCompany); + } + + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/CheckController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/CheckController.java new file mode 100644 index 0000000..95e7d47 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/CheckController.java @@ -0,0 +1,58 @@ +package org.jeecg.modules.api.controller2; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.CheckService; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="查看记录相关接口") +@RestController +@RequestMapping("/employ/check") +@Slf4j +public class CheckController { + + + /******************************************************************************************************************/ + //查看记录信息 + @Resource + private CheckService checkService; + /******************************************************************************************************************/ + + //会员中心-联系记录-我看过谁(我的招工) + @ApiOperation(value="会员中心-联系记录-我看过谁", notes="会员中心-联系记录-我看过谁") + @RequestMapping(value = "/queryWatchWhoBoss", method = {RequestMethod.GET}) + public Result queryWatchWhoBoss(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ + return checkService.queryWatchWhoBoss(token, pageBean); + } + + //会员中心-联系记录-谁看过我(谁看过我的招工) + @ApiOperation(value="会员中心-联系记录-谁看过我(谁看过我的招工)", notes="会员中心-联系记录-谁看过我(谁看过我的招工)") + @RequestMapping(value = "/queryWatchMeBoss", method = {RequestMethod.GET}) + public Result queryWatchMeBoss(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ + return checkService.queryWatchMeBoss(token, pageBean); + } + + //会员中心-联系记录-我看过谁 + @ApiOperation(value="会员中心-联系记录-我看过谁", notes="会员中心-联系记录-我看过谁") + @RequestMapping(value = "/queryWatchWhoEmployee", method = {RequestMethod.GET}) + public Result queryWatchWhoEmployee(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ + return checkService.queryWatchWhoEmployee(token, pageBean); + } + + //会员中心-联系记录-我看过谁 + @ApiOperation(value="会员中心-联系记录-谁看过我(谁看过我的简历)", notes="会员中心-联系记录-谁看过我(谁看过我的简历)") + @RequestMapping(value = "/queryWatchMeEmployee", method = {RequestMethod.GET}) + public Result queryWatchMeEmployee(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ + return checkService.queryWatchMeEmployee(token, pageBean); + } + + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/CollectionController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/CollectionController.java new file mode 100644 index 0000000..72f0fc1 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/CollectionController.java @@ -0,0 +1,42 @@ +package org.jeecg.modules.api.controller2; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.CollectionService; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="收藏信息相关接口") +@RestController +@RequestMapping("/employ/collection") +@Slf4j +public class CollectionController { + + /******************************************************************************************************************/ + //收藏信息 + @Resource + private CollectionService collectionService; + /******************************************************************************************************************/ + + //会员中心-我的收藏 + @ApiOperation(value="我的收藏-收藏工作信息", notes="我的收藏-收藏工作信息") + @RequestMapping(value = "/queryJobCollectionList", method = {RequestMethod.GET}) + public Result queryJobCollectionList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ + return collectionService.queryJobCollectionList(token, pageBean); + } + + //会员中心-我的收藏 + @ApiOperation(value="我的收藏-收藏简历信息", notes="我的收藏-收藏简历信息") + @RequestMapping(value = "/queryResumeCollectionList", method = {RequestMethod.GET}) + public Result queryResumeCollectionList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ + return collectionService.queryResumeCollectionList(token, pageBean); + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/CompanyController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/CompanyController.java new file mode 100644 index 0000000..9dcdaad --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/CompanyController.java @@ -0,0 +1,31 @@ +package org.jeecg.modules.api.controller2; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +@Api(tags="企业信息相关接口") +@RestController +@RequestMapping("/employ/company") +@Slf4j +public class CompanyController { + + //修改个人信息 + @ApiOperation(value="查看企业信息", notes="查看企业信息") + @RequestMapping(value = "/updateUser", method = {RequestMethod.GET}) + public Result queryUser(){ + return null; + } + + //修改个人信息 + @ApiOperation(value="修改企业信息", notes="修改企业信息") + @RequestMapping(value = "/updateUser", method = {RequestMethod.POST}) + public Result updateUser(){ + return null; + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ConfigController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ConfigController.java new file mode 100644 index 0000000..8c82241 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ConfigController.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.api.controller2; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.ConfigService; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="配置信息相关接口") +@RestController +@RequestMapping("/employ/config") +@Slf4j +public class ConfigController { + + /******************************************************************************************************************/ + //配置信息 + @Resource + private ConfigService configService; + /******************************************************************************************************************/ + + @ApiOperation(value="配置信息-获取配置信息列表", notes="配置信息-获取配置信息列表") + @RequestMapping(value = "/aboutUs", method = {RequestMethod.GET}) + public Result queryConfigList(PageBean pageBean){ + return configService.queryConfigList(pageBean); + } + + @ApiOperation(value="配置信息-根据配置编码获取配置信息", notes="配置信息-根据配置编码获取配置信息") + @RequestMapping(value = "/queryConfig", method = {RequestMethod.GET}) + public Result queryConfig(String paramCode){ + return configService.queryConfig(paramCode); + } + + //获取banner图列表带分页 + @ApiOperation(value="首页-获取banner图列表", notes="0-首页 1-会员中心") + @RequestMapping(value = "/queryBannerList", method = {RequestMethod.GET}) + public Result queryBannerList(String bannerCategoryType, PageBean pageBean){ + return configService.queryBannerList(bannerCategoryType, pageBean); + } + + //获取工种列表 + @ApiOperation(value="首页-获取工种列表", notes="首页-获取工种列表") + @RequestMapping(value = "/queryJobTypeList", method = {RequestMethod.GET}) + public Result queryJobTypeList(PageBean pageBean){ + return configService.queryJobTypeList(pageBean); + } + + //获取工作性质列表 + @ApiOperation(value="首页-获取工作性质列表", notes="首页-获取工作性质列表") + @RequestMapping(value = "/queryJobNatureList", method = {RequestMethod.GET}) + public Result queryJobNatureList(PageBean pageBean){ + return configService.queryJobNatureList(pageBean); + } + + //获取地址列表 + @ApiOperation(value="首页-获取地址列表", notes="首页-获取地址列表") + @RequestMapping(value = "/queryAddressList", method = {RequestMethod.GET}) + public Result queryAddressList(PageBean pageBean){ + return configService.queryAddressList(pageBean); + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ContractController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ContractController.java new file mode 100644 index 0000000..1c323c4 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ContractController.java @@ -0,0 +1,43 @@ +package org.jeecg.modules.api.controller2; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.ContractService; +import org.jeecg.modules.employContract.entity.EmployContract; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="电子合同信息相关接口") +@RestController +@RequestMapping("/employ/contract") +@Slf4j +public class ContractController { + + /******************************************************************************************************************/ + //电子合同信息 + @Resource + private ContractService contractService; + /******************************************************************************************************************/ + + //我的服务-电子合同 + @ApiOperation(value="电子合同-获取电子合同列表", notes="电子合同-获取电子合同列表") + @RequestMapping(value = "/queryContractList", method = {RequestMethod.GET}) + public Result queryContractBossList(@RequestHeader("X-Access-Token")String token, EmployContract employContract, PageBean pageBean){ + return contractService.queryContractList(token, employContract, pageBean); + } + + //我的服务-电子合同 + @ApiOperation(value="电子合同-根据id查询电子合同详情", notes="电子合同-根据id查询电子合同详情") + @RequestMapping(value = "/queryContracById", method = {RequestMethod.GET}) + public Result queryContracById(@RequestHeader("X-Access-Token") String token, String contractId){ + return contractService.queryContracById(token, contractId); + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ExaminationController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ExaminationController.java new file mode 100644 index 0000000..fb4910e --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ExaminationController.java @@ -0,0 +1,51 @@ +package org.jeecg.modules.api.controller2; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.ExaminationService; +import org.jeecg.modules.employRedister.entity.EmployRedister; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="考证咨询相关接口") +@RestController +@RequestMapping("/employ/examination") +@Slf4j +public class ExaminationController { + + /******************************************************************************************************************/ + //工作信息 + @Resource + private ExaminationService examinationService; + /******************************************************************************************************************/ + + //考证咨询-证书查询 + @ApiOperation(value="考证咨询-证书查询", notes="考证咨询-证书查询") + @RequestMapping(value = "/queryCert", method = {RequestMethod.GET}) + public Result queryCert(PageBean pageBean){ + return examinationService.queryCertList(pageBean); + } + + //考证咨询-提交报名材料 + @ApiOperation(value="考证咨询-提交报名材料", notes="考证咨询-提交报名材料") + @RequestMapping(value = "/addMaterial", method = {RequestMethod.POST}) + public Result addMaterial(@RequestHeader("X-Access-Token") String token, EmployRedister employRedister){ + return examinationService.addMaterial(token, employRedister); + } + + //考证咨询-联系客服 + @ApiOperation(value="考证咨询-联系客服", notes="考证咨询-联系客服") + @RequestMapping(value = "/queryWorker", method = {RequestMethod.GET}) + public Result queryWorker(){ + return Result.OK("客服电话","17777777777"); + } + + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ExchangeController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ExchangeController.java new file mode 100644 index 0000000..146b7ed --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ExchangeController.java @@ -0,0 +1,22 @@ +package org.jeecg.modules.api.controller2; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +@Api(tags="兑换码相关接口") +@RestController +@RequestMapping("/employ/exchange") +@Slf4j +public class ExchangeController { + //我的服务-面对面分享 + @ApiOperation(value="我的服务-兑换码", notes="我的服务-兑换码") + @RequestMapping(value = "/addExchange", method = {RequestMethod.POST}) + public Result addShare(){ + return null; + } +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/JobController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/JobController.java new file mode 100644 index 0000000..8ff2d18 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/JobController.java @@ -0,0 +1,64 @@ +package org.jeecg.modules.api.controller2; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.JobService; +import org.jeecg.modules.employJob.entity.EmployJob; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="工作信息相关接口") +@RestController +@RequestMapping("/employ/job") +@Slf4j +public class JobController { + + /******************************************************************************************************************/ + //工作信息 + @Resource + private JobService jobService; + /******************************************************************************************************************/ + //查看工作列表 + @ApiOperation(value="首页-查询工作信息列表", notes="首页-查询工作信息列表") + @RequestMapping(value = "/queryJobList", method = {RequestMethod.GET}) + public Result queryJobList(EmployJob employJob, PageBean pageBean){ + return jobService.queryJobList(employJob, pageBean); + } + + //首页-根据Id查看工作详情 + @ApiOperation(value="首页-根据Id查看工作详情", notes="首页-根据Id查看工作详情") + @RequestMapping(value = "/queryJobById", method = {RequestMethod.GET}) + public Result queryJobById(String token, String jobId){ + return jobService.queryJobById(token, jobId); + } + + //会员中心-我的招工 + @ApiOperation(value="会员中心-我的招工", notes="会员中心-我的招工") + @RequestMapping(value = "/queryJobListByUserId", method = {RequestMethod.GET}) + public Result queryJobListByUserId(@RequestHeader("X-Access-Token")String token, PageBean pageBean){ + return jobService.queryJobListByUserId(token, pageBean); + } + + //添加工作信息 + @ApiOperation(value="首页-添加工作信息", notes="首页-添加工作信息") + @RequestMapping(value = "/addJob", method = {RequestMethod.POST}) + public Result addJob(String token, EmployJob employJob){ + return jobService.addJob(token, employJob); + } + + //修改工作信息 + @ApiOperation(value="首页-修改工作信息", notes="首页-修改工作信息") + @RequestMapping(value = "/updateJob", method = {RequestMethod.POST}) + public Result updateJob(String token, EmployJob employJob){ + return jobService.updateJob(token, employJob); + } + + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/NotebookController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/NotebookController.java new file mode 100644 index 0000000..16d9388 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/NotebookController.java @@ -0,0 +1,113 @@ +package org.jeecg.modules.api.controller2; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.NotebookService; +import org.jeecg.modules.employBillInfo.entity.EmployBillInfo; +import org.jeecg.modules.employFeedback.entity.EmployFeedback; +import org.jeecg.modules.employNotebook.entity.EmployNotebook; +import org.jeecg.modules.employWorkInfo.entity.EmployWorkInfo; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="记工记账相关接口") +@RestController +@RequestMapping("/employ/notebook") +@Slf4j +public class NotebookController { + + /******************************************************************************************************************/ + //记工记账信息 + @Resource + private NotebookService notebookService; + /******************************************************************************************************************/ + + //个人记工-新建账本 + @ApiOperation(value="记工记账-新建账本", notes="Type：0-个人 1-班组") + @RequestMapping(value = "/addNoteBook", method = {RequestMethod.POST}) + public Result addNoteBook(@RequestHeader("X-Access-Token") String token, EmployNotebook employNotebook){ + return notebookService.addNoteBook(token, employNotebook); + } + + //个人记工-账本信息修改 + @ApiOperation(value="记工记账-账本信息修改", notes="记工记账-账本信息修改") + @RequestMapping(value = "/updateNoteBook", method = {RequestMethod.POST}) + public Result updateNoteBook(@RequestHeader("X-Access-Token") String token, EmployNotebook employNotebook){ + return notebookService.updateNoteBook(token, employNotebook); + } + + @ApiOperation(value="记工记账-在建/结束项目", notes="Type：0-个人 1-班组， status: 0-在建项目 1-结束项目") + @RequestMapping(value = "/queryNotebookList", method = {RequestMethod.GET}) + public Result queryNotebookList(@RequestHeader("X-Access-Token") String token, String type, String status, PageBean pageBean){ + return notebookService.queryNotebookList(token, type, status, pageBean); + } + + //个人记工-全年收支 + @ApiOperation(value="记工记账-全年收支", notes="记工记账-全年收支") + @RequestMapping(value = "/queryBill", method = {RequestMethod.GET}) + public Result queryBill(@RequestHeader("X-Access-Token") String token, String employNoteBookId, PageBean pageBean){ + return notebookService.queryBill(token, employNoteBookId, pageBean); + } + + //个人记工-技工问题 + @ApiOperation(value="记工记账-技工问题", notes="记工记账-技工问题") + @RequestMapping(value = "/addQuestion", method = {RequestMethod.POST}) + public Result addQuestion(@RequestHeader("X-Access-Token") String token, EmployFeedback employFeedback){ + return notebookService.addQuestion(token, employFeedback); + } + + @ApiOperation(value="记工记账-项目记账", notes="记工记账-项目记账") + @RequestMapping(value = "/addBillInfo", method = {RequestMethod.POST}) + public Result addBillInfo(@RequestHeader("X-Access-Token") String token, EmployBillInfo employBillInfo){ + String message = null; + //参数校验 + if(null == employBillInfo.getNotebookId()){ + message = "账本id为空，请输入正确的账本id"; + }else if(null == employBillInfo.getAmount()){ + message = "记账金额为空，请输入金额"; + }else if(null == employBillInfo.getBillDate()){ + message = "记账日期为空，请输入记账日期"; + }else if(null == employBillInfo.getType()){ + message = "记账类型为空，请输入记账类型"; + } + //参数输入有误，返回错误信息 + if(null != message){ + return Result.OK(message); + } + + //业务处理 + return notebookService.addBillInfo(token, employBillInfo); + } + + @ApiOperation(value="记工记账-项目记工", notes="记工记账-项目记工") + @RequestMapping(value = "/addWorkInfo", method = {RequestMethod.POST}) + public Result addWorkInfo(@RequestHeader("X-Access-Token") String token, EmployWorkInfo employWorkInfo){ + String message = null; + //参数校验 + if(null == employWorkInfo.getNotebookId()){ + message = "账本id为空，请输入正确的账本id"; + }else if(null == employWorkInfo.getType()){ + message = "工作类型为空，请输入工作类型"; + }else if(null == employWorkInfo.getOvertime()){ + message = "加班时长为空，请输入加班时长"; + }else if(null == employWorkInfo.getWorkDate()){ + message = "记工日期为空，请输入记工日期"; + } + + //参数输入有误，返回错误信息 + if(null != message){ + return Result.OK(message); + } + + //业务处理 + return notebookService.addWorkInfo(token, employWorkInfo); + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ResumeController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ResumeController.java new file mode 100644 index 0000000..889a930 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ResumeController.java @@ -0,0 +1,63 @@ +package org.jeecg.modules.api.controller2; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.ResumeService; +import org.jeecg.modules.employResume.entity.EmployResume; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="简历信息相关接口") +@RestController +@RequestMapping("/employ/resume") +@Slf4j +public class ResumeController { + + /******************************************************************************************************************/ + //简历信息 + @Resource + private ResumeService resumeService; + /******************************************************************************************************************/ + //查看工作列表 + @ApiOperation(value="首页-查询简历信息列表", notes="首页-查询简历信息列表") + @RequestMapping(value = "/queryResumeList", method = {RequestMethod.GET}) + public Result queryResumeList(EmployResume employResume, PageBean pageBean){ + return resumeService.queryResumeList(employResume, pageBean); + } + + //首页-根据Id查看工作详情 + @ApiOperation(value="首页-根据Id查看简历详情", notes="首页-根据Id查看简历详情") + @RequestMapping(value = "/queryResumeById", method = {RequestMethod.GET}) + public Result queryResumeById(String token, String jobId){ + return resumeService.queryResumeById(token, jobId); + } + + //会员中心-我的简历 + @ApiOperation(value="会员中心-我的简历", notes="会员中心-我的简历") + @RequestMapping(value = "/queryResumeByUserId", method = {RequestMethod.GET}) + public Result queryResumeByUserId(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ + return resumeService.queryResumeByUserId(token, pageBean); + } + + //添加工作信息 + @ApiOperation(value="首页-添加简历信息", notes="首页-添加简历信息") + @RequestMapping(value = "/addResume", method = {RequestMethod.POST}) + public Result addResume(String token, EmployResume employResume){ + return resumeService.addResume(token, employResume); + } + + //修改工作信息 + @ApiOperation(value="首页-修改简历信息", notes="首页-修改简历信息") + @RequestMapping(value = "/updateResume", method = {RequestMethod.POST}) + public Result updateResume(String token, EmployResume employResume){ + return resumeService.updateResume(token, employResume); + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ScoreController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ScoreController.java new file mode 100644 index 0000000..c13cf81 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ScoreController.java @@ -0,0 +1,56 @@ +package org.jeecg.modules.api.controller2; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.ScoreService; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="积分信息相关接口") +@RestController +@RequestMapping("/employ/score") +@Slf4j +public class ScoreController { + + /******************************************************************************************************************/ + //积分信息 + @Resource + private ScoreService scoreService; + /******************************************************************************************************************/ + + //会员中心-我的积分 + @ApiOperation(value="会员中心-我的积分", notes="会员中心-我的积分") + @RequestMapping(value = "/queryScore", method = {RequestMethod.GET}) + public Result queryScore(@RequestHeader("X-Access-Token") String token){ + return scoreService.queryScore(token); + } + + //会员中心-积分记录 + @ApiOperation(value="会员中心-积分记录", notes="type：0-收入 1-消耗") + @RequestMapping(value = "/queryScoreRecord", method = {RequestMethod.GET}) + public Result queryScoreRecord(@RequestHeader("X-Access-Token") String token, String type, PageBean pageBean){ + return scoreService.queryScoreRecord(token, type, pageBean); + } + + //我的服务-获取积分-邀请工友获取积分 + @ApiOperation(value="我的服务-获取积分-邀请工友获取积分", notes="我的服务-获取积分-邀请工友获取积分") + @RequestMapping(value = "/addScoreByShare", method = {RequestMethod.POST}) + public Result addScoreByShare(@RequestHeader("X-Access-Token") String token, String score){ + return scoreService.addScoreByShare(token, score); + } + + //我的服务-获取积分-每日签到获取积分 + @ApiOperation(value="我的服务-获取积分-每日签到获取积分", notes="我的服务-获取积分-每日签到获取积分") + @RequestMapping(value = "/addScoreBySign", method = {RequestMethod.POST}) + public Result addScoreBySign(@RequestHeader("X-Access-Token") String token, Double score){ + return scoreService.addScoreBySign(token, score); + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ShareController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ShareController.java new file mode 100644 index 0000000..e436e16 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/ShareController.java @@ -0,0 +1,34 @@ +package org.jeecg.modules.api.controller2; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiService.ScoreService; +import org.jeecg.modules.apiService.ShareService; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="面对面分享相关接口") +@RestController +@RequestMapping("/employ/share") +@Slf4j +public class ShareController { + + /******************************************************************************************************************/ + //积分信息 + @Resource + private ShareService shareService; + /******************************************************************************************************************/ + + //我的服务-面对面分享 + @ApiOperation(value="我的服务-面对面分享", notes="我的服务-面对面分享") + @RequestMapping(value = "/getInviteCode", method = {RequestMethod.POST}) + public Result getInviteCode(String token){ + return shareService.getInviteCode(token); + } + +} \ No newline at end of file diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/UserController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/UserController.java new file mode 100644 index 0000000..67ec250 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/UserController.java @@ -0,0 +1,31 @@ +package org.jeecg.modules.api.controller2; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +@Api(tags="个人信息相关接口") +@RestController +@RequestMapping("/employ/user") +@Slf4j +public class UserController { + + //修改个人信息 + @ApiOperation(value="查看个人信息", notes="查看个人信息") + @RequestMapping(value = "/updateUser", method = {RequestMethod.GET}) + public Result queryUser(){ + return null; + } + + //修改个人信息 + @ApiOperation(value="修改个人信息", notes="修改个人信息") + @RequestMapping(value = "/updateUser", method = {RequestMethod.POST}) + public Result updateUser(){ + return null; + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/VipController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/VipController.java new file mode 100644 index 0000000..5ad5e2d --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/VipController.java @@ -0,0 +1,34 @@ +package org.jeecg.modules.api.controller2; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiService.ShareService; +import org.jeecg.modules.apiService.VipService; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="VIP相关接口") +@RestController +@RequestMapping("/employ/vip") +@Slf4j +public class VipController { + + /******************************************************************************************************************/ + //积分信息 + @Resource + private VipService vipService; + /******************************************************************************************************************/ + + //开通VIP + @ApiOperation(value="开通VIP", notes="开通VIP") + @RequestMapping(value = "/addVIP", method = {RequestMethod.POST}) + public Result addVIP(String token){ + return vipService.addVIP(token); + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/BossApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/BossApiController.java index dd5283a..51e01d5 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/BossApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/BossApiController.java @@ -56,13 +56,26 @@ public class BossApiController { return bossApiService.queryJobCollectionList(token, pageBean); } - //会员中心-联系记录-我看过谁(我的招工) + @ApiOperation(value="会员中心-我的收藏(数量统计)", notes="会员中心-我的收藏(数量统计)") + @RequestMapping(value = "/queryCollectionCount", method = {RequestMethod.GET}) + public Result queryCollectionCount(@RequestHeader("X-Access-Token") String token){ + return bossApiService.queryJobCollectionCount(token); + } + + //会员中心-联系记录-我看过谁 @ApiOperation(value="会员中心-联系记录-我看过谁", notes="会员中心-联系记录-我看过谁") @RequestMapping(value = "/queryWatchWho", method = {RequestMethod.GET}) public Result queryWatchWho(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ return bossApiService.queryWatchWho(token, pageBean); } + //会员中心-联系记录-我看过谁(数量统计) + @ApiOperation(value="会员中心-联系记录-我看过谁(数量统计)", notes="会员中心-联系记录-我看过谁(数量统计)") + @RequestMapping(value = "/queryWatchWhoCount", method = {RequestMethod.GET}) + public Result queryWatchWhoCount(@RequestHeader("X-Access-Token") String token){ + return bossApiService.queryWatchWhoCount(token); + } + //会员中心-联系记录-谁看过我(谁看过我的招工) @ApiOperation(value="会员中心-联系记录-谁看过我(谁看过我的招工)", notes="会员中心-联系记录-谁看过我(谁看过我的招工)") @RequestMapping(value = "/queryWatchMe", method = {RequestMethod.GET}) @@ -70,6 +83,13 @@ public class BossApiController { return bossApiService.queryWatchMe(token, pageBean); } + //会员中心-联系记录-谁看过我(数量统计) + @ApiOperation(value="会员中心-联系记录-谁看过我(数量统计)", notes="会员中心-联系记录-谁看过我(数量统计)") + @RequestMapping(value = "/queryWatchMeCount", method = {RequestMethod.GET}) + public Result queryWatchMeCount(@RequestHeader("X-Access-Token") String token){ + return bossApiService.queryWatchMeCount(token); + } + //会员中心-我的招工 @ApiOperation(value="会员中心-我的招工", notes="会员中心-我的招工") @RequestMapping(value = "/queryJobListByUserId", method = {RequestMethod.GET}) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java index f257697..4412495 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java @@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.CommonApiService; +import org.jeecg.modules.apiService.ShareService; import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson; import org.jeecg.modules.employBillInfo.entity.EmployBillInfo; @@ -30,6 +31,9 @@ public class CommonApiController { @Resource private CommonApiService commonApiService; + //面对面分享 + @Resource + private ShareService shareService; /***************首页***************/ //获取banner图列表带分页 @ApiOperation(value="首页-获取banner图列表", notes="0-首页 1-会员中心") @@ -143,8 +147,8 @@ public class CommonApiController { /***************会员中心***************/ - //会员中心-正式积分||临时积分 - @ApiOperation(value="会员中心-正式积分||临时积分", notes="正式积分||临时积分||当前积分") + //会员中心-我的积分 + @ApiOperation(value="会员中心-我的积分", notes="会员中心-我的积分") @RequestMapping(value = "/queryScore", method = {RequestMethod.GET}) public Result queryScore(@RequestHeader("X-Access-Token") String token){ return commonApiService.queryScore(token); @@ -158,10 +162,10 @@ public class CommonApiController { } //我的服务-获取VIP信息 - @ApiOperation(value="我的服务-获取VIP配置信息", notes="我的服务-获取VIP配置信息") + @ApiOperation(value="我的服务-获取VIP配置信息", notes="type: 0-个人 1-企业") @RequestMapping(value = "/queryVipType", method = {RequestMethod.GET}) - public Result queryVipType(PageBean pageBean){ - return commonApiService.queryVipType(pageBean); + public Result queryVipType(String type, PageBean pageBean){ + return commonApiService.queryVipType(type, pageBean); } //我的服务-会员充值(开通VIP) @@ -171,18 +175,18 @@ public class CommonApiController { return commonApiService.addVip(token, employVipUser); } - //我的服务-获取积分-充值积分 - @ApiOperation(value="我的服务-获取积分-充值积分", notes="我的服务-获取积分-充值积分") - @RequestMapping(value = "/addScoreByRecharge", method = {RequestMethod.POST}) - public Result addScoreByRecharge(@RequestHeader("X-Access-Token") String token, String score, String type){ - return commonApiService.addScoreByRecharge(token, score, type); - } - //我的服务-获取积分-邀请工友获取积分 @ApiOperation(value="我的服务-获取积分-邀请工友获取积分", notes="我的服务-获取积分-邀请工友获取积分") @RequestMapping(value = "/addScoreByShare", method = {RequestMethod.POST}) - public Result addScoreByShare(){ - return null; + public Result addScoreByShare(@RequestHeader("X-Access-Token") String token, String score){ + return commonApiService.addScoreByShare(token, score); + } + + //我的服务-获取积分-每日签到获取积分 + @ApiOperation(value="我的服务-获取积分-每日签到获取积分", notes="我的服务-获取积分-每日签到获取积分") + @RequestMapping(value = "/addScoreBySign", method = {RequestMethod.POST}) + public Result addScoreBySign(@RequestHeader("X-Access-Token") String token, Double score){ + return commonApiService.addScoreBySign(token, score); } //我的服务-个人实名认证 @@ -230,14 +234,20 @@ public class CommonApiController { //业务处理 return commonApiService.addAuthenticationCompany(token, employAhthenticationCompany); } -// -// //我的服务-兑换码 -// @ApiOperation(value="我的服务-兑换码", notes="我的服务-兑换码") -// @RequestMapping(value = "/addExchange", method = {RequestMethod.POST}) -// public Result addExchange(){ -// return null; -// } -// + + //我的服务-兑换码 + @ApiOperation(value="我的服务-兑换码", notes="我的服务-兑换码") + @RequestMapping(value = "/addExchange", method = {RequestMethod.POST}) + public Result addExchange(){ + return null; + } + + //我的服务-面对面分享 + @ApiOperation(value="我的服务-面对面分享", notes="我的服务-面对面分享") + @RequestMapping(value = "/getInviteCode", method = {RequestMethod.POST}) + public Result getInviteCode(String token){ + return shareService.getInviteCode(token); + } // /***************设置与帮助***************/ // //系统设置-切换账号 // @ApiOperation(value="系统设置-切换账号", notes="系统设置-切换账号") @@ -245,28 +255,6 @@ public class CommonApiController { // public Result changeAccount(){ // return null; // } -// -// //系统设置-修改密码 -// @ApiOperation(value="系统设置-修改密码", notes="系统设置-修改密码") -// @RequestMapping(value = "/updatePassword", method = {RequestMethod.GET}) -// public Result updatePassword(){ -// return null; -// } -// -// //系统设置-清理缓存 -// @ApiOperation(value="系统设置-清理缓存", notes="系统设置-清理缓存") -// @RequestMapping(value = "/clearCache", method = {RequestMethod.GET}) -// public Result clearCache(){ -// return null; -// } -// -// //系统设置-版本更新 -// @ApiOperation(value="系统设置-版本更新", notes="系统设置-版本更新") -// @RequestMapping(value = "/updateVersion", method = {RequestMethod.GET}) -// public Result updateVersion(){ -// return null; -// } -// // //系统设置-退出登录 // @ApiOperation(value="系统设置-退出登录", notes="系统设置-退出登录") // @RequestMapping(value = "/loginOut", method = {RequestMethod.GET}) @@ -282,7 +270,8 @@ public class CommonApiController { // } // // //帮助与反馈 -// @ApiOperation(value="帮助与反馈", notes="帮助与反馈") +// @ApiOperation(value="帮助与反馈", notes="帮助与 +// 反馈") // @RequestMapping(value = "/help", method = {RequestMethod.GET}) // public Result help(){ // return null; @@ -292,10 +281,7 @@ public class CommonApiController { @ApiOperation(value="关于本程序", notes="关于本程序") @RequestMapping(value = "/aboutUs", method = {RequestMethod.GET}) public Result aboutUs(){ - return null; + return Result.OK("招聘小程序"); } - - - } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/EmployeeApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/EmployeeApiController.java index 9d73426..7b8df5e 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/EmployeeApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/EmployeeApiController.java @@ -9,6 +9,7 @@ import org.jeecg.modules.apiService.EmployeeApiService; import org.jeecg.modules.employContract.entity.EmployContract; import org.jeecg.modules.employJob.entity.EmployJob; import org.jeecg.modules.employRedister.entity.EmployRedister; +import org.jeecg.modules.employResume.entity.EmployResume; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -50,6 +51,28 @@ public class EmployeeApiController { return Result.OK("接口内容暂未处理"); } + /***************个人简历***************/ + //个人中心-我的简历 + @ApiOperation(value="个人中心-我的简历", notes="个人中心-我的简历") + @RequestMapping(value = "/queryResume", method = {RequestMethod.GET}) + public Result queryResume(String token){ + return employeeApiService.queryResume(token); + } + + //个人中心-修改简历 + @ApiOperation(value="个人中心-添加简历", notes="个人中心-添加简历") + @RequestMapping(value = "/addResume", method = {RequestMethod.POST}) + public Result addResume(String token, EmployResume employResume){ + return employeeApiService.addResume(token, employResume); + } + + //个人中心-修改简历 + @ApiOperation(value="个人中心-修改简历", notes="个人中心-修改简历") + @RequestMapping(value = "/updateResume", method = {RequestMethod.POST}) + public Result updateResume(String token, EmployResume employResume){ + return employeeApiService.updateResume(token, employResume); + } + /***************考证咨询***************/ //考证咨询-证书查询 @ApiOperation(value="考证咨询-证书查询", notes="考证咨询-证书查询") @@ -80,6 +103,12 @@ public class EmployeeApiController { return employeeApiService.queryJobCollectionList(token, pageBean); } + @ApiOperation(value="会员中心-我的收藏(数量统计)", notes="会员中心-我的收藏(数量统计)") + @RequestMapping(value = "/queryCollectionCount", method = {RequestMethod.GET}) + public Result queryCollectionCount(@RequestHeader("X-Access-Token") String token){ + return employeeApiService.queryJobCollectionCount(token); + } + //会员中心-联系记录-我看过谁 @ApiOperation(value="会员中心-联系记录-我看过谁", notes="会员中心-联系记录-我看过谁") @RequestMapping(value = "/queryWatchWho", method = {RequestMethod.GET}) @@ -87,13 +116,26 @@ public class EmployeeApiController { return employeeApiService.queryWatchWho(token, pageBean); } - //会员中心-联系记录-我看过谁 - @ApiOperation(value="会员中心-联系记录-谁看过我(谁看过我的简历)", notes="会员中心-联系记录-谁看过我(谁看过我的简历)") + @ApiOperation(value="会员中心-联系记录-我看过谁(数量统计)", notes="会员中心-联系记录-我看过谁(数量统计)") + @RequestMapping(value = "/queryWatchWhoCount", method = {RequestMethod.GET}) + public Result queryWatchWhoCount(@RequestHeader("X-Access-Token") String token){ + return employeeApiService.queryWatchWhoCount(token); + } + + //会员中心-联系记录-谁看过我 + @ApiOperation(value="会员中心-联系记录-谁看过我", notes="会员中心-联系记录-谁看过我的简历") @RequestMapping(value = "/queryWatchMe", method = {RequestMethod.GET}) public Result queryWatchMe(@RequestHeader("X-Access-Token") String token, PageBean pageBean){ return employeeApiService.queryWatchMe(token, pageBean); } + //会员中心-联系记录-谁看过我 + @ApiOperation(value="会员中心-联系记录-谁看过我(数量统计)", notes="会员中心-联系记录-谁看过我(数量统计)") + @RequestMapping(value = "/queryWatchMeCount", method = {RequestMethod.GET}) + public Result queryWatchMeCount(@RequestHeader("X-Access-Token") String token){ + return employeeApiService.queryWatchMeCount(token); + } + //会员中心-我的找活 @ApiOperation(value="会员中心-我的找活", notes="会员中心-我的找活") @RequestMapping(value = "/queryResumeByUserId", method = {RequestMethod.GET}) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/LoginApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/LoginApiController.java index 45e078a..ed8beed 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/LoginApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/LoginApiController.java @@ -6,6 +6,8 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.apiService.LoginApiService; import org.jeecg.modules.bean.LoginReq; +import org.jeecg.modules.service.AppletLoginService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -18,10 +20,13 @@ import javax.annotation.Resource; @Slf4j public class LoginApiController { - //授权登录 + //微信授权登录 @Resource private LoginApiService loginApiService; + //绑定手机号码 + @Autowired + private AppletLoginService appletLoginService; //小程序授权登录 @ApiOperation(value="小程序-登录接口", notes="小程序-登录接口") @@ -30,20 +35,11 @@ public class LoginApiController { return loginApiService.login(loginReq); } - //获取用户协议 - @ApiOperation(value="小程序-获取用户协议", notes="小程序-获取用户协议") - @GetMapping("/getUserAgreement") - public Result getUserAgreement(){ - return loginApiService.getUserAgreement(); + //绑定手机号码 + @ApiOperation(value="绑定手机号码", notes="绑定手机号码") + @GetMapping(value = "/bindPhone") + public Result bindPhone(String phoneCode){ + return appletLoginService.bindPhone(phoneCode); } - - //获取隐私政策 - @ApiOperation(value="小程序-获取隐私政策", notes="小程序-获取隐私政策") - @GetMapping("/getPrivacyPolicy") - public Result getPrivacyPolicy(){ - return loginApiService.getPrivacyPolicy(); - } - - } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/HttpClientUtil.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/HttpClientUtil.java new file mode 100644 index 0000000..0b8b83b --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/HttpClientUtil.java @@ -0,0 +1,1122 @@ +package org.jeecg.modules.apiBean; + + + + +import com.alibaba.fastjson.JSON; +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.HttpStatus; +import org.apache.http.NameValuePair; +import org.apache.http.client.CookieStore; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.*; +import org.apache.http.client.utils.HttpClientUtils; +import org.apache.http.client.utils.URIBuilder; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.conn.ssl.SSLContextBuilder; +import org.apache.http.conn.ssl.TrustStrategy; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.BasicCookieStore; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.message.BasicNameValuePair; +import org.apache.http.util.EntityUtils; + +import javax.net.ssl.SSLContext; +import java.io.IOException; +import java.net.URI; +import java.nio.charset.Charset; +import java.security.KeyManagementException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 通过url获取数据 + * + * @author zc + * + */ +public class HttpClientUtil { + + /** + * 设置可访问https + * @return + */ + public static CloseableHttpClient createSSLClientDefault() { + try { + SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() { + //信任所有 + public boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException { + return true; + } + }).build(); + SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); + + return HttpClients.custom().setSSLSocketFactory(sslsf).build(); + } catch (KeyManagementException e) { + e.printStackTrace(); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } catch (KeyStoreException e) { + e.printStackTrace(); + } + return HttpClients.createDefault(); + } +/*************************************Get**********************************************/ + /** + * 一般查询用doget + * @param url + * @param param + * @param + * @return + */ + public static String doGet(String url, Map param) { + // 创建Httpclient对象 + CloseableHttpClient httpclient = createSSLClientDefault();//调用createSSLClientDefault + String resultString = ""; + CloseableHttpResponse response = null; + try { + + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + CookieStore cookieStore = new BasicCookieStore(); + httpclient = HttpClients.custom().setDefaultCookieStore(cookieStore).build(); + // 创建http GET请求 + HttpGet httpGet = new HttpGet(uri); + //设置请求头 +// if (parameter != null) { +// //签名 +// httpGet.addHeader("Sign",parameter.getSign()); +// //用户ID +// httpGet.addHeader("User_ID",parameter.getUserId()+""); +// //用户角色ID +// httpGet.addHeader("User_RID",parameter.getRId()); +// //用户单位ID +// httpGet.addHeader("Dept_ID",parameter.getDeptId()+""); +// //用户科室ID +// httpGet.addHeader("Unit_ID",parameter.getUnitid()+""); +// httpGet.addHeader("CacheKey",parameter.getCacheKey()); +// httpGet.addHeader("Org_id", parameter.getOrg_id() + ""); +// httpGet.addHeader("Product_id", parameter.getProduct_id() + ""); +// httpGet.addHeader("Timestamp", parameter.getTimestamp()); +// } + + // 执行请求 + response = httpclient.execute(httpGet); + // 判断返回状态是否为200 + if (response.getStatusLine().getStatusCode() == 200) { + resultString = EntityUtils.toString(response.getEntity(), + "UTF-8"); + } + + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + if (response != null) { + response.close(); + } + httpclient.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return resultString; + } + + public static String doGet(String url) { + return doGet(url, null); + } + + public static String doGet3(String url, Map param) { + // 创建Httpclient对象 + //调用createSSLClientDefault + CloseableHttpClient httpclient = createSSLClientDefault(); + String resultString = ""; + CloseableHttpResponse response = null; + try { + + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + + // 创建http GET请求 + HttpGet httpGet = new HttpGet(uri); + //设置请求头 +// if (parameter != null) { +// //签名 +// httpGet.addHeader("Sign",parameter.getSign()); +// //用户ID +// httpGet.addHeader("User_ID",parameter.getUserId()+""); +// //用户角色ID +// httpGet.addHeader("User_RID",parameter.getRId()); +// //用户单位ID +// httpGet.addHeader("Dept_ID",parameter.getDeptId()+""); +// //用户科室ID +// httpGet.addHeader("Unit_ID",parameter.getUnitid()+""); +// httpGet.addHeader("CacheKey",parameter.getCacheKey()); +// httpGet.addHeader("Org_id", parameter.getOrg_id() + ""); +// httpGet.addHeader("Product_id", parameter.getProduct_id() + ""); +// httpGet.addHeader("Timestamp", parameter.getTimestamp()); +// } + + // 执行请求 + response = httpclient.execute(httpGet); + // 判断返回状态是否为200 + if (response.getStatusLine().getStatusCode() == 200) { + resultString = EntityUtils.toString(response.getEntity(), + "UTF-8"); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + if (response != null) { + response.close(); + } + httpclient.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return resultString; + } + + /** + * 上传文件的doGet + * @param url + * @param param + * @param + * @return + */ + public static String doGet2(String url, Map param) { + + // 创建Httpclient对象 + CloseableHttpClient httpclient = createSSLClientDefault(); + String resultString = ""; + CloseableHttpResponse response = null; + try { + + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + // 创建http GET请求 + HttpGet httpGet = new HttpGet(uri); +// if (parameter != null) { +// //用户ID +// httpGet.addHeader("User_ID",parameter.getUserId()+""); +// //用户角色ID +// httpGet.addHeader("User_RID",parameter.getRId()); +// //用户单位ID +// httpGet.addHeader("Dept_ID",parameter.getDeptId()+""); +// //用户科室ID +// httpGet.addHeader("Unit_ID",parameter.getUnitid()+""); +// httpGet.addHeader("CacheKey",parameter.getCacheKey()); +// httpGet.addHeader("Org_id", parameter.getOrg_id()); +// httpGet.addHeader("Product_id", parameter.getProduct_id()); +// httpGet.addHeader("Sign", parameter.getSign()); +// httpGet.addHeader("requestCode", parameter.getRequestCode()); +// httpGet.addHeader("Content-Type", "application/json;charset=UTF-8"); +// httpGet.addHeader("Timestamp", parameter.getTimestamp()); +// } + // 执行请求 + response = httpclient.execute(httpGet); + if (response.getStatusLine().getStatusCode() == 200) { + resultString = EntityUtils.toString(response.getEntity(), + "UTF-8"); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + if (response != null) { + response.close(); + } + httpclient.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return resultString; + } + + public static String doGet2(String url) { + return doGet2(url, null); + + } + + public static String doGet4(String url, Map param) { + // 创建Httpclient对象 + //调用createSSLClientDefault + CloseableHttpClient httpclient = createSSLClientDefault(); + String resultString = ""; + CloseableHttpResponse response = null; + try { + + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + + // 创建http GET请求 + HttpGet httpGet = new HttpGet(uri); + //设置请求头 +// httpGet.addHeader(""); +// if (parameter != null) { +// //签名 +// httpGet.addHeader("Sign",parameter.getSign()); +// //用户ID +// httpGet.addHeader("User_ID",parameter.getUserId()+""); +// //用户角色ID +// httpGet.addHeader("User_RID",parameter.getRId()); +// //用户单位ID +// httpGet.addHeader("Dept_ID",parameter.getDeptId()+""); +// //用户科室ID +// httpGet.addHeader("Unit_ID",parameter.getUnitid()+""); +// httpGet.addHeader("CacheKey",parameter.getCacheKey()); +// httpGet.addHeader("Org_id", parameter.getOrg_id() + ""); +// httpGet.addHeader("Product_id", parameter.getProduct_id() + ""); +// httpGet.addHeader("Timestamp", parameter.getTimestamp()); +// } + + // 执行请求 + response = httpclient.execute(httpGet); + // 判断返回状态是否为200 + if (response.getStatusLine().getStatusCode() == 200) { + resultString = EntityUtils.toString(response.getEntity(), + "UTF-8"); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + if (response != null) { + response.close(); + } + httpclient.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return resultString; + } + + public static String doGet5(String url, Map param) { + // 创建Httpclient对象 + //调用createSSLClientDefault + CloseableHttpClient httpclient = createSSLClientDefault(); + String resultString = ""; + CloseableHttpResponse response = null; + try { + + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + + // 创建http GET请求 + HttpGet httpGet = new HttpGet(uri); + //设置请求头 +// httpGet.addHeader(""); +// if (parameter != null) { +// httpGet.addHeader("Accept","application/json, text/javascript, */*; q=0.01"); +// httpGet.addHeader("Accept-Encoding","gzip, deflate, br"); +// httpGet.addHeader("Accept-Language","zh-CN,zh;q=0.9"); +// httpGet.addHeader("Connection","keep-alive"); + httpGet.addHeader("Cookie","PHPSESSID=b1epvn4gilmvlqd63gb71sgb4m"); +// httpGet.addHeader("Host","www.5577yc.com"); +// httpGet.addHeader("Referer","https://www.5577yc.com/pc/member/index.html"); +// httpGet.addHeader("Sec-Fetch-Mode","cors"); +// httpGet.addHeader("Sec-Fetch-Site","same-origin"); +// httpGet.addHeader("User-Agent","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36"); + httpGet.addHeader("X-Requested-With","XMLHttpRequest"); +// httpGet.addHeader("Org_id", parameter.getOrg_id() + ""); +// httpGet.addHeader("Product_id", parameter.getProduct_id() + ""); +// httpGet.addHeader("Timestamp", parameter.getTimestamp()); +// } + + // 执行请求 + response = httpclient.execute(httpGet); + // 判断返回状态是否为200 + if (response.getStatusLine().getStatusCode() == 200) { + resultString = EntityUtils.toString(response.getEntity(), + "UTF-8"); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + if (response != null) { + response.close(); + } + httpclient.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return resultString; + } + + public static String doGet5(String url) { + return doGet5(url, null); + + } + /*************************************Get**********************************************/ + + /*************************************Post**********************************************/ + /** + * 原始doPost 基本不用 + * @param url + * @param param + * @param + * @return + */ + public static String doPost(String url, Map param) { + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + + try { + // 创建Http Post请求 + HttpPost httpPost = new HttpPost(url); + + // 创建参数列表 + if (param != null) { + List paramList = new ArrayList<>(); + for (String key : param.keySet()) { + paramList.add(new BasicNameValuePair(key, param.get(key))); + } + // 模拟表单 + UrlEncodedFormEntity entity = new UrlEncodedFormEntity( + paramList); + httpPost.setEntity(entity); + } + // 执行http请求 + response = httpClient.execute(httpPost); + + + + + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + return resultString; + } + + /** + * 项目经常用的doPost2 + * @param url + * @param param + * @param + * @return + */ + public static String doPost2(String url, Map param){ + + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + + try { + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + // 创建Http Post请求 + HttpPost httpPost = new HttpPost(uri); + httpPost.setHeader("Content-type", "application/x-www-form-urlencoded"); +// httpPost.setHeader("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)"); + // 创建参数列表 + if (param != null) { + List paramList = new ArrayList<>(); + for (String key : param.keySet()) { + paramList.add(new BasicNameValuePair(key, param.get(key))); + } + + // 模拟表单 + UrlEncodedFormEntity entity = new UrlEncodedFormEntity( + paramList,"UTF-8"); + entity.setContentEncoding("UTF-8"); + entity.setContentType("application/x-www-form-urlencoded"); + httpPost.setEntity(entity); + + } + // 执行http请求 + response = httpClient.execute(httpPost); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + return resultString; + } + + /** + * .net登录post + * @param url + * @param param + * @param + * @return + */ + public static String doPost3(String url, Map param){ + + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + + try { + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + // 创建Http Post请求 + HttpPost httpPost = new HttpPost(uri); + // 创建参数列表 + if (param != null) { + List paramList = new ArrayList<>(); + for (String key : param.keySet()) { + paramList.add(new BasicNameValuePair(key, param.get(key))); + } + // 模拟表单 + UrlEncodedFormEntity entity = new UrlEncodedFormEntity( + paramList, Charset.forName("UTF-8")); + entity.setContentEncoding("UTF-8"); + httpPost.setEntity(entity); + } + // 执行http请求 + response = httpClient.execute(httpPost); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + return resultString; + } + + + + /** + * 微信文件上传 + * @param url + * @param content + * @param fileName + * @return + */ + public static String doPost6(String url, byte[] content,String fileName){ + + String resultString = null; + //创建HttpClient + CloseableHttpClient httpClient = HttpClients.createDefault(); + HttpPost httpPost = new HttpPost(url); + org.apache.http.entity.mime.MultipartEntityBuilder builder = org.apache.http.entity.mime.MultipartEntityBuilder.create(); + /*绑定文件参数，传入文件流和contenttype，此处也可以继续添加其他formdata参数*/ + builder.addBinaryBody("file",content, ContentType.MULTIPART_FORM_DATA,fileName); + HttpEntity entity = builder.build(); + httpPost.setEntity(entity); + HttpResponse response = null; + //执行提交 + try{ + response = httpClient.execute(httpPost); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + HttpClientUtils.closeQuietly(httpClient); + HttpClientUtils.closeQuietly(response); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + return resultString; + } + + + /** + * 微信公众号文件上传 + * @param url + * @param content + * @param fileName + * @return + */ + public static String doPost7(String url, byte[] content,String fileName){ + + String resultString = null; + //创建HttpClient + CloseableHttpClient httpClient = HttpClients.createDefault(); + HttpPost httpPost = new HttpPost(url); + org.apache.http.entity.mime.MultipartEntityBuilder builder = org.apache.http.entity.mime.MultipartEntityBuilder.create(); + /*绑定文件参数，传入文件流和contenttype，此处也可以继续添加其他formdata参数*/ + builder.addBinaryBody("media",content, ContentType.MULTIPART_FORM_DATA,fileName); + HttpEntity entity = builder.build(); + httpPost.setEntity(entity); + HttpResponse response = null; + //执行提交 + try{ + response = httpClient.execute(httpPost); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + HttpClientUtils.closeQuietly(httpClient); + HttpClientUtils.closeQuietly(response); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + return resultString; + } + + /** + * 项目经常用的doPost4 + * @param url + * @param param + * @return + */ + public static String doPost4(String url, Map param){ + + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + StringBuffer cookie = new StringBuffer(); + Map map = new HashMap<>(); + try { + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + // 创建Http Post请求 + HttpPost httpPost = new HttpPost(uri); + // 创建参数列表 + if (param != null) { + List paramList = new ArrayList<>(); + for (String key : param.keySet()) { + paramList.add(new BasicNameValuePair(key, param.get(key))); + } + httpPost.addHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8"); + // 模拟表单 + UrlEncodedFormEntity entity = new UrlEncodedFormEntity( + paramList, Charset.forName("UTF-8")); + httpPost.setEntity(entity); + } + // 执行http请求 + response = httpClient.execute(httpPost); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + return resultString; + } + + + /** + * 项目经常用的doPost4 + * @param url + * @param param + * @param parameter + * @return + */ + public static String doPost5(String url, Map param,String parameter){ + + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + StringBuffer cookie = new StringBuffer(); + Map map = new HashMap<>(); + try { + // 创建uri + CookieStore cookieStore = new BasicCookieStore(); + httpClient = HttpClients.custom().setDefaultCookieStore(cookieStore).build(); + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + // 创建Http Post请求 + HttpPost httpPost = new HttpPost(uri); + // 创建参数列表 + if (param != null) { + List paramList = new ArrayList<>(); + for (String key : param.keySet()) { + paramList.add(new BasicNameValuePair(key, param.get(key))); + } + httpPost.addHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8"); + httpPost.addHeader("Host","www.www7945.com"); + httpPost.addHeader("Origin","https://www.www7945.com"); + httpPost.addHeader("Referer","https://www.www7945.com/mobile/"); + httpPost.addHeader("User-Agent:","Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36"); + httpPost.addHeader("Connection","keep-alive"); + // 模拟表单 + UrlEncodedFormEntity entity = new UrlEncodedFormEntity( + paramList, Charset.forName("UTF-8")); + entity.setContentEncoding("UTF-8"); + httpPost.setEntity(entity); + } + if(parameter!=null){ + httpPost.addHeader("Cookie",parameter); + } + // 执行http请求 + response = httpClient.execute(httpPost); + String tokenStr = null; + + if (response != null) { + int statusCode = response.getStatusLine().getStatusCode(); + if (statusCode == HttpStatus.SC_OK) { + // 获得Cookies + List cookies = cookieStore.getCookies(); + for (org.apache.http.cookie.Cookie c : cookies) { + cookie.append(c.getName()).append("=").append(c.getValue()).append(";"); + if (c.getName().contains("token")) { + tokenStr = c.getValue(); + } + } + } + } + map.put("token",tokenStr); + map.put("cookie",cookie.toString()); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + map.put("resultString",JSON.parse(resultString)); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + if(parameter!=null){ + return resultString; + } + return JSON.toJSONString(map); + } + + + + public static String doPost5(String url) { + return doPost5(url, null,null); + } + + public static String doPost4(String url) { + return doPost4(url, null); + } + + public static String doPost2(String url) { + return doPost2(url); + } + + + public static String doPost(String url) { + return doPost(url, null); + } + + /** + * 当数据需要以JSON格式传输 + * @param url + * @param json + * @param + * @return + */ + public static String doPostJson(String url, String json) { + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + try { + // 创建Http Post请求 + HttpPost httpPost = new HttpPost(url); + // 创建请求内容 + StringEntity entity = new StringEntity(json, + ContentType.APPLICATION_JSON); + httpPost.setEntity(entity); + // 执行http请求 + response = httpClient.execute(httpPost); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + return resultString; + } + + + public static String doPostJson3(String url, String json) { + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + try { + // 创建Http Post请求 + HttpPost httpPost = new HttpPost(url); + // 创建请求内容 + StringEntity entity = new StringEntity(json, + ContentType.APPLICATION_FORM_URLENCODED); + httpPost.setEntity(entity); + // 执行http请求 + response = httpClient.execute(httpPost); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + return resultString; + } + + /** + * 文件上传 + * @param url + * @param json + * @param + * @return + */ + public static String doPostJson2(String url, String json) { + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + try { + // 创建Http Post请求 + HttpPost httpPost = new HttpPost(url); + // 创建请求内容 + StringEntity entity = new StringEntity(json, + ContentType.APPLICATION_JSON); + httpPost.setEntity(entity); + // 执行http请求 + response = httpClient.execute(httpPost); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + return resultString; + } + + /*************************************Post**********************************************/ + + + + + + + + + /*************************************Delete**********************************************/ + /** + * 原始删除 基本不怎么用 + * @param url + * @return + */ + public static String doDelete(String url) { + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + + try { + // 创建Http Post请求 + HttpDelete httpPost = new HttpDelete(url); + // 执行http请求 + response = httpClient.execute(httpPost); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return resultString; + } + + /** + * 常用删除 + * @param url + * @param param + * @param + * @return + */ + public static String doDelete2(String url,Map param) { + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + + try { + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + // 创建Http Delete请求 + HttpDelete httpDelete = new HttpDelete(uri); + // 执行http请求 + response = httpClient.execute(httpDelete); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return resultString; + } + + /** + * 上传文件删除 + * @param url + * @param param + * @param + * @return + */ + public static String doDelete3(String url,Map param) { + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + + try { + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + // 创建Http Delete请求 + HttpDelete httpDelete = new HttpDelete(uri); + // 执行http请求 + response = httpClient.execute(httpDelete); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return resultString; + } + + /*************************************Delete**********************************************/ + + + + + + + + + + /*************************************Put**********************************************/ + public static String doPut(String url) { + return doPut(url, null); + } + + /** + * 修改 + * @param url + * @param param + * @param + * @return + */ + public static String doPut(String url, Map param) { + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + + try { + // 创建uri + URIBuilder builder = new URIBuilder(url); + if (param != null) { + for (String key : param.keySet()) { + builder.addParameter(key, param.get(key)); + } + } + URI uri = builder.build(); + // 创建Http Put请求 + HttpPut httpPut = new HttpPut(uri); + // 创建参数列表 + if (param != null) { + List paramList = new ArrayList<>(); + for (String key : param.keySet()) { + paramList.add(new BasicNameValuePair(key, param.get(key))); + } + // 模拟表单 + UrlEncodedFormEntity entity = new UrlEncodedFormEntity( + paramList, Charset.forName("UTF-8"));//Charset.forName("UTF-8")解决乱码 + entity.setContentEncoding("UTF-8"); + httpPut.setEntity(entity); + } + // 执行http请求 + response = httpClient.execute(httpPut); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + return resultString; + } + + /** + * 以JSON格式修改 + * @param url + * @param json + * @param parameter + * @return + */ + public static String doPutJson(String url, String json) { + // 创建Httpclient对象 + CloseableHttpClient httpClient = createSSLClientDefault(); + CloseableHttpResponse response = null; + String resultString = ""; + try { + // 创建Http Post请求 + HttpPut httpPut = new HttpPut(url); + // 创建请求内容 + StringEntity entity = new StringEntity(json, + ContentType.APPLICATION_JSON); + httpPut.setEntity(entity); + // 执行http请求 + response = httpClient.execute(httpPut); + resultString = EntityUtils.toString(response.getEntity(), "utf-8"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + response.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + return resultString; + } + + + +} + diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java new file mode 100644 index 0000000..74c3965 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WxQrCodeVo.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.apiBean; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class WxQrCodeVo { + /**图片地址*/ + @ApiModelProperty(value = "图片地址") + private String url; + + @ApiModelProperty(value = "名称") + private String name; +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/AuthenticationService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/AuthenticationService.java new file mode 100644 index 0000000..aefb51c --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/AuthenticationService.java @@ -0,0 +1,26 @@ +package org.jeecg.modules.apiService; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; +import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson; +import org.springframework.web.bind.annotation.RequestHeader; + +public interface AuthenticationService { + + /** + * 我的服务-个人实名认证 + * @param token + * @param employAuthenticationPerson + * @return + */ + public Result addAuthenticationPerson(@RequestHeader("X-Access-Token") String token, EmployAuthenticationPerson employAuthenticationPerson); + + /** + * 我的服务-企业实名认证 + * @param token + * @param employAhthenticationCompany + * @return + */ + public Result addAuthenticationCompany(@RequestHeader("X-Access-Token") String token, EmployAhthenticationCompany employAhthenticationCompany); + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/BossApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/BossApiService.java index c5489f0..0577fb8 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/BossApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/BossApiService.java @@ -25,12 +25,21 @@ public interface BossApiService { //会员中心-我的收藏 public Result queryJobCollectionList(String token, PageBean pageBean); + //会员中心-我的收藏(数量统计) + public Result queryJobCollectionCount(String token); + //会员中心-联系记录-我看过谁 public Result queryWatchWho(String token, PageBean pageBean); - //会员中心-联系记录-我看过谁(我的找活) + //会员中心-联系记录-我看过谁(数量统计) + public Result queryWatchWhoCount(String token); + + //会员中心-联系记录-我看过谁 public Result queryWatchMe(String token, PageBean pageBean); + //会员中心-联系记录-我看过谁(数量统计) + public Result queryWatchMeCount(String token); + //会员中心-联系记录-我的招工 public Result queryJobListByUserId(String token, PageBean pageBean); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CheckService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CheckService.java new file mode 100644 index 0000000..9bdd2d0 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CheckService.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.apiService; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; + +public interface CheckService { + //会员中心-联系记录-我看过谁 + public Result queryWatchWhoBoss(String token, PageBean pageBean); + + //会员中心-联系记录-我看过谁(我的找活) + public Result queryWatchMeBoss(String token, PageBean pageBean); + + //会员中心-联系记录-我看过谁 + public Result queryWatchWhoEmployee(String token, PageBean pageBean); + + //会员中心-联系记录-谁看过我(谁看过我的简历) + public Result queryWatchMeEmployee(String token, PageBean pageBean); +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CollectionService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CollectionService.java new file mode 100644 index 0000000..87fa843 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CollectionService.java @@ -0,0 +1,25 @@ +package org.jeecg.modules.apiService; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.springframework.web.bind.annotation.RequestHeader; + +public interface CollectionService { + + /** + * 我的收藏-收藏工作信息 + * @param token + * @param pageBean + * @return + */ + public Result queryJobCollectionList(@RequestHeader("X-Access-Token") String token, PageBean pageBean); + + /** + * 我的收藏-收藏简历信息 + * @param token + * @param pageBean + * @return + */ + public Result queryResumeCollectionList(@RequestHeader("X-Access-Token") String token, PageBean pageBean); + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java index 17f2486..992080f 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java @@ -55,13 +55,16 @@ public interface CommonApiService { public Result queryScoreRecord(String token, String type, PageBean pageBean); //会员中心-获取VIP配置信息 - public Result queryVipType(PageBean pageBean); + public Result queryVipType(String type, PageBean pageBean); //会员中心-开通VIP public Result addVip(String token, EmployVipUser employVipUser); //会员中心-充值积分 - public Result addScoreByRecharge(String token, String score, String type); + public Result addScoreByShare(String token, String score); + + //会员中心-充值积分 + public Result addScoreBySign(String token, Double score); //会员中心-实名认证 public Result addAuthenticationPerson(String token, EmployAuthenticationPerson employAuthenticationPerson); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java new file mode 100644 index 0000000..a04634c --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java @@ -0,0 +1,52 @@ +package org.jeecg.modules.apiService; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; + +public interface ConfigService { + + /** + * 获取配置信息列表 + * @param pageBean + * @return + */ + public Result queryConfigList(PageBean pageBean); + + /** + * 获取配置信息 + * @param paramCode + * @return + */ + public Result queryConfig(String paramCode); + + /** + * 获取banner图列表 + * @param bannerCategoryId + * @param pageBean + * @return + */ + public Result queryBannerList(String bannerCategoryId, PageBean pageBean); + + /** + * 获取工种列表 + * @param pageBean + * @return + */ + public Result queryJobTypeList(PageBean pageBean); + + /** + * 获取工作性质列表 + * @param pageBean + * @return + */ + public Result queryJobNatureList(PageBean pageBean); + + /** + * 获取地址列表带分页 + * @param pageBean + * @return + */ + public Result queryAddressList(PageBean pageBean); + +} + diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ContractService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ContractService.java new file mode 100644 index 0000000..626e7dc --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ContractService.java @@ -0,0 +1,26 @@ +package org.jeecg.modules.apiService; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.employContract.entity.EmployContract; + +public interface ContractService { + + /** + * 电子合同-获取电子合同列表 + * @param token + * @param employContract + * @param pageBean + * @return + */ + public Result queryContractList(String token, EmployContract employContract, PageBean pageBean); + + /** + * 电子合同-获取电子合同详情 + * @param token + * @param contractId + * @return + */ + public Result queryContracById(String token, String contractId); + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/EmployeeApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/EmployeeApiService.java index cb1feaf..41c6e7e 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/EmployeeApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/EmployeeApiService.java @@ -1,28 +1,40 @@ package org.jeecg.modules.apiService; +import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.employContract.entity.EmployContract; import org.jeecg.modules.employJob.entity.EmployJob; import org.jeecg.modules.employRedister.entity.EmployRedister; +import org.jeecg.modules.employResume.entity.EmployResume; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import javax.servlet.http.HttpServletRequest; public interface EmployeeApiService { /***************首页***************/ - //首页-查询工作信息列表 public Result queryJobListByAll(EmployJob employJob, PageBean pageBean, HttpServletRequest req); //首页-获取工作详情 public Result queryJobById(String token, String jobId); + /***************个人简历***************/ + //个人中心-我的简历 + public Result queryResume(String token); + + //个人中心-添加简历 + public Result addResume(String token, EmployResume employResume); + + //个人中心-修改简历 + public Result updateResume(String token, EmployResume employResume); + /***************考证咨询***************/ //考证咨询-证书查询 public Result queryCertList(PageBean pageBean); - //考证咨询-提交报名材料 //考证咨询-提交报名材料 public Result addMaterial(String token, EmployRedister employRedister); @@ -33,12 +45,21 @@ public interface EmployeeApiService { //会员中心-我的收藏 public Result queryJobCollectionList(String token, PageBean pageBean); + //会员中心-我的收藏(数量统计) + public Result queryJobCollectionCount(String token); + //会员中心-联系记录-我看过谁 public Result queryWatchWho(String token, PageBean pageBean); - //会员中心-联系记录-谁看过我(谁看过我的简历) + //会员中心-联系记录-我看过谁(数量统计) + public Result queryWatchWhoCount(String token); + + //会员中心-联系记录-谁看过我 public Result queryWatchMe(String token, PageBean pageBean); + //会员中心-联系记录-谁看过我(数量统计) + public Result queryWatchMeCount(String token ); + //会员中心-我的找活 public Result queryResumeByUserId(String token, PageBean pageBean); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ExaminationService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ExaminationService.java new file mode 100644 index 0000000..10831d3 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ExaminationService.java @@ -0,0 +1,30 @@ +package org.jeecg.modules.apiService; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.employRedister.entity.EmployRedister; + +public interface ExaminationService { + + /** + * 考证咨询-证书查询 + * @param pageBean + * @return + */ + public Result queryCertList(PageBean pageBean); + + /** + * 考证咨询-提交报名材料 + * @param token + * @param employRedister + * @return + */ + public Result addMaterial(String token, EmployRedister employRedister); + + /** + * 考证咨询-联系客服 + * @return + */ + public Result queryWorker(); + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/JobService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/JobService.java new file mode 100644 index 0000000..f4be44d --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/JobService.java @@ -0,0 +1,50 @@ +package org.jeecg.modules.apiService; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.employJob.entity.EmployJob; +import org.springframework.web.bind.annotation.RequestHeader; + +public interface JobService { + + /** + * 查询工作信息列表 + * @param employJob + * @param pageBean + * @return + */ + public Result queryJobList(EmployJob employJob, PageBean pageBean); + + /** + * 根据id查看工作详情 + * @param token + * @param jobId + * @return + */ + public Result queryJobById(String token, String jobId); + + /** + * 会员中心-我的招工 + * @param token + * @param pageBean + * @return + */ + public Result queryJobListByUserId(@RequestHeader("X-Access-Token")String token, PageBean pageBean); + + /** + * 添加工作信息 + * @param token + * @param employJob + * @return + */ + public Result addJob(String token, EmployJob employJob); + + /** + * 修改工作信息 + * @param token + * @param employJob + * @return + */ + public Result updateJob(String token, EmployJob employJob); + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/NotebookService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/NotebookService.java new file mode 100644 index 0000000..e7a3d74 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/NotebookService.java @@ -0,0 +1,33 @@ +package org.jeecg.modules.apiService; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.employBillInfo.entity.EmployBillInfo; +import org.jeecg.modules.employFeedback.entity.EmployFeedback; +import org.jeecg.modules.employNotebook.entity.EmployNotebook; +import org.jeecg.modules.employWorkInfo.entity.EmployWorkInfo; + +public interface NotebookService { + + //个人记工-新建账本 + public Result addNoteBook(String token, EmployNotebook employNotebook); + + //个人记工-新建账本 + public Result updateNoteBook(String token, EmployNotebook employNotebook); + + //个人记工-全年收支 + public Result queryBill(String token, String employNoteBookId, PageBean pageBean); + + //个人记工-技工问题 + public Result addQuestion(String toke, EmployFeedback employFeedback); + + //个人记工-在建项目/结束项目 + public Result queryNotebookList(String token, String type, String status, PageBean pageBean); + + //个人记工-项目记账 + public Result addBillInfo(String token, EmployBillInfo employBillInfo); + + //个人记工-项目记工 + public Result addWorkInfo(String token, EmployWorkInfo employWorkInfo); + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ResumeService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ResumeService.java new file mode 100644 index 0000000..8d5c66c --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ResumeService.java @@ -0,0 +1,51 @@ +package org.jeecg.modules.apiService; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.employJob.entity.EmployJob; +import org.jeecg.modules.employResume.entity.EmployResume; +import org.springframework.web.bind.annotation.RequestHeader; + +public interface ResumeService { + + /** + * 查询简历信息列表 + * @param employResume + * @param pageBean + * @return + */ + public Result queryResumeList(EmployResume employResume, PageBean pageBean); + + /** + * 根据id查看简历详情 + * @param token + * @param resumeId + * @return + */ + public Result queryResumeById(String token, String resumeId); + + /** + * 会员中心-我的简历 + * @param token + * @param pageBean + * @return + */ + public Result queryResumeByUserId(@RequestHeader("X-Access-Token") String token, PageBean pageBean); + + /** + * 添加简历信息 + * @param token + * @param employResume + * @return + */ + public Result addResume(String token, EmployResume employResume); + + /** + * 修改简历信息 + * @param token + * @param employResume + * @return + */ + public Result updateResume(String token, EmployResume employResume); + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ScoreService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ScoreService.java new file mode 100644 index 0000000..95bb485 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ScoreService.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.apiService; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; + +public interface ScoreService { + + //会员中心-正式积分||临时积分 + public Result queryScore(String token); + + //会员中心-积分记录 + public Result queryScoreRecord(String token, String type, PageBean pageBean); + + //会员中心-邀请工友获取积分 + public Result addScoreByShare(String token, String score); + + //会员中心-addScoreBySign + public Result addScoreBySign(String token, Double score); + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ShareService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ShareService.java new file mode 100644 index 0000000..0842a0f --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ShareService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.apiService; + +import org.jeecg.common.api.vo.Result; + +public interface ShareService { + + /** + * 我的服务-面对面分享 + * @param token + * @return + */ + public Result getInviteCode(String token); + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/VipService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/VipService.java new file mode 100644 index 0000000..dd6207f --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/VipService.java @@ -0,0 +1,10 @@ +package org.jeecg.modules.apiService; + +import org.jeecg.common.api.vo.Result; + +public interface VipService { + + //开通VIP + public Result addVIP(String token); + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AuthenticationServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AuthenticationServiceImpl.java new file mode 100644 index 0000000..cba44f4 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AuthenticationServiceImpl.java @@ -0,0 +1,68 @@ +package org.jeecg.modules.apiService.impl; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.apiService.AuthenticationService; +import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany; +import org.jeecg.modules.employAhthenticationCompany.service.IEmployAhthenticationCompanyService; +import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson; +import org.jeecg.modules.employAuthenticationPerson.service.IEmployAuthenticationPersonService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class AuthenticationServiceImpl implements AuthenticationService { + + /******************************************************************************************************************/ + //权限验证 + @Resource + private ShiroRealm shiroRealm; + //个人实名认证表 + @Resource + private IEmployAuthenticationPersonService employAuthenticationPersonService; + + //企业实名认证表 + @Resource + private IEmployAhthenticationCompanyService employAhthenticationCompanyService; + /******************************************************************************************************************/ + + //会员中心-个人实名认证 + @Override + public Result addAuthenticationPerson(String token, EmployAuthenticationPerson employAuthenticationPerson) { + String message = ""; + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + employAuthenticationPerson.setUserId(hanHaiMember.getId()); + boolean result = employAuthenticationPersonService.save(employAuthenticationPerson); + + if(result){ + message = "个人实名添加成功！"; + }else { + message = "个人实名添加失败！"; + } + + return Result.OK(message); + } + + //会员中心-企业实名认证 + @Override + public Result addAuthenticationCompany(String token, EmployAhthenticationCompany employAhthenticationCompany) { + String message = ""; + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + employAhthenticationCompany.setUserId(hanHaiMember.getId()); + boolean result = employAhthenticationCompanyService.save(employAhthenticationCompany); + + if(result){ + message = "企业实名添加成功！"; + }else { + message = "企业实名添加失败！"; + } + + return Result.OK(message); + } +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java index 9863c3b..fe1e491 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/BossApiServiceImpl.java @@ -162,6 +162,23 @@ public class BossApiServiceImpl implements BossApiService { return Result.OK("简历收藏列表", pageList); } + //会员中心-我的收藏(数量统计) + @Override + public Result queryJobCollectionCount(String token) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //获取收藏列表 + List list = employCollectionResumeService + .lambdaQuery() + .eq(EmployCollectionResume::getUserId, hanHaiMember.getId()) + .list(); + + int count = list.size(); + + return Result.OK("简历收藏数量统计", count); + } + //会员中心-联系记录-我看过谁 @Override public Result queryWatchWho(String token, PageBean pageBean) { @@ -186,6 +203,23 @@ public class BossApiServiceImpl implements BossApiService { return Result.OK("我看过谁", pageList); } + //会员中心-联系记录-我看过谁(数量统计) + @Override + public Result queryWatchWhoCount(String token) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //查看简历查看记录 + List list = employCheckResumeService + .lambdaQuery() + .eq(EmployCheckResume::getUserId, hanHaiMember.getId()) + .list(); + + int count = list.size(); + + return Result.OK("我看过谁(数量统计)", count); + } + //会员中心-联系记录-谁看过我(谁看过我的招工) @Override public Result queryWatchMe(String token, PageBean pageBean) { @@ -196,7 +230,6 @@ public class BossApiServiceImpl implements BossApiService { List jobList = employJobService .lambdaQuery() .eq(EmployJob::getUserId, hanHaiMember.getId()) - .eq(EmployJob::getUserId, "1848653506820112385") .list(); //获取查看我发布的工作id列表 @@ -250,6 +283,41 @@ public class BossApiServiceImpl implements BossApiService { return Result.OK("谁看过我(谁看过我的招工)列表", hanHaiMemberList); } + //会员中心-联系记录-谁看过我(谁看过我的招工) + @Override + public Result queryWatchMeCount(String token) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //查询我发布的工作列表 + List jobList = employJobService + .lambdaQuery() + .eq(EmployJob::getUserId, hanHaiMember.getId()) + .list(); + + //获取查看我发布的工作id列表 + int jobSize = (int)jobList.size(); + Object[] jobIds = new Object[jobSize]; + int jobIndex = 0; + for (EmployJob job : jobList) { + jobIds[jobIndex] = job.getId(); + jobIndex++; + } + if(jobSize == 0){ + return Result.OK("您还没有发布过招工", jobList); + } + + //获取工作被查询的记录 + List checkJobList = employCheckJobService + .lambdaQuery() + .in(EmployCheckJob::getJobId, jobIds) + .list(); + + int count = checkJobList.size(); + + return Result.OK("谁看过我(数量统计)", count); + } + //我的招工 @Override public Result queryJobListByUserId(String token, PageBean pageBean) { diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CheckServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CheckServiceImpl.java new file mode 100644 index 0000000..0b6647a --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CheckServiceImpl.java @@ -0,0 +1,229 @@ +package org.jeecg.modules.apiService.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.CheckService; +import org.jeecg.modules.employCheckJob.entity.EmployCheckJob; +import org.jeecg.modules.employCheckJob.service.IEmployCheckJobService; +import org.jeecg.modules.employCheckResume.entity.EmployCheckResume; +import org.jeecg.modules.employCheckResume.service.IEmployCheckResumeService; +import org.jeecg.modules.employCollectionJob.service.IEmployCollectionJobService; +import org.jeecg.modules.employCollectionResume.service.IEmployCollectionResumeService; +import org.jeecg.modules.employJob.entity.EmployJob; +import org.jeecg.modules.employJob.service.IEmployJobService; +import org.jeecg.modules.employResume.entity.EmployResume; +import org.jeecg.modules.employResume.service.IEmployResumeService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class CheckServiceImpl implements CheckService { + + /******************************************************************************************************************/ + //权限验证 + @Resource + private ShiroRealm shiroRealm; + + //用户表 + @Resource + private IHanHaiMemberService hanHaiMemberService; + + //简历信息表 + @Resource + private IEmployResumeService employResumeService; + + //简历查看表 + @Resource + private IEmployCheckResumeService employCheckResumeService; + + //工作信息表 + @Resource + private IEmployJobService employJobService; + + //工作查看表 + @Resource + private IEmployCheckJobService employCheckJobService; + /******************************************************************************************************************/ + + //会员中心-联系记录-我看过谁 + @Override + public Result queryWatchWhoBoss(String token, PageBean pageBean) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //查看简历查看记录 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employCheckResumeService + .lambdaQuery() + .eq(EmployCheckResume::getUserId, hanHaiMember.getId()) + .page(page); + + //根据查看记录关联简历id获取简历信息 + for (EmployCheckResume record : pageList.getRecords()) { + //获取简历信息 + EmployResume employResume = employResumeService.getById(record.getResumeId()); + //将简历信息添加到查看记录中 + record.setEmployResume(employResume); + } + + return Result.OK("我看过谁", pageList); + } + + //会员中心-联系记录-谁看过我(谁看过我的招工) + @Override + public Result queryWatchMeBoss(String token, PageBean pageBean) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //查询我发布的工作列表 + List jobList = employJobService + .lambdaQuery() + .eq(EmployJob::getUserId, hanHaiMember.getId()) + .list(); + + //获取查看我发布的工作id列表 + int jobSize = (int)jobList.size(); + Object[] jobIds = new Object[jobSize]; + int jobIndex = 0; + for (EmployJob job : jobList) { + jobIds[jobIndex] = job.getId(); + jobIndex++; + } + if(jobSize == 0){ + return Result.OK("您还没有发布过招工", jobList); + } + + //获取工作被查询的记录 + List checkJobList = employCheckJobService + .lambdaQuery() + .in(EmployCheckJob::getJobId, jobIds) + .list(); + + //获取查看我的工作的求职者id + int size = (int)checkJobList.size(); + Object[] employeeIds = new Object[size]; + int index = 0; + for (EmployCheckJob employCheckJob : checkJobList) { + employeeIds[index] = employCheckJob.getUserId(); + index++; + } + + if(size == 0){ + return Result.OK("没有人看过我的招工", checkJobList); + } + + //根据求职者id查询求职者基本信息 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page hanHaiMemberList = hanHaiMemberService + .lambdaQuery() + .in(HanHaiMember::getId, employeeIds) + .page(page); + + //根据求职者id查询求职者简历 + for (HanHaiMember record : hanHaiMemberList.getRecords()) { + List employResumeList = employResumeService + .lambdaQuery() + .eq(EmployResume::getUserId, record.getId()) + .list(); + + record.setEmployResumeList(employResumeList); + } + + return Result.OK("谁看过我(谁看过我的招工)列表", hanHaiMemberList); + } + + //会员中心-联系记录-我看过谁 + @Override + public Result queryWatchWhoEmployee(String token, PageBean pageBean) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //获取我看过谁的记录信息 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employCheckJobService + .lambdaQuery() + .eq(EmployCheckJob::getUserId, hanHaiMember.getId()) + .page(page); + + //添加工作信息 + for (EmployCheckJob record : pageList.getRecords()) { + //获取工作信息 + EmployJob employJob = employJobService.getById(record.getJobId()); + //添加工作信息 + record.setEmployJob(employJob); + } + + return Result.OK("我看过谁", pageList); + } + + //会员中心-联系记录-谁看过我(谁看过我的简历) + @Override + public Result queryWatchMeEmployee(String token, PageBean pageBean) { + + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //查询我发布的简历列表 + List resumeList = employResumeService + .lambdaQuery() + .eq(EmployResume::getUserId, hanHaiMember.getId()) + .list(); + + //获取查看我发布的简历id列表 + int resumeSize = (int)resumeList.size(); + Object[] resumeIds = new Object[resumeSize]; + int jobIndex = 0; + for (EmployResume resume : resumeList) { + resumeIds[jobIndex] = resume.getId(); + jobIndex++; + } + if(resumeSize == 0){ + return Result.OK("您还没有发布过简历", resumeList); + } + + //获取简历被查询的记录 + List checkResumeList = employCheckResumeService + .lambdaQuery() + .in(EmployCheckResume::getResumeId, resumeIds) + .list(); + + //获取查看我的简历的招聘者id + int size = (int)checkResumeList.size(); + Object[] bossIds = new Object[size]; + int index = 0; + for (EmployCheckResume employCheckResume : checkResumeList) { + bossIds[index] = employCheckResume.getUserId(); + index++; + } + + if(size == 0){ + return Result.OK("没有人看过我的简历", checkResumeList); + } + + //根据招聘者id查询招聘者基本信息 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page hanHaiMemberList = hanHaiMemberService + .lambdaQuery() + .in(HanHaiMember::getId, bossIds) + .page(page); + + //根据招聘者id查询招聘者发布的工作 + for (HanHaiMember record : hanHaiMemberList.getRecords()) { + List employJobList = employJobService + .lambdaQuery() + .eq(EmployJob::getUserId, record.getId()) + .list(); + + record.setEmployJobList(employJobList); + } + + return Result.OK("谁看过我(谁看过我的简历)", hanHaiMemberList); + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CollectionServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CollectionServiceImpl.java new file mode 100644 index 0000000..b308317 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CollectionServiceImpl.java @@ -0,0 +1,94 @@ +package org.jeecg.modules.apiService.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.CollectionService; +import org.jeecg.modules.employCollectionJob.entity.EmployCollectionJob; +import org.jeecg.modules.employCollectionJob.service.IEmployCollectionJobService; +import org.jeecg.modules.employCollectionResume.entity.EmployCollectionResume; +import org.jeecg.modules.employCollectionResume.service.IEmployCollectionResumeService; +import org.jeecg.modules.employJob.entity.EmployJob; +import org.jeecg.modules.employJob.service.IEmployJobService; +import org.jeecg.modules.employResume.entity.EmployResume; +import org.jeecg.modules.employResume.service.IEmployResumeService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class CollectionServiceImpl implements CollectionService { + + /******************************************************************************************************************/ + //权限验证 + @Resource + private ShiroRealm shiroRealm; + + //工作信息表 + @Resource + private IEmployJobService employJobService; + + //工作收藏表 + @Resource + private IEmployCollectionJobService employCollectionJobService; + + //简历信息表 + @Resource + private IEmployResumeService employResumeService; + + //简历收藏表 + @Resource + private IEmployCollectionResumeService employCollectionResumeService; + /******************************************************************************************************************/ + + //我的收藏-收藏工作信息 + @Override + public Result queryJobCollectionList(String token, PageBean pageBean) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //获取工作收藏列表 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employCollectionJobService + .lambdaQuery() + .eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) + .page(page); + + //根据收藏列表工作id查询工作信息 + for (EmployCollectionJob record : pageList.getRecords()) { + //获取工作信息 + EmployJob job = employJobService.getById(record.getJobId()); + + //将工作信息添加至收藏列表 + record.setEmployJob(job); + } + + return Result.OK("工作收藏列表", pageList); + } + + //我的收藏-收藏简历信息 + @Override + public Result queryResumeCollectionList(String token, PageBean pageBean) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + //获取收藏列表 + Page pageList = employCollectionResumeService + .lambdaQuery() + .eq(EmployCollectionResume::getUserId, hanHaiMember.getId()) + .page(page); + + //根据收藏列表关联简历id获取简历信息 + for (EmployCollectionResume record : pageList.getRecords()) { + //获取简历信息 + EmployResume resume = employResumeService.getById(record.getResumeId()); + //将简历信息添加到我的收藏中 + record.setEmployResume(resume); + } + + return Result.OK("简历收藏列表", pageList); + } +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java index 0feedff..0141764 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java @@ -124,10 +124,23 @@ public class CommonApiServiceImpl implements CommonApiService { @Override public Result queryBannerList(String bannerCategoryId, PageBean pageBean) { - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employImageService - .lambdaQuery() - .page(page); + //商品列表 + Page pageList = null; + //分页信息 + Page page = null; + + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + LambdaQueryChainWrapper query = employImageService.lambdaQuery(); + + //组装查询条件 + if(null != bannerCategoryId){ + //车辆类型 + query.eq(EmployImage::getType, bannerCategoryId); + } + + //获取轮播图列表 + pageList = query.page(page); return Result.OK("轮播图列表", pageList); } @@ -339,49 +352,19 @@ public class CommonApiServiceImpl implements CommonApiService { } /***************会员中心***************/ - //会员中心-正式积分||临时积分 + //会员中心-积分 @Override public Result queryScore(String token) { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //积分信息 - ScoreBean scoreBean = new ScoreBean(); - - //正式积分 - EmployScore formalScore = employScoreService - .lambdaQuery() - .eq(EmployScore::getUserId, hanHaiMember.getId()) - .eq(EmployScore::getType, "0") - .one(); - - //临时积分 - EmployScore tempScore = employScoreService + //获取积分 + EmployScore score = employScoreService .lambdaQuery() .eq(EmployScore::getUserId, hanHaiMember.getId()) - .eq(EmployScore::getType, "1") .one(); - //当前积分 - double currentScore = 0; - if(null != formalScore && null != tempScore){ - currentScore = formalScore.getScore() + tempScore.getScore(); - }else if(null != formalScore){ - currentScore = formalScore.getScore(); - }else if(null != tempScore){ - currentScore = tempScore.getScore(); - }else { - scoreBean.setFormalScore(0); - scoreBean.setTempScore(0); - scoreBean.setCurrentScore(0); - return Result.OK("积分信息", scoreBean); - } - - scoreBean.setFormalScore(formalScore.getScore()); - scoreBean.setTempScore(tempScore.getScore()); - scoreBean.setCurrentScore(currentScore); - - return Result.OK("积分信息", scoreBean); + return Result.OK("积分信息", score); } //会员中心-积分记录 @@ -408,13 +391,22 @@ public class CommonApiServiceImpl implements CommonApiService { //会员中心-获取VIP配置信息 @Override - public Result queryVipType(PageBean pageBean) { + public Result queryVipType(String type, PageBean pageBean) { Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employVipTypeService - .lambdaQuery() + + //分页 + LambdaQueryChainWrapper query = employVipTypeService.lambdaQuery(); + + //组装查询条件 + if(null != type){ + query.eq(EmployVipType::getType, type); + } + + //获取VIP配置信息 + Page pageList = query .page(page); - return Result.OK("VIP配置信息列表", pageList); + return Result.OK("VIP配置信息", pageList); } //会员中心-开通VIP @@ -437,9 +429,9 @@ public class CommonApiServiceImpl implements CommonApiService { return Result.OK(message); } - //会员中心-充值积分 + //我的服务-获取积分-邀请工友获取积分 @Override - public Result addScoreByRecharge(String token, String score, String type ) { + public Result addScoreByShare(String token, String score) { //积分表 //根据userId查询出用户正式积分 //修改正式积分 @@ -448,6 +440,59 @@ public class CommonApiServiceImpl implements CommonApiService { return Result.OK("该接口暂未完成"); } + //我的服务-获取积分-每日签到获取积分 + @Override + public Result addScoreBySign(String token, Double score) { + String message = ""; + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //查询该用户是否有积分信息 + EmployScore one = employScoreService + .lambdaQuery() + .eq(EmployScore::getUserId, hanHaiMember.getId()) + .one(); + + //如果有积分信息，就在该基础上增加积分 + EmployScore employScore = new EmployScore(); + employScore.setUserId(hanHaiMember.getId()); + if(null != one){ + double newScore = one.getScore() + score; + + employScore.setId(one.getId()); + employScore.setScore(newScore); + + //添加/修改积分信息 + boolean result = employScoreService.updateById(employScore); + + if(result){ + message = "积分添加成功！"; + }else { + message = "积分添加失败！"; + } + }else { + //如果没有积分信息，就在新建积分 + employScore.setScore(score); + boolean result = employScoreService.save(employScore); + + if(result){ + message = "积分添加成功！"; + }else { + message = "积分添加失败！"; + } + } + + //积分记录添加 + EmployScoreRecord record = new EmployScoreRecord(); + record.setScore(score); + record.setUserId(hanHaiMember.getId()); + record.setTitle("每日签到获取积分"); + record.setType("0"); + employScoreRecordService.save(record); + + return Result.OK(message); + } + //会员中心-个人实名认证 @Override public Result addAuthenticationPerson(String token, EmployAuthenticationPerson employAuthenticationPerson) { @@ -486,4 +531,6 @@ public class CommonApiServiceImpl implements CommonApiService { return Result.OK(message); } + + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java new file mode 100644 index 0000000..aa88154 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java @@ -0,0 +1,122 @@ +package org.jeecg.modules.apiService.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.ConfigService; +import org.jeecg.modules.employAddress.entity.EmployAddress; +import org.jeecg.modules.employAddress.service.IEmployAddressService; +import org.jeecg.modules.employCollectionResume.entity.EmployCollectionResume; +import org.jeecg.modules.employConfig.entity.EmployConfig; +import org.jeecg.modules.employConfig.service.IEmployConfigService; +import org.jeecg.modules.employContract.entity.EmployContract; +import org.jeecg.modules.employImage.entity.EmployImage; +import org.jeecg.modules.employImage.service.IEmployImageService; +import org.jeecg.modules.employJobType.entity.EmployJobType; +import org.jeecg.modules.employJobType.service.IEmployJobTypeService; +import org.jeecg.modules.employNature.entity.EmployNature; +import org.jeecg.modules.employNature.service.IEmployNatureService; +import org.jeecg.modules.employResume.service.IEmployResumeService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class ConfigServiceImpl implements ConfigService { + + /******************************************************************************************************************/ + //配置信息 + @Resource + private IEmployConfigService employConfigService; + + //工种类型表 + @Resource + private IEmployJobTypeService employJobTypeService; + + //工作性质表 + @Resource + private IEmployNatureService employNatureService; + + //图片信息表表 + @Resource + private IEmployImageService employImageService; + + //地址表 + @Resource + private IEmployAddressService employAddressService; + + /******************************************************************************************************************/ + + //获取配置信息列表 + @Override + public Result queryConfigList(PageBean pageBean) { + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + //获取收藏列表 + Page pageList = employConfigService + .lambdaQuery() + .page(page); + + return Result.OK("配置信息列表", pageList); + } + + //根据配置编码获取配置信息 + @Override + public Result queryConfig(String paramCode) { + EmployConfig one = employConfigService + .lambdaQuery() + .eq(EmployConfig::getParamCode, paramCode) + .one(); + + return Result.OK("配置信息详情", one); + } + + //获取轮播图列表带分页 + @Override + public Result queryBannerList(String bannerCategoryId, PageBean pageBean) { + + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employImageService + .lambdaQuery() + .page(page); + + return Result.OK("轮播图列表", pageList); + } + + //获取工种列表带分页 + @Override + public Result queryJobTypeList(PageBean pageBean) { + + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employJobTypeService + .lambdaQuery() + .page(page); + + return Result.OK("工种列表", pageList); + } + + //获取工作性质带分页 + @Override + public Result queryJobNatureList(PageBean pageBean) { + + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employNatureService + .lambdaQuery() + .page(page); + + return Result.OK("工作性质列表", pageList); + } + + //获取地址列表带分页 + @Override + public Result queryAddressList(PageBean pageBean) { + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employAddressService + .lambdaQuery() + .page(page); + + return Result.OK("地址列表", pageList); + } + + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ContractServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ContractServiceImpl.java new file mode 100644 index 0000000..9a3653f --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ContractServiceImpl.java @@ -0,0 +1,71 @@ +package org.jeecg.modules.apiService.impl; + +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.ContractService; +import org.jeecg.modules.employContract.entity.EmployContract; +import org.jeecg.modules.employContract.service.IEmployContractService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class ContractServiceImpl implements ContractService { + + /******************************************************************************************************************/ + //权限验证 + @Resource + private ShiroRealm shiroRealm; + + //电子合同表 + @Resource + private IEmployContractService employContractService; + /******************************************************************************************************************/ + + //电子合同-获取电子合同列表 + @Override + public Result queryContractList(String token, EmployContract employContract, PageBean pageBean) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //分页 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + LambdaQueryChainWrapper query = employContractService + .lambdaQuery() + .eq(EmployContract::getBossId, hanHaiMember.getId()); + + //组装查询条件 + if(null != employContract.getSignCompany()){ + query.like(EmployContract::getSignCompany, employContract.getSignCompany()); + } + if(null != employContract.getSignPerson()){ + query.like(EmployContract::getSignPerson, employContract.getSignPerson()); + } + + //获取电子合同信息 + Page pageList = query.page(page); + + return Result.OK("电子合同列表", pageList); + + } + + //电子合同-获取电子合同详情 + @Override + public Result queryContracById(String token, String contractId) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + EmployContract one = employContractService + .lambdaQuery() + .eq(EmployContract::getBossId, hanHaiMember.getId()) + .eq(EmployContract::getId, contractId) + .one(); + + return Result.OK("电子合同详情", one); + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/EmployeeApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/EmployeeApiServiceImpl.java index 49683a1..d81480b 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/EmployeeApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/EmployeeApiServiceImpl.java @@ -84,11 +84,48 @@ public class EmployeeApiServiceImpl implements EmployeeApiService { //首页-查询工作信息列表 @Override public Result queryJobListByAll(EmployJob employJob, PageBean pageBean, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employJob, req.getParameterMap()); - Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList = employJobService.page(page, queryWrapper); - return Result.OK("工作信息列表", pageList); + //返回信息 + String message = "获取工作信息列表失败!"; + //商品列表 + Page pageList = null; + //分页信息 + Page page = null; + + try{ + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + LambdaQueryChainWrapper query = employJobService.lambdaQuery(); + + //组装查询条件 + if(null != employJob.getTypeId()){ + //工作类型 + query.eq(EmployJob::getTypeId, employJob.getTypeId()); + } + if(null != employJob.getNatureId()){ + //工作性质 + query.eq(EmployJob::getNatureId, employJob.getNatureId()); + } + + + //获取商品列表 + pageList = query.page(page); + + //判断执行结果 + if(null != pageList){ + message = "工作列表信息"; + }else { + message = "工作列表信息为空"; + } + + //返回执行结果 + return Result.OK(message, pageList); + + }catch (Exception e){ + //错误信息打印 + e.printStackTrace(); + return Result.error(message, pageList); + } } //首页-根据Id查看工作详情 @@ -133,9 +170,99 @@ public class EmployeeApiServiceImpl implements EmployeeApiService { return Result.OK("工作详情", collectionBean); } + /**************************************我的简历***********************************************/ + /********************************************************************************************/ + //我的简历 + @Override + public Result queryResume(String token) { + //返回信息 + String message = "简历信息查询失败"; + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //获取简历详情 + EmployJob one = employJobService + .lambdaQuery() + .eq(EmployJob::getUserId, hanHaiMember.getId()) + .one(); + + if(null == one){ + message = "没有查询到简历信息"; + }else { + message = "简历详情"; + } + + return Result.OK("简历详情", one); + } + + //添加简历 + @Override + public Result addResume(String token, EmployResume employResume) { + + //返回信息 + String message = "简历信息添加失败"; + //执行结果 + boolean result = false; + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + employResume.setUserId(hanHaiMember.getId()); + + try{ + //执行简历信息添加 + result = employResumeService.save(employResume); + + //判断执行结果 + if(result){ + message = "简历信息添加成功！"; + }else { + message = "简历信息添加失败！"; + } + + //返回执行结果 + return Result.OK(message); + + }catch (Exception e){ + //错误信息打印 + e.printStackTrace(); + return Result.error(message); + } + } + + //修改简历 + @Override + public Result updateResume(String token, EmployResume employResume) { + + //返回信息 + String message = "简历信息修改失败"; + //执行结果 + boolean result = false; + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + try{ + //执行简历信息修改 + result = employResumeService.updateById(employResume); + + //判断执行结果 + if(result){ + message = "简历信息修改成功！"; + }else { + message = "简历信息修改失败！"; + } + + //返回执行结果 + return Result.OK(message); + + }catch (Exception e){ + //错误信息打印 + e.printStackTrace(); + return Result.error(message); + } + } + /**************************************考证咨询***********************************************/ - /****************************************************************************************/ + /********************************************************************************************/ //考证咨询-证书查询 @Override @@ -175,13 +302,13 @@ public class EmployeeApiServiceImpl implements EmployeeApiService { @Override public Result queryJobCollectionList(String token, PageBean pageBean) { //权限验证 - //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //获取工作收藏列表 Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); Page pageList = employCollectionJobService .lambdaQuery() - //.eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) + .eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) .page(page); //根据收藏列表工作id查询工作信息 @@ -196,6 +323,24 @@ public class EmployeeApiServiceImpl implements EmployeeApiService { return Result.OK("工作收藏列表", pageList); } + //会员中心-我的收藏(数量统计) + @Override + public Result queryJobCollectionCount(String token) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //获取工作收藏列表 + List list = employCollectionJobService + .lambdaQuery() + .eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) + .list(); + + //工作收藏数量 + int count = list.size(); + + return Result.OK("我的收藏数量", count); + } + //会员中心-联系记录-我看过谁 @Override public Result queryWatchWho(String token, PageBean pageBean) { @@ -220,6 +365,24 @@ public class EmployeeApiServiceImpl implements EmployeeApiService { return Result.OK("我看过谁", pageList); } + //会员中心-联系记录-我看过谁(数量统计) + @Override + public Result queryWatchWhoCount(String token) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //获取我看过谁的记录信息 + List list = employCheckJobService + .lambdaQuery() + .eq(EmployCheckJob::getUserId, hanHaiMember.getId()) + .list(); + + //获取数量统计 + int count = list.size(); + + return Result.OK("我看过谁(数量统计)", count); + } + //会员中心-联系记录-谁看过我(谁看过我的简历) @Override public Result queryWatchMe(String token, PageBean pageBean) { @@ -284,6 +447,43 @@ public class EmployeeApiServiceImpl implements EmployeeApiService { return Result.OK("谁看过我(谁看过我的简历)", hanHaiMemberList); } + //会员中心-联系记录-谁看过我(谁看过我的简历-数量统计) + @Override + public Result queryWatchMeCount(String token) { + + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //查询我发布的简历列表 + List resumeList = employResumeService + .lambdaQuery() + .eq(EmployResume::getUserId, hanHaiMember.getId()) + .list(); + + //获取查看我发布的简历id列表 + int resumeSize = (int)resumeList.size(); + Object[] resumeIds = new Object[resumeSize]; + int jobIndex = 0; + for (EmployResume resume : resumeList) { + resumeIds[jobIndex] = resume.getId(); + jobIndex++; + } + if(resumeSize == 0){ + return Result.OK("您还没有发布过简历", resumeList); + } + + //获取简历被查询的记录 + List checkResumeList = employCheckResumeService + .lambdaQuery() + .in(EmployCheckResume::getResumeId, resumeIds) + .list(); + + int count = checkResumeList.size(); + + return Result.OK("谁看过我(谁看过我的简历-数量统计)", count); + } + + //会员中心-我的找活 @Override public Result queryResumeByUserId(String token, PageBean pageBean) { diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ExaminationServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ExaminationServiceImpl.java new file mode 100644 index 0000000..214346d --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ExaminationServiceImpl.java @@ -0,0 +1,73 @@ +package org.jeecg.modules.apiService.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.ExaminationService; +import org.jeecg.modules.employCert.entity.EmployCert; +import org.jeecg.modules.employCert.service.IEmployCertService; +import org.jeecg.modules.employRedister.entity.EmployRedister; +import org.jeecg.modules.employRedister.service.IEmployRedisterService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class ExaminationServiceImpl implements ExaminationService { + + /******************************************************************************************************************/ + //权限验证 + @Resource + private ShiroRealm shiroRealm; + + //考证咨询表 + @Resource + private IEmployCertService employCertService; + + //报名材料表 + @Resource + private IEmployRedisterService employRedisterService; + /******************************************************************************************************************/ + + //考证咨询-证书查询 + @Override + public Result queryCertList(PageBean pageBean) { + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employCertService + .lambdaQuery() + .page(page); + + return Result.OK("证书咨询列表", pageList); + } + + //考证咨询-提交报名材料 + @Override + public Result addMaterial(String token, EmployRedister employRedister) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //返回信息 + String message; + + //提交报名材料 + employRedister.setUserId(hanHaiMember.getId()); + boolean result = employRedisterService.save(employRedister); + + //判断招工信息是否添加成功 + if(result){ + message = "报名材料提交成功！"; + }else { + message = "报名材料提交失败！"; + } + return Result.OK(message); + } + + //考证咨询-联系客服 + @Override + public Result queryWorker() { + return null; + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java new file mode 100644 index 0000000..c20a4fe --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/JobServiceImpl.java @@ -0,0 +1,209 @@ +package org.jeecg.modules.apiService.impl; + +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.apiBean.CollectionBean; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.JobService; +import org.jeecg.modules.employCheckJob.entity.EmployCheckJob; +import org.jeecg.modules.employCheckJob.service.IEmployCheckJobService; +import org.jeecg.modules.employCollectionJob.entity.EmployCollectionJob; +import org.jeecg.modules.employCollectionJob.service.IEmployCollectionJobService; +import org.jeecg.modules.employJob.entity.EmployJob; +import org.jeecg.modules.employJob.service.IEmployJobService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class JobServiceImpl implements JobService { + + /******************************************************************************************************************/ + //权限验证 + @Resource + private ShiroRealm shiroRealm; + + //工作信息表 + @Resource + private IEmployJobService employJobService; + + //工作收藏表 + @Resource + private IEmployCollectionJobService employCollectionJobService; + + //工作查看表 + @Resource + private IEmployCheckJobService employCheckJobService; + + /******************************************************************************************************************/ + + + //查询工作信息列表 + @Override + public Result queryJobList(EmployJob employJob, PageBean pageBean) { + //返回信息 + String message = "获取工作信息列表失败!"; + //工作信息列表 + Page pageList = null; + //分页信息 + Page page = null; + + try{ + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + LambdaQueryChainWrapper query = employJobService.lambdaQuery(); + + //组装查询条件 + if(null != employJob.getTypeId()){ + //工作类型 + query.eq(EmployJob::getTypeId, employJob.getTypeId()); + } + if(null != employJob.getNatureId()){ + //工作性质 + query.eq(EmployJob::getNatureId, employJob.getNatureId()); + } + + + //获取工作信息列表 + pageList = query.page(page); + + //判断执行结果 + if(null != pageList){ + message = "工作列表信息"; + }else { + message = "工作列表信息为空"; + } + + //返回执行结果 + return Result.OK(message, pageList); + + }catch (Exception e){ + //错误信息打印 + e.printStackTrace(); + return Result.error(message, pageList); + } + } + + //根据id查询工作详情 + @Override + public Result queryJobById(String token, String jobId) { + CollectionBean collectionBean = new CollectionBean(); + Boolean collectionFlag = false; + + //获取工作详情 + EmployJob one = employJobService + .lambdaQuery() + .eq(EmployJob::getId, jobId) + .one(); + + collectionBean.setEmployJob(one); + + //添加工作被查看记录 + if(null != token){ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + EmployCheckJob employCheckJob = new EmployCheckJob(); + employCheckJob.setJobId(one.getId()); + employCheckJob.setUserId(hanHaiMember.getId()); + employCheckJobService.saveOrUpdate(employCheckJob); + + //添加是否被收藏标识 + EmployCollectionJob collection = employCollectionJobService + .lambdaQuery() + .eq(EmployCollectionJob::getJobId, one.getId()) + .eq(EmployCollectionJob::getUserId, hanHaiMember.getId()) + .one(); + + if(null != collection){ + collectionFlag = true; + } + } + + collectionBean.setCollectionFlag(collectionFlag); + + return Result.OK("工作详情", collectionBean); + } + + //我的招工 + @Override + public Result queryJobListByUserId(String token, PageBean pageBean) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employJobService + .lambdaQuery() + .eq(EmployJob::getUserId, hanHaiMember.getId()) + .page(page); + + return Result.OK("我的招工", pageList); + } + + //添加工作信息 + @Override + public Result addJob(String token, EmployJob employJob) { + //返回信息 + String message = "工作信息添加失败"; + //执行结果 + boolean result = false; + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + employJob.setUserId(hanHaiMember.getId()); + + try{ + //执行工作信息添加 + result = employJobService.save(employJob); + + //判断执行结果 + if(result){ + message = "工作信息添加成功！"; + }else { + message = "工作信息添加失败！"; + } + + //返回执行结果 + return Result.OK(message); + + }catch (Exception e){ + //错误信息打印 + e.printStackTrace(); + return Result.error(message); + } + } + + //修改工作信息 + @Override + public Result updateJob(String token, EmployJob employJob) { + //返回信息 + String message = "工作信息修改失败"; + //执行结果 + boolean result = false; + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + try{ + //执行工作信息修改 + result = employJobService.updateById(employJob); + + //判断执行结果 + if(result){ + message = "工作信息修改成功！"; + }else { + message = "工作信息修改失败！"; + } + + //返回执行结果 + return Result.OK(message); + + }catch (Exception e){ + //错误信息打印 + e.printStackTrace(); + return Result.error(message); + } + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NotebookServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NotebookServiceImpl.java new file mode 100644 index 0000000..8bfaacc --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NotebookServiceImpl.java @@ -0,0 +1,218 @@ +package org.jeecg.modules.apiService.impl; + +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.NotebookService; +import org.jeecg.modules.employBillInfo.entity.EmployBillInfo; +import org.jeecg.modules.employBillInfo.service.IEmployBillInfoService; +import org.jeecg.modules.employFeedback.entity.EmployFeedback; +import org.jeecg.modules.employFeedback.service.IEmployFeedbackService; +import org.jeecg.modules.employNotebook.entity.EmployNotebook; +import org.jeecg.modules.employNotebook.service.IEmployNotebookService; +import org.jeecg.modules.employWorkInfo.entity.EmployWorkInfo; +import org.jeecg.modules.employWorkInfo.service.IEmployWorkInfoService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class NotebookServiceImpl implements NotebookService { + + /******************************************************************************************************************/ + //权限验证 + @Resource + private ShiroRealm shiroRealm; + + //账本表 + @Resource + private IEmployNotebookService employNotebookService; + + //记账信息表 + @Resource + private IEmployBillInfoService employBillInfoService; + + //记工信息表 + @Resource + private IEmployWorkInfoService employWorkInfoService; + + //意见反馈表 + @Resource + private IEmployFeedbackService employFeedbackService; + /******************************************************************************************************************/ + + //记工记账-新建账本 + @Override + public Result addNoteBook(String token, EmployNotebook employNotebook) { + String message = ""; + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + employNotebook.setStatus("0"); + employNotebook.setUserId(hanHaiMember.getId()); + boolean result = employNotebookService.save(employNotebook); + + if(result){ + message = "新建账本成功！"; + }else { + message = "新建账本失败！"; + } + + return Result.OK(message); + } + + //记工记账-修改账本 + @Override + public Result updateNoteBook(String token, EmployNotebook employNotebook) { + String message = ""; + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + boolean result = employNotebookService.updateById(employNotebook); + + if(result){ + message = "修改账本成功！"; + }else { + message = "修改账本失败！"; + } + + return Result.OK(message); + } + + //记工记账-全年收支 + @Override + public Result queryBill(String token, String employNoteBookId, PageBean pageBean) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //获取账本id列表 + Object[] notebooIds = null; + if(null == employNoteBookId){ + //根据用户id查询用户账本列表 + List notebookList = employNotebookService + .lambdaQuery() + .eq(EmployNotebook::getUserId, hanHaiMember.getId()) + .list(); + + //获取账本id列表 + int size = (int)notebookList.size(); + notebooIds = new Object[size]; + int index = 0; + for (EmployNotebook employNotebook : notebookList) { + notebooIds[index] = employNotebook.getId(); + index++; + } + + if(size == 0){ + return Result.OK("没有收支记录", notebookList); + } + + }else { + notebooIds = new Object[]{employNoteBookId}; + + //判断用户输入账本id是否为自己所有 + EmployNotebook employNotebook = employNotebookService + .lambdaQuery() + .eq(EmployNotebook::getUserId, hanHaiMember.getId()) + .eq(EmployNotebook::getId, employNoteBookId) + .one(); + if(null == employNotebook){ + return Result.OK("该用户没有此账本的收支记录，请检查账本id输入是否错误", employNotebook); + } + } + + //根据账本id列表查询收支记录 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employBillInfoService + .lambdaQuery() + .in(EmployBillInfo::getNotebookId, notebooIds) + .page(page); + + return Result.OK("收支记录", pageList); + } + + //记工记账-技工问题 + @Override + public Result addQuestion(String token, EmployFeedback employFeedback) { + String message = ""; + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + employFeedback.setUserId(hanHaiMember.getId()); + boolean result = employFeedbackService.save(employFeedback); + + if(result){ + message = "技工问题添加成功！"; + }else { + message = "技工问题添加失败！"; + } + + return Result.OK(message); + } + + //记工记账-在建结束项目 + @Override + public Result queryNotebookList(String token, String type, String status, PageBean pageBean) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //分页 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + LambdaQueryChainWrapper query = employNotebookService + .lambdaQuery(); + + //组装查询条件 + query.eq(EmployNotebook::getUserId, hanHaiMember.getId()); + if(null != type){ + query.eq(EmployNotebook::getType, type); + } + if(null != status){ + query.eq(EmployNotebook::getStatus, status); + } + + //获取账本信息 + Page pageList = query.page(page); + + return Result.OK("在建/结束项目", pageList); + } + + //记工记账-项目记账 + @Override + public Result addBillInfo(String token, EmployBillInfo employBillInfo) { + String message = ""; + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + boolean result = employBillInfoService.save(employBillInfo); + + if(result){ + message = "项目记账添加成功！"; + }else { + message = "项目记账添加失败！"; + } + + return Result.OK(message); + } + //记工记账-项目记工 + @Override + public Result addWorkInfo(String token, EmployWorkInfo employWorkInfo) { + String message = ""; + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + boolean result = employWorkInfoService.save(employWorkInfo); + + if(result){ + message = "项目记工添加成功！"; + }else { + message = "项目记工添加失败！"; + } + + return Result.OK(message); + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ResumeServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ResumeServiceImpl.java new file mode 100644 index 0000000..24ef518 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ResumeServiceImpl.java @@ -0,0 +1,210 @@ +package org.jeecg.modules.apiService.impl; + +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.apiBean.CollectionBean; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.ResumeService; +import org.jeecg.modules.employCheckJob.service.IEmployCheckJobService; +import org.jeecg.modules.employCheckResume.entity.EmployCheckResume; +import org.jeecg.modules.employCheckResume.service.IEmployCheckResumeService; +import org.jeecg.modules.employCollectionResume.entity.EmployCollectionResume; +import org.jeecg.modules.employCollectionResume.service.IEmployCollectionResumeService; +import org.jeecg.modules.employJob.entity.EmployJob; +import org.jeecg.modules.employResume.entity.EmployResume; +import org.jeecg.modules.employResume.service.IEmployResumeService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +import javax.annotation.Resource; + +@Service +public class ResumeServiceImpl implements ResumeService { + /******************************************************************************************************************/ + //权限验证 + @Resource + private ShiroRealm shiroRealm; + + //简历信息表 + @Resource + private IEmployResumeService employResumeService; + + //简历收藏表 + @Resource + private IEmployCollectionResumeService employCollectionResumeService; + + //简历查看表 + @Resource + private IEmployCheckResumeService employCheckResumeService; + /******************************************************************************************************************/ + + //查询简历信息列表 + @Override + public Result queryResumeList(EmployResume employResume, PageBean pageBean) { + //返回信息 + String message = "获取简历信息列表失败!"; + //简历信息列表 + Page pageList = null; + //分页信息 + Page page = null; + + try{ + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + LambdaQueryChainWrapper query = employResumeService.lambdaQuery(); + + //组装查询条件 + if(null != employResume.getTypeId()){ + //工作类型 + query.eq(EmployResume::getTypeId, employResume.getTypeId()); + } + if(null != employResume.getNatureId()){ + //工作性质 + query.eq(EmployResume::getNatureId, employResume.getNatureId()); + } + + + //获取简历信息列表 + pageList = query.page(page); + + //判断执行结果 + if(null != pageList){ + message = "工作列表信息"; + }else { + message = "工作列表信息为空"; + } + + //返回执行结果 + return Result.OK(message, pageList); + + }catch (Exception e){ + //错误信息打印 + e.printStackTrace(); + return Result.error(message, pageList); + } + } + + //根据id查看简历详情 + @Override + public Result queryResumeById(String token, String resumeId) { + CollectionBean collectionBean = new CollectionBean(); + Boolean collectionFlag = false; + //获取简历详情 + EmployResume one = employResumeService + .lambdaQuery() + .eq(EmployResume::getId, resumeId) + .one(); + + collectionBean.setEmployResume(one); + + if(null != token){ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //添加简历被查看记录 + EmployCheckResume employCheckResume = new EmployCheckResume(); + employCheckResume.setResumeId(one.getId()); + employCheckResume.setUserId(hanHaiMember.getId()); + employCheckResumeService.saveOrUpdate(employCheckResume); + + //添加是否被收藏标识 + EmployCollectionResume collection = employCollectionResumeService + .lambdaQuery() + .eq(EmployCollectionResume::getResumeId, one.getId()) + .eq(EmployCollectionResume::getUserId, hanHaiMember.getId()) + .one(); + + if(null != collection){ + collectionFlag = true; + } + } + collectionBean.setCollectionFlag(collectionFlag); + + return Result.OK("简历详情", collectionBean); + } + + //会员中心-我的简历 + @Override + public Result queryResumeByUserId(String token, PageBean pageBean) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList = employResumeService + .lambdaQuery() + .eq(EmployResume::getUserId, hanHaiMember.getId()) + .page(page); + + return Result.OK("我的简历", pageList); + } + + + //添加简历信息 + @Override + public Result addResume(String token, EmployResume employResume) { + //返回信息 + String message = "简历信息添加失败"; + //执行结果 + boolean result = false; + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + employResume.setUserId(hanHaiMember.getId()); + + try{ + //执行简历信息添加 + result = employResumeService.save(employResume); + + //判断执行结果 + if(result){ + message = "简历信息添加成功！"; + }else { + message = "简历信息添加失败！"; + } + + //返回执行结果 + return Result.OK(message); + + }catch (Exception e){ + //错误信息打印 + e.printStackTrace(); + return Result.error(message); + } + } + + //修改简历信息 + @Override + public Result updateResume(String token, EmployResume employResume) { + //返回信息 + String message = "简历信息修改失败"; + //执行结果 + boolean result = false; + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + try{ + //执行简历信息修改 + result = employResumeService.updateById(employResume); + + //判断执行结果 + if(result){ + message = "简历信息修改成功！"; + }else { + message = "简历信息修改失败！"; + } + + //返回执行结果 + return Result.OK(message); + + }catch (Exception e){ + //错误信息打印 + e.printStackTrace(); + return Result.error(message); + } + } +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java new file mode 100644 index 0000000..309b561 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ScoreServiceImpl.java @@ -0,0 +1,134 @@ +package org.jeecg.modules.apiService.impl; + +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.ScoreService; +import org.jeecg.modules.employScore.entity.EmployScore; +import org.jeecg.modules.employScore.service.IEmployScoreService; +import org.jeecg.modules.employScoreRecord.entity.EmployScoreRecord; +import org.jeecg.modules.employScoreRecord.service.IEmployScoreRecordService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class ScoreServiceImpl implements ScoreService { + /******************************************************************************************************************/ + //权限验证 + @Resource + private ShiroRealm shiroRealm; + + //积分表 + @Resource + private IEmployScoreService employScoreService; + + //积分记录表 + @Resource + private IEmployScoreRecordService employScoreRecordService; + /******************************************************************************************************************/ + + //会员中心-积分 + @Override + public Result queryScore(String token) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //获取积分 + EmployScore score = employScoreService + .lambdaQuery() + .eq(EmployScore::getUserId, hanHaiMember.getId()) + .one(); + + return Result.OK("积分信息", score); + } + + //会员中心-积分记录 + @Override + public Result queryScoreRecord(String token, String type, PageBean pageBean) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //分页 + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + LambdaQueryChainWrapper query = employScoreRecordService.lambdaQuery(); + + //组装查询条件 + query.eq(EmployScoreRecord::getUserId, hanHaiMember.getId()); + if(null != type){ + query.eq(EmployScoreRecord::getType, type); + } + + //获取积分记录 + Page pageList = query.page(page); + + return Result.OK("积分记录", pageList); + } + + //我的服务-获取积分-邀请工友获取积分 + @Override + public Result addScoreByShare(String token, String score) { + //积分表 + //根据userId查询出用户正式积分 + //修改正式积分 + + //积分记录表 + return Result.OK("该接口暂未完成"); + } + + //我的服务-获取积分-每日签到获取积分 + @Override + public Result addScoreBySign(String token, Double score) { + String message = ""; + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //查询该用户是否有积分信息 + EmployScore one = employScoreService + .lambdaQuery() + .eq(EmployScore::getUserId, hanHaiMember.getId()) + .one(); + + //如果有积分信息，就在该基础上增加积分 + EmployScore employScore = new EmployScore(); + employScore.setUserId(hanHaiMember.getId()); + if(null != one){ + double newScore = one.getScore() + score; + + employScore.setId(one.getId()); + employScore.setScore(newScore); + + //添加/修改积分信息 + boolean result = employScoreService.updateById(employScore); + + if(result){ + message = "积分添加成功！"; + }else { + message = "积分添加失败！"; + } + }else { + //如果没有积分信息，就在新建积分 + employScore.setScore(score); + boolean result = employScoreService.save(employScore); + + if(result){ + message = "积分添加成功！"; + }else { + message = "积分添加失败！"; + } + } + + //积分记录添加 + EmployScoreRecord record = new EmployScoreRecord(); + record.setScore(score); + record.setUserId(hanHaiMember.getId()); + record.setTitle("每日签到获取积分"); + record.setType("0"); + employScoreRecordService.save(record); + + return Result.OK(message); + } +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShareServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShareServiceImpl.java new file mode 100644 index 0000000..bb9d9c3 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShareServiceImpl.java @@ -0,0 +1,214 @@ +package org.jeecg.modules.apiService.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; +import com.aliyun.oss.OSS; +import com.aliyun.oss.OSSClientBuilder; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.apiBean.HttpClientUtil; +import org.jeecg.modules.apiBean.WxQrCodeVo; +import org.jeecg.modules.apiService.ShareService; +import org.jeecg.modules.employConfig.entity.EmployConfig; +import org.jeecg.modules.employConfig.service.IEmployConfigService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.commons.CommonsMultipartFile; + +import javax.annotation.Resource; +import java.io.*; +import java.util.HashMap; +import java.util.Map; + +@Service +public class ShareServiceImpl implements ShareService { + + /*************************************************************************************/ + //权限验证 + @Resource + private ShiroRealm shiroRealm; + + //配置信息 + @Resource + private IEmployConfigService employConfigService; + + private String appid = "wxe631bce44d54667e";//小程序appid + private String secret = "2f19c405ea9bb523f350b5a9fd01b878";//小程序密钥 + private String endpoint = "oss-cn-guangzhou.aliyuncs.com"; + private String accessKey = "LTAI5tPfZo39q2r9Sr5mW84u"; + private String secretKey = "XxExGallsV4O9nERHpVsQg2XtPCU7r"; + private String bucketName = "augcl"; + /*************************************************************************************/ + + //获取个人推荐二维码 + @Override + public Result getInviteCode(String token) { + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //获取版本信息 + EmployConfig vsion = employConfigService.lambdaQuery() + .eq(EmployConfig::getParamCode, "v_sion") + .one(); + Integer vsionStr = Integer.parseInt(vsion.getParamValue()); + String trial = "release"; + if(vsionStr == 0){ + trial= "release"; + }else if(vsionStr == 1){ + trial= "trial"; + }else{ + trial= "develop"; + } + + Map param = new HashMap<>(); + //获取跳转路径信息 + EmployConfig xcxSharePage = employConfigService.lambdaQuery() + .eq(EmployConfig::getParamCode, "xcxSharePage") + .one(); + + String key = "shareId=" + hanHaiMember.getId(); + + param.put("path", xcxSharePage.getParamValue() + "?" + key); //跳转页面 + String accessToken = this.getAccessToken(); + RestTemplate rest = new RestTemplate(); + InputStream inputStream = null; + OutputStream outputStream = null; + File file = null; + + //获取存储地址 + EmployConfig oneImage = employConfigService.lambdaQuery() + .eq(EmployConfig::getParamCode, "codeImg") + .one(); + + String codeImg = oneImage.getParamValue(); + try{ + String url = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + accessToken; + //param.put("scene", hanHaiMember.getId()); + param.put("scene", "1830614749375053826"); + param.put("width", 150); + param.put("auto_color", false); + param.put("env_version", trial); + Map line_color = new HashMap<>(); + line_color.put("r", 0); + line_color.put("g", 0); + line_color.put("b", 0); + param.put("line_color", line_color); + MultiValueMap headers = new LinkedMultiValueMap<>(); + org.springframework.http.HttpEntity requestEntity = new org.springframework.http.HttpEntity(JSON.toJSONString(param), headers); + ResponseEntity entity = rest.exchange(url, HttpMethod.POST, requestEntity, byte[].class, new Object[0]); + byte[] result = entity.getBody(); + + inputStream = new ByteArrayInputStream(result); + String tempSave = codeImg; + String filePath = tempSave; + + file = new File(filePath); + if (!file.exists()) { + file.createNewFile(); + } + outputStream = new FileOutputStream(file); + int len = 0; + byte[] buf = new byte[1024]; + while ((len = inputStream.read(buf, 0, 1024)) != -1) { + outputStream.write(buf, 0, len); + } + outputStream.flush(); + + //将文件上传至阿里云 + DiskFileItemFactory factory = new DiskFileItemFactory(16, null); + FileItem item = factory.createItem("File", "text/plain", true, file.getName()); + int bytesRead = 0; + byte[] buffer = new byte[8192]; + try { + FileInputStream fis = new FileInputStream(file); + OutputStream os = item.getOutputStream(); + while ((bytesRead = fis.read(buffer, 0, 8192)) != -1) { + os.write(buffer, 0, bytesRead); + } + os.close(); + fis.close(); + } catch (IOException e) { + e.printStackTrace(); + } + MultipartFile mf = new CommonsMultipartFile(item); + //返回图片下载地址 + WxQrCodeVo wxCodeVo = new WxQrCodeVo(); + wxCodeVo.setUrl(this.uploadAliYunOss(mf)); + + wxCodeVo.setName("特易招欢迎您"); + + return Result.OK(wxCodeVo); + + } catch (Exception e) { + e.printStackTrace(); + } finally { + + if (inputStream != null) { + try { + inputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + if (outputStream != null) { + try { + outputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + //删除文件 + if (file.exists()) { + file.delete(); + } + } + return null; + } + + /** + * 获取令牌 + * + * @return + */ + private String getAccessToken() { + String requestUrl = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + secret; + String doGet2 = HttpClientUtil.doGet2(requestUrl); + Map map = JSON.parseObject(doGet2, new TypeReference>() { + }); + return map.get("access_token"); + } + + /** + * 上传文件至阿里云oss + * + * @return + */ + private String uploadAliYunOss(MultipartFile mf) throws Exception { + String uploadFile = "WxCodeFile"; + String fileName = new StringBuffer(mf.getOriginalFilename()).append(".jpg").toString();// 获取文件名 + String dbpath = uploadFile + File.separator + fileName; + if (dbpath.contains("\\")) { + dbpath = dbpath.replace("\\", "/"); + } + String endpoint = this.endpoint; + String accessKey = this.accessKey; + String secretKey = this.secretKey; + // 创建OSSClient实例。 + OSS ossClient = new OSSClientBuilder().build(endpoint, accessKey, secretKey); + // 上传Byte数组。 + byte[] content = mf.getBytes(); + String bucketName = this.bucketName; + ossClient.putObject(bucketName, dbpath, new ByteArrayInputStream(content)); + // 关闭OSSClient。 + ossClient.shutdown(); + return dbpath; + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java new file mode 100644 index 0000000..21752cc --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java @@ -0,0 +1,50 @@ +package org.jeecg.modules.apiService.impl; + +import org.jeecg.common.api.vo.Result; +import org.jeecg.config.shiro.ShiroRealm; +import org.jeecg.modules.apiService.VipService; +import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.jeecg.modules.pay.MpWxPayService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; + +@Service +public class VipServiceImpl implements VipService { + + //支付接口 + @Autowired + private MpWxPayService mpWxPayService; + + //权限验证 + @Resource + private ShiroRealm shiroRealm; + + @Override + public Result addVIP(String token) { + + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //吊起微信支付 + BigDecimal price = BigDecimal.valueOf(0.01);//价格 + String productName = "VIP"; + String orderId = ""; + + String s = price.multiply(new BigDecimal(100)).toString(); + int i1 = Double.valueOf(s).intValue(); + Object appOrder = mpWxPayService.createOrder( + "购买"+ productName , + "127.0.0.1", + orderId, + i1, + orderId, + hanHaiMember.getAppletOpenid(), + "订单对象"); + + return Result.OK("支付成功",appOrder); + } +} diff --git a/jeecg-boot-module-system/src/main/resources/banner.txt b/jeecg-boot-module-system/src/main/resources/banner.txt index 79cf4e5..c2d28c4 100644 --- a/jeecg-boot-module-system/src/main/resources/banner.txt +++ b/jeecg-boot-module-system/src/main/resources/banner.txt @@ -1,25 +1,12 @@ ${AnsiColor.BRIGHT_BLUE} -// _ooOoo_ // -// o8888888o // -// 88" . "88 // -// (| ^_^ |) // -// O\ = /O // -// ____/`---'\____ // -// .' \\| |// `. // -// / \\||| : |||// \ // -// / _||||| -:- |||||- \ // -// | | \\\ - /// | | // -// | \_| ''\---/'' | | // -// \ .-\__ `-` ___/-. / // -// ___`. .' /--.--\ `. . ___ // -// ."" '< `.___\_<|>_/___.' >'"". // -// | | : `- \`.;`\ _ /`;.`/ - ` : | | // -// \ \ `-. \_ __\ /__ _/ .-` / / // -// ========`-.____`-.___\_____/___.-`____.-'======== // -// `=---=' // -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ // -// 佛祖保佑 永不宕机 永无BUG // -———————————————— +————————————————————————————————————————————————— +__ __ ___ ___ __ __ ___ _ _ +\ \ / /| __| |_ _| \ \ / / |_ _| | \| | + \ \/\/ / | _| | | \ V / | | | .` | + \_/\_/ |___| |___| _|_|_ |___| |_|\_| +_|"""""|_|"""""|_|"""""|_| """ |_|"""""|_|"""""| +WEI YIN SOFTWARE STUDIO 微隐软件工作室 +————————————————————————————————————————————————— ${AnsiColor.BRIGHT_GREEN} Jeecg Boot Version: 3.2.0 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}