czg_team
/
chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

This commit is contained in:
zhujunshuai 2023-01-29 14:28:01 +08:00
parent 9a0b839abe c513d14203
commit 20dc71421d
18 changed files with 2251 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

290
.idea/workspace.xml
View File

@ -4,251 +4,9 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="a8a68d09-bb62-4c54-a8c8-4495b550f9ca" name="默认变更列表" comment="更改配置">
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cn_hutool_hutool_all_5_8_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__cn_hutool_hutool_all_5_8_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cn_jpush_api_jiguang_common_1_1_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__cn_jpush_api_jiguang_common_1_1_12.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cn_jpush_api_jpush_client_3_4_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__cn_jpush_api_jpush_client_3_4_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cn_jpush_api_jpush_client_3_5_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__cn_jpush_api_jpush_client_3_5_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_1_1_23.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_1_1_23.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_23.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_23.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson2_fastjson2_2_0_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson2_fastjson2_2_0_9.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_75.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_75.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_4_16_11_ALL.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_4_16_11_ALL.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_4_16_21_ALL.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_4_16_21_ALL.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_4_7_1_ALL.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_4_7_1_ALL.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_3_4_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_4_5_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_4_5_7.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_ecs_4_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_ecs_4_2_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_geoip_1_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_geoip_1_0_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_kms_2_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_kms_2_7_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_onsmqtt_1_0_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_onsmqtt_1_0_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_ram_3_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_ram_3_0_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_sts_3_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_sts_3_0_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_sts_3_0_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_sts_3_0_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_credentials_java_0_2_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_credentials_java_0_2_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_dysmsapi20170525_2_0_21.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_dysmsapi20170525_2_0_21.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_endpoint_util_0_0_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_endpoint_util_0_0_7.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_openapiutil_0_1_14.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_openapiutil_0_1_14.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_3_9_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_3_9_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_tea_1_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_tea_1_2_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_tea_openapi_0_2_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_tea_openapi_0_2_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_tea_util_0_2_14.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_tea_util_0_2_14.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_tea_xml_0_1_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_tea_xml_0_1_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_auth0_java_jwt_3_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_auth0_java_jwt_3_4_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_5_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_5_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_5_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_5_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_5_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_5_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_5_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_5_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_5_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_5_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_5_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_5_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_7.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_7.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_11_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_7.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_7.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_7.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_binarywang_java_emoji_converter_1_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_binarywang_java_emoji_converter_1_0_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_3_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_tencentyun_tls_sig_api_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_tencentyun_tls_sig_api_1_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_xiaoymin_swagger_bootstrap_ui_1_9_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_xiaoymin_swagger_bootstrap_ui_1_9_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_20_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_20_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_zxing_core_3_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_zxing_core_3_0_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_hannesdorfmann_httpkit_1_5_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_hannesdorfmann_httpkit_1_5_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_ibeetl_beetl_3_10_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_ibeetl_beetl_3_10_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jakewharton_disklrucache_2_0_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jakewharton_disklrucache_2_0_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mob_push_sdk_mobpush_websdkv3_java_1_0_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mob_push_sdk_mobpush_websdkv3_java_1_0_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_opencsv_opencsv_4_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_opencsv_opencsv_4_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_4_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_4_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_12_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_12_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okio_okio_1_15_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okio_okio_1_15_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_mail_javax_mail_1_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_mail_javax_mail_1_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_3_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_3_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_11.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_vdurmont_emoji_java_3_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_vdurmont_emoji_java_3_2_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_net_commons_net_3_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_net_commons_net_3_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_29_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_29_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_opentracing_opentracing_api_0_33_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_opentracing_opentracing_api_0_33_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_opentracing_opentracing_noop_0_33_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_opentracing_opentracing_noop_0_33_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_opentracing_opentracing_util_0_33_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_opentracing_opentracing_util_0_33_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__joda_time_joda_time_2_10_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__joda_time_joda_time_2_10_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_49.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_49.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_coobird_thumbnailator_0_4_14.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_coobird_thumbnailator_0_4_14.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sourceforge_nekohtml_nekohtml_1_9_22.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sourceforge_nekohtml_nekohtml_1_9_22.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_antlr_antlr4_runtime_4_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_antlr_antlr4_runtime_4_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_compress_1_18.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_compress_1_18.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_8_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_8_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_text_1_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_text_1_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_13.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_10.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_14.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_14.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_13.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_11_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_11_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_11_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_11_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_11_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_11_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_4_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_4_1_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_taglibs_taglibs_standard_impl_1_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_taglibs_taglibs_standard_impl_1_2_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_12.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_12.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_jasper_9_0_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_jasper_9_0_12.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_12.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_59.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_59.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_60.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_60.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_60.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_60.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_62.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_62.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15to18_1_69.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15to18_1_69.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_dom4j_dom4j_2_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_dom4j_dom4j_2_0_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jdt_ecj_3_13_102.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jdt_ecj_3_13_102.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_paho_org_eclipse_paho_client_mqttv3_1_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_paho_org_eclipse_paho_client_mqttv3_1_2_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_all_1_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_13_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_13_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ini4j_ini4j_0_5_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ini4j_ini4j_0_5_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_25_0_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_25_0_GA.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jdom_jdom2_2_0_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jdom_jdom2_2_0_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jdom_jdom_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jdom_jdom_1_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_annotations_13_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_annotations_13_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_2_71.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_2_71.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_2_71.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_2_71.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_2_71.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_2_71.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_5_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_5_10.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_test_1_5_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_test_1_5_10.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jodd_jodd_core_3_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jodd_jodd_core_3_7.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jodd_jodd_http_3_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jodd_jodd_http_3_7.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jodd_jodd_upload_3_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jodd_jodd_upload_3_7.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20140107.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20140107.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20180130.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20180130.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_4_2_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_4_2_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_processor_1_4_2_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_processor_1_4_2_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_2_23_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_2_23_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_5_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_5_10.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_5_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_5_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_7.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_18_20.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_18_20.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_18_24.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_18_24.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_1_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_1_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_1_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_1_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_test_2_1_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_test_2_1_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_1_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_1_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_1_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_1_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_1_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_mail_2_1_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_1_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_1_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_1_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_1_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_1_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_1_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_1_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_1_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_1_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_1_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_1_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_1_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_1_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_1_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_messaging_5_1_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_messaging_5_1_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_1_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_1_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_1_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_1_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_1_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_1_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_2_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_1_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_1_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_11_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_11_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xml_security_xmlsec_1_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__xml_security_xmlsec_1_3_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml" afterDir="false" />
<list default="true" id="a8a68d09-bb62-4c54-a8c8-4495b550f9ca" name="默认变更列表" comment="更改部分配置（百度文字识别）">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/PhoneValidateCodeController.class" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-api-page/target/classes/cn/pluss/platform/controller/PhoneValidateCodeController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pluss-dao-bundle/target/classes/mapper/MercMemberSetMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-dao-bundle/target/classes/mapper/MercMemberSetMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pluss-common-bundle/target/classes/config/application-common.yml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-common-bundle/target/classes/config/application-common.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java" afterDir="false" />
@ -256,6 +14,10 @@
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/ys/impl/v20210929/YsAuditServiceImpl$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/ys/impl/v20210929/YsAuditServiceImpl$1.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/ysExtension/v20220615/YsAuditServiceImpl$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-service-bundle/target/classes/cn/pluss/platform/ysExtension/v20220615/YsAuditServiceImpl$1.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pluss-wap-page/pluss-wap-page.iml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-wap-page/pluss-wap-page.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pluss-wap-page/src/main/resources/application-test.yml" beforeDir="false" afterPath="$PROJECT_DIR$/pluss-wap-page/src/main/resources/application-test.yml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -294,7 +56,7 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../cz/cz-parent" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.detected.package.tslint" value="true" />
<property name="node.js.selected.package.eslint" value="(autodetect)" />
@ -312,7 +74,7 @@
</set>
</option>
</component>
<component name="RunManager" selected="Spring Boot.ApiApplication">
<component name="RunManager" selected="Spring Boot.WapApplication">
<configuration name="Base64Util" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="cn.pluss.platform.util.Base64Util" />
<module name="pluss-common-bundle" />
@ -326,19 +88,6 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
<option name="arquillianRunConfiguration">
<value>
<option name="containerStateName" value="" />
</value>
</option>
<option name="TEST_OBJECT" value="CLASS" />
<properties />
<listeners />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="ApiApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="pluss-api-page" />
<option name="SPRING_BOOT_MAIN_CLASS" value="cn.pluss.platform.ApiApplication" />
@ -394,7 +143,8 @@
<workItem from="1674003718074" duration="22135000" />
<workItem from="1674867825532" duration="12546000" />
<workItem from="1674889612655" duration="4695000" />
<workItem from="1674894362598" duration="2975000" />
<workItem from="1674894362598" duration="8405000" />
<workItem from="1674954816004" duration="4649000" />
</task>
<task id="LOCAL-00001" summary="更改配置">
<created>1674892648184</created>
@ -403,7 +153,21 @@
<option name="project" value="LOCAL" />
<updated>1674892648184</updated>
</task>
<option name="localTasksCounter" value="2" />
<task id="LOCAL-00002" summary="更改发送短信，">
<created>1674897664824</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1674897664824</updated>
</task>
<task id="LOCAL-00003" summary="更改部分配置（百度文字识别）">
<created>1674956689324</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1674956689324</updated>
</task>
<option name="localTasksCounter" value="4" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -465,7 +229,9 @@
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="更改配置" />
<option name="LAST_COMMIT_MESSAGE" value="更改配置" />
<MESSAGE value="更改发送短信，" />
<MESSAGE value="更改部分配置（百度文字识别）" />
<option name="LAST_COMMIT_MESSAGE" value="更改部分配置（百度文字识别）" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>

3
pluss-api-page/src/main/java/cn/pluss/platform/controller/common/ImageUploadController.java
View File

@ -30,8 +30,9 @@ public class ImageUploadController {
return ResultGenerator.genSuccessResult(url);
}
@PostMapping("")
@PostMapping("/image")
public Result<?> imageUpload(@RequestParam("file") MultipartFile file) {
System.out.println("26sa1d521sa561s56");
final String url;
try {
url = OssOperatUtil.upload(file.getInputStream(), UUID.randomUUID().toString().replace("-", ""), "png");

BIN
pluss-api-page/target/classes/cn/pluss/platform/controller/common/ImageUploadController.class
View File

Binary file not shown.

6
pluss-common-bundle/src/main/resources/config/application-common.yml
View File

@ -93,7 +93,7 @@ parameter:
ALI_APP_ID: 支付宝原生接入的APPID
ALI_RATE: 0.006
ALI_RETURN_URL: ${parameter.domain}/wap/aliPay/returnUrl
APPID: 微信原生接入的APPID
APPID: wx7f982bbf66000fd1
APPLETS_APPID: 小程序付款APPID
APPSECRET:
KEY: 微信原生加密用的KEY
@ -113,8 +113,8 @@ parameter:
ZY_PUB:
agentId: 乐刷代理商编号、未接入可不管
apk_dowload_url: apk下载链接，存储转入OSS之后可不管
baiduAK: cqmQn4RoZgC0IyH4mbHjKmQQ
baiduSK: hUhGrZFONMBjIzUQULOtlSXP3uTpompp
baiduAK: LUcko8ZP334suBQ929nbrBtV
baiduSK: VqPHkWS5oipOEc2yw7dNa5CWr7yGIyiE
bankCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/bankcard
blCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/business_license
# 百度人脸识别应用的AK

146
pluss-common-bundle/target/classes/config/application-common.yml Normal file
View File

@ -0,0 +1,146 @@
juhe:
send:
url: http://v.juhe.cn/sms/send
key: aeb2ea1a00cc46551aa93503ae9db7b1
ip138:
url: https://api.ip138.com/ipv4/
token: 获取token
aliyun:
# 这里推荐使用RAM账号信息 #
keyid: LTAI5tMLHwnM1zYYAFuRa1fK
keysecret: jS1h2STq1vcODczDNFQkjcU6ODyYAj
region-id: cn-hangzhou
sts:
role-arn:
endpoint: https://sts.cn-hangzhou.aliyuncs.com
oss:
endpoint: https://oss-cn-hangzhou.aliyuncs.com
bucketname: czg-oss
callback: ${parameter.domain}/manage/upload/ossCallback
bankcard:
bank-url: https://aliyun-bankcard4-verify.apistore.cn/bank4
app-code: 11cb746de2704f5482a40fd36ed8a1f1
#阿里MQTT参数配置
mqtt:
region-id: cn-hangzhou
keyid:
keysecret:
instance-id:
topic:
groupid:
# druid连接池基本配置 #
spring:
mail:
default-encoding: utf-8
host: smtp.exmail.qq.com
port: 465
nickname: 发送报表邮件的昵称
username: 发送报表右键的邮箱
password:
properties:
mail:
smtp:
starttls:
enable: true
required: true
ssl:
enable: true
socketFactory:
fallback: false
class: com.fintech.modules.base.util.mail.MailSSLSocketFactory
# username: 1317450073@qq.com
# password: ldbidwgegkwtjcca
datasource:
type: com.alibaba.druid.pool.DruidDataSource
druid:
connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500
filters: stat, wall
filter:
stat:
log-slow-sql: true
slow-sql-millis: 1000
wall:
config:
multi-statement-allow: true
none-base-statement-allow: true
enabled: true
initial-size: 5
max-active: 20
max-pool-prepared-statement-per-connection-size: 20
max-wait: 60000
min-evictable-idle-time-millis: 30000
min-idle: 5
test-on-borrow: false
test-on-return: false
test-while-idle: true
time-between-eviction-runs-millis: 60000
use-global-data-source-stat: true
validation-query: select 'x'
rabbitmq:
username:
password:
host:
port: 5672
parameter:
domain: http://60.205.224.68
ALI_APP_AUTH_TOKEN: ${parameter.domain}/wap/aliPay/index
ALI_APP_ID: 支付宝原生接入的APPID
ALI_RATE: 0.006
ALI_RETURN_URL: ${parameter.domain}/wap/aliPay/returnUrl
APPID: wx7f982bbf66000fd1
APPLETS_APPID: 小程序付款APPID
APPSECRET:
KEY: 微信原生加密用的KEY
LESHUALIU: 乐刷、未接入可不管
LESHUA_API:
MERCHANT_APPID:
MERCHANT_APPSECRET:
MERCHANT_KEY:
MERCHANT_PID:
PID:
PRI:
PUB:
REPLACE: /home/syb
WECHAT_RATE:
ZY_ALI_APP_ID:
ZY_PRI:
ZY_PUB:
agentId: 乐刷代理商编号、未接入可不管
apk_dowload_url: apk下载链接，存储转入OSS之后可不管
baiduAK: LUcko8ZP334suBQ929nbrBtV
baiduSK: VqPHkWS5oipOEc2yw7dNa5CWr7yGIyiE
bankCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/bankcard
blCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/business_license
# 百度人脸识别应用的AK
baiduAK2:
# 百度人脸识别应用的SK
baiduSK2:
fans_profit: 4.0E-4
idCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/idcard
leshuaCallBackKey:
leshuapaykey:
leshuarate: 0.0038
upload_save_path: /czg/resources/images/upload
upload_visit_path: ${parameter.domain}/resources/images/upload
versions: 1
wechatCallback:
#商家公众号APPID
SJ_APPID:
#收银呗商家APPSECRET
SJ_APPSECRET:
## 默认为正式环境
sxf:
domain: https://openapi.tianquetech.com
orgId:
publicKey:
getui:
domain: https://restapi.getui.com/v2/${getui.appId}
appId:

37
pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/BankCardConverterImpl.java Normal file
View File

@ -0,0 +1,37 @@
package cn.pluss.platform.converter;
import cn.pluss.platform.dto.BankInfoDTO;
import cn.pluss.platform.entity.BankCard;
import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2023-01-29T10:16:06+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class BankCardConverterImpl implements BankCardConverter {
@Override
public BankCard dto2Domain(BankInfoDTO bankInfoDTO) {
if ( bankInfoDTO == null ) {
return null;
}
BankCard bankCard = new BankCard();
bankCard.setUserId( bankInfoDTO.getUserId() );
bankCard.setBankCardNo( bankInfoDTO.getBankCardNo() );
bankCard.setBankName( bankInfoDTO.getBankName() );
bankCard.setBranchName( bankInfoDTO.getBranchName() );
bankCard.setAccountType( bankInfoDTO.getAccountType() );
bankCard.setContactLine( bankInfoDTO.getContactLine() );
bankCard.setBranchProvince( bankInfoDTO.getBranchProvince() );
bankCard.setBranchCity( bankInfoDTO.getBranchCity() );
bankCard.setBranchArea( bankInfoDTO.getBranchArea() );
bankCard.setBankAddressNo( bankInfoDTO.getBankAddressNo() );
bankCard.setPhone( bankInfoDTO.getPhone() );
bankCard.setImgUrl( bankInfoDTO.getImgUrl() );
return bankCard;
}
}

1455
pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ConverterImpl.java Normal file
View File

File diff suppressed because it is too large Load Diff

43
pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/ImgConverterImpl.java Normal file
View File

@ -0,0 +1,43 @@
package cn.pluss.platform.converter;
import cn.pluss.platform.entity.MerchantImage;
import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2023-01-29T10:16:06+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class ImgConverterImpl implements ImgConverter {
@Override
public MerchantImage imgCopy(MerchantImage merchantImage) {
if ( merchantImage == null ) {
return null;
}
MerchantImage merchantImage1 = new MerchantImage();
merchantImage1.setId( merchantImage.getId() );
merchantImage1.setMerchantCode( merchantImage.getMerchantCode() );
merchantImage1.setPhotoType( merchantImage.getPhotoType() );
merchantImage1.setPhotoUrl( merchantImage.getPhotoUrl() );
merchantImage1.setPicUrl( merchantImage.getPicUrl() );
merchantImage1.setPicUrl1( merchantImage.getPicUrl1() );
merchantImage1.setPicUrl2( merchantImage.getPicUrl2() );
merchantImage1.setPicUrl3( merchantImage.getPicUrl3() );
merchantImage1.setPicUrl6( merchantImage.getPicUrl6() );
merchantImage1.setPicUrl7( merchantImage.getPicUrl7() );
merchantImage1.setPicUrl8( merchantImage.getPicUrl8() );
merchantImage1.setPicUrl9( merchantImage.getPicUrl9() );
merchantImage1.setPicUrl999( merchantImage.getPicUrl999() );
merchantImage1.setPicUrl101( merchantImage.getPicUrl101() );
merchantImage1.setPicUrl102( merchantImage.getPicUrl102() );
merchantImage1.setPicUrl11( merchantImage.getPicUrl11() );
merchantImage1.setCreateDt( merchantImage.getCreateDt() );
merchantImage1.setUpdateDt( merchantImage.getUpdateDt() );
merchantImage1.setAisleSwitch( merchantImage.getAisleSwitch() );
return merchantImage1;
}
}

314
pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantBaseInfoConverterImpl.java Normal file
View File

@ -0,0 +1,314 @@
package cn.pluss.platform.converter;
import cn.pluss.platform.dto.MerchantBaseInfoDTO;
import cn.pluss.platform.entity.MerchantBaseInfo;
import cn.pluss.platform.entity.MerchantStore;
import cn.pluss.platform.entity.UserApp;
import cn.pluss.platform.vo.MerchantBaseInfoVO;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2023-01-29T10:16:06+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class MerchantBaseInfoConverterImpl implements MerchantBaseInfoConverter {
@Override
public MerchantBaseInfoDTO domain2dto(MerchantBaseInfo entity) {
if ( entity == null ) {
return null;
}
MerchantBaseInfoDTO merchantBaseInfoDTO = new MerchantBaseInfoDTO();
merchantBaseInfoDTO.setId( entity.getId() );
merchantBaseInfoDTO.setUserId( entity.getUserId() );
merchantBaseInfoDTO.setMerchantName( entity.getMerchantName() );
merchantBaseInfoDTO.setMerchantType( entity.getMerchantType() );
merchantBaseInfoDTO.setAlias( entity.getAlias() );
merchantBaseInfoDTO.setMcc( entity.getMcc() );
merchantBaseInfoDTO.setMccName( entity.getMccName() );
merchantBaseInfoDTO.setAliAccount( entity.getAliAccount() );
merchantBaseInfoDTO.setProductDesc( entity.getProductDesc() );
merchantBaseInfoDTO.setAddressNo( entity.getAddressNo() );
merchantBaseInfoDTO.setMerchantAddress( entity.getMerchantAddress() );
merchantBaseInfoDTO.setAddress( entity.getAddress() );
merchantBaseInfoDTO.setContactMobile( entity.getContactMobile() );
merchantBaseInfoDTO.setContactName( entity.getContactName() );
merchantBaseInfoDTO.setEmail( entity.getEmail() );
merchantBaseInfoDTO.setStoreHeadPic( entity.getStoreHeadPic() );
merchantBaseInfoDTO.setStoreInsidePic( entity.getStoreInsidePic() );
merchantBaseInfoDTO.setCashPic( entity.getCashPic() );
merchantBaseInfoDTO.setUserPhone( entity.getUserPhone() );
return merchantBaseInfoDTO;
}
@Override
public MerchantBaseInfoVO domain2VO(MerchantBaseInfo entity) {
if ( entity == null ) {
return null;
}
MerchantBaseInfoVO merchantBaseInfoVO = new MerchantBaseInfoVO();
merchantBaseInfoVO.setId( entity.getId() );
merchantBaseInfoVO.setBindingCode( entity.getBindingCode() );
merchantBaseInfoVO.setUserId( entity.getUserId() );
merchantBaseInfoVO.setAliAccount( entity.getAliAccount() );
merchantBaseInfoVO.setMerchantCode( entity.getMerchantCode() );
merchantBaseInfoVO.setMerchantName( entity.getMerchantName() );
merchantBaseInfoVO.setMerchantType( entity.getMerchantType() );
merchantBaseInfoVO.setProductDesc( entity.getProductDesc() );
merchantBaseInfoVO.setAliMcc( entity.getAliMcc() );
merchantBaseInfoVO.setMcc( entity.getMcc() );
merchantBaseInfoVO.setMccName( entity.getMccName() );
merchantBaseInfoVO.setAlias( entity.getAlias() );
merchantBaseInfoVO.setContactMobile( entity.getContactMobile() );
merchantBaseInfoVO.setContactName( entity.getContactName() );
merchantBaseInfoVO.setAddressNo( entity.getAddressNo() );
merchantBaseInfoVO.setProvince( entity.getProvince() );
merchantBaseInfoVO.setCity( entity.getCity() );
merchantBaseInfoVO.setDistrict( entity.getDistrict() );
merchantBaseInfoVO.setAddress( entity.getAddress() );
merchantBaseInfoVO.setEmail( entity.getEmail() );
merchantBaseInfoVO.setPrincipalMobile( entity.getPrincipalMobile() );
merchantBaseInfoVO.setPrincipalCertType( entity.getPrincipalCertType() );
merchantBaseInfoVO.setPrincipalCertNo( entity.getPrincipalCertNo() );
merchantBaseInfoVO.setPrincipalPerson( entity.getPrincipalPerson() );
merchantBaseInfoVO.setBussAuthName( entity.getBussAuthName() );
merchantBaseInfoVO.setBussAuthNum( entity.getBussAuthNum() );
merchantBaseInfoVO.setBussAuthAddress( entity.getBussAuthAddress() );
merchantBaseInfoVO.setBussAuthStartTime( entity.getBussAuthStartTime() );
merchantBaseInfoVO.setBussAuthEndTime( entity.getBussAuthEndTime() );
merchantBaseInfoVO.setAllowBankLarge( entity.getAllowBankLarge() );
merchantBaseInfoVO.setWxCertStatus( entity.getWxCertStatus() );
merchantBaseInfoVO.setCreateDt( entity.getCreateDt() );
merchantBaseInfoVO.setUpdateDt( entity.getUpdateDt() );
merchantBaseInfoVO.setBuslicType( entity.getBuslicType() );
merchantBaseInfoVO.setIsVoice( entity.getIsVoice() );
merchantBaseInfoVO.setIsPushWxMessage( entity.getIsPushWxMessage() );
merchantBaseInfoVO.setIsUnionPay( entity.getIsUnionPay() );
merchantBaseInfoVO.setMd5Key( entity.getMd5Key() );
merchantBaseInfoVO.setLimitPay( entity.getLimitPay() );
merchantBaseInfoVO.setSubAppId( entity.getSubAppId() );
merchantBaseInfoVO.setAppid( entity.getAppid() );
merchantBaseInfoVO.setStatus( entity.getStatus() );
merchantBaseInfoVO.setMerchantAddress( entity.getMerchantAddress() );
merchantBaseInfoVO.setStoreHeadPic( entity.getStoreHeadPic() );
merchantBaseInfoVO.setStoreInsidePic( entity.getStoreInsidePic() );
merchantBaseInfoVO.setCashPic( entity.getCashPic() );
merchantBaseInfoVO.setLiteralPic( entity.getLiteralPic() );
merchantBaseInfoVO.setWarrantyPic( entity.getWarrantyPic() );
merchantBaseInfoVO.setDealPic( entity.getDealPic() );
merchantBaseInfoVO.setAffilatePic( entity.getAffilatePic() );
merchantBaseInfoVO.setHandPic( entity.getHandPic() );
merchantBaseInfoVO.setMerchantAuditStatus( entity.getMerchantAuditStatus() );
merchantBaseInfoVO.setStartTime( entity.getStartTime() );
merchantBaseInfoVO.setEndTime( entity.getEndTime() );
merchantBaseInfoVO.setImgUrl( entity.getImgUrl() );
merchantBaseInfoVO.setLoginName( entity.getLoginName() );
merchantBaseInfoVO.setPassword( entity.getPassword() );
merchantBaseInfoVO.setLogo( entity.getLogo() );
merchantBaseInfoVO.setUserPhone( entity.getUserPhone() );
merchantBaseInfoVO.setUserName( entity.getUserName() );
merchantBaseInfoVO.setBusinessLicensePic( entity.getBusinessLicensePic() );
merchantBaseInfoVO.setLocation( entity.getLocation() );
merchantBaseInfoVO.setFirstTradeTime( entity.getFirstTradeTime() );
merchantBaseInfoVO.setLastTradeTime( entity.getLastTradeTime() );
merchantBaseInfoVO.setSplitFlag( entity.getSplitFlag() );
merchantBaseInfoVO.setValidFlag( entity.getValidFlag() );
return merchantBaseInfoVO;
}
@Override
public MerchantBaseInfo vo2domain(MerchantBaseInfoVO entity) {
if ( entity == null ) {
return null;
}
MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
merchantBaseInfo.setId( entity.getId() );
merchantBaseInfo.setBindingCode( entity.getBindingCode() );
merchantBaseInfo.setUserId( entity.getUserId() );
merchantBaseInfo.setAliAccount( entity.getAliAccount() );
merchantBaseInfo.setMerchantCode( entity.getMerchantCode() );
merchantBaseInfo.setMerchantName( entity.getMerchantName() );
merchantBaseInfo.setMerchantType( entity.getMerchantType() );
merchantBaseInfo.setProductDesc( entity.getProductDesc() );
merchantBaseInfo.setAliMcc( entity.getAliMcc() );
merchantBaseInfo.setMcc( entity.getMcc() );
merchantBaseInfo.setMccName( entity.getMccName() );
merchantBaseInfo.setAlias( entity.getAlias() );
merchantBaseInfo.setContactMobile( entity.getContactMobile() );
merchantBaseInfo.setContactName( entity.getContactName() );
merchantBaseInfo.setAddressNo( entity.getAddressNo() );
merchantBaseInfo.setProvince( entity.getProvince() );
merchantBaseInfo.setCity( entity.getCity() );
merchantBaseInfo.setDistrict( entity.getDistrict() );
merchantBaseInfo.setAddress( entity.getAddress() );
merchantBaseInfo.setEmail( entity.getEmail() );
merchantBaseInfo.setPrincipalMobile( entity.getPrincipalMobile() );
merchantBaseInfo.setPrincipalCertType( entity.getPrincipalCertType() );
merchantBaseInfo.setPrincipalCertNo( entity.getPrincipalCertNo() );
merchantBaseInfo.setPrincipalPerson( entity.getPrincipalPerson() );
merchantBaseInfo.setBussAuthName( entity.getBussAuthName() );
merchantBaseInfo.setBussAuthNum( entity.getBussAuthNum() );
merchantBaseInfo.setBussAuthAddress( entity.getBussAuthAddress() );
merchantBaseInfo.setBussAuthStartTime( entity.getBussAuthStartTime() );
merchantBaseInfo.setBussAuthEndTime( entity.getBussAuthEndTime() );
merchantBaseInfo.setAllowBankLarge( entity.getAllowBankLarge() );
merchantBaseInfo.setWxCertStatus( entity.getWxCertStatus() );
merchantBaseInfo.setCreateDt( entity.getCreateDt() );
merchantBaseInfo.setUpdateDt( entity.getUpdateDt() );
merchantBaseInfo.setBuslicType( entity.getBuslicType() );
merchantBaseInfo.setIsVoice( entity.getIsVoice() );
merchantBaseInfo.setIsPushWxMessage( entity.getIsPushWxMessage() );
merchantBaseInfo.setIsUnionPay( entity.getIsUnionPay() );
merchantBaseInfo.setMd5Key( entity.getMd5Key() );
merchantBaseInfo.setLimitPay( entity.getLimitPay() );
merchantBaseInfo.setSubAppId( entity.getSubAppId() );
merchantBaseInfo.setAppid( entity.getAppid() );
merchantBaseInfo.setStatus( entity.getStatus() );
merchantBaseInfo.setMerchantAddress( entity.getMerchantAddress() );
merchantBaseInfo.setStoreHeadPic( entity.getStoreHeadPic() );
merchantBaseInfo.setStoreInsidePic( entity.getStoreInsidePic() );
merchantBaseInfo.setCashPic( entity.getCashPic() );
merchantBaseInfo.setLiteralPic( entity.getLiteralPic() );
merchantBaseInfo.setWarrantyPic( entity.getWarrantyPic() );
merchantBaseInfo.setDealPic( entity.getDealPic() );
merchantBaseInfo.setAffilatePic( entity.getAffilatePic() );
merchantBaseInfo.setHandPic( entity.getHandPic() );
merchantBaseInfo.setMerchantAuditStatus( entity.getMerchantAuditStatus() );
merchantBaseInfo.setStartTime( entity.getStartTime() );
merchantBaseInfo.setEndTime( entity.getEndTime() );
merchantBaseInfo.setImgUrl( entity.getImgUrl() );
merchantBaseInfo.setLoginName( entity.getLoginName() );
merchantBaseInfo.setPassword( entity.getPassword() );
merchantBaseInfo.setLogo( entity.getLogo() );
merchantBaseInfo.setUserPhone( entity.getUserPhone() );
merchantBaseInfo.setUserName( entity.getUserName() );
merchantBaseInfo.setBusinessLicensePic( entity.getBusinessLicensePic() );
merchantBaseInfo.setLocation( entity.getLocation() );
merchantBaseInfo.setFirstTradeTime( entity.getFirstTradeTime() );
merchantBaseInfo.setLastTradeTime( entity.getLastTradeTime() );
merchantBaseInfo.setSplitFlag( entity.getSplitFlag() );
merchantBaseInfo.setValidFlag( entity.getValidFlag() );
return merchantBaseInfo;
}
@Override
public MerchantBaseInfo dto2Domain(MerchantBaseInfoDTO dto) {
if ( dto == null ) {
return null;
}
MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
merchantBaseInfo.setId( dto.getId() );
merchantBaseInfo.setUserId( dto.getUserId() );
merchantBaseInfo.setAliAccount( dto.getAliAccount() );
merchantBaseInfo.setMerchantName( dto.getMerchantName() );
merchantBaseInfo.setMerchantType( dto.getMerchantType() );
merchantBaseInfo.setProductDesc( dto.getProductDesc() );
merchantBaseInfo.setMcc( dto.getMcc() );
merchantBaseInfo.setMccName( dto.getMccName() );
merchantBaseInfo.setAlias( dto.getAlias() );
merchantBaseInfo.setContactMobile( dto.getContactMobile() );
merchantBaseInfo.setContactName( dto.getContactName() );
merchantBaseInfo.setAddressNo( dto.getAddressNo() );
merchantBaseInfo.setAddress( dto.getAddress() );
merchantBaseInfo.setEmail( dto.getEmail() );
merchantBaseInfo.setMerchantAddress( dto.getMerchantAddress() );
merchantBaseInfo.setStoreHeadPic( dto.getStoreHeadPic() );
merchantBaseInfo.setStoreInsidePic( dto.getStoreInsidePic() );
merchantBaseInfo.setCashPic( dto.getCashPic() );
merchantBaseInfo.setUserPhone( dto.getUserPhone() );
return merchantBaseInfo;
}
@Override
public MerchantStore baseInfo2StoreInfo(MerchantBaseInfo entity) {
if ( entity == null ) {
return null;
}
MerchantStore merchantStore = new MerchantStore();
merchantStore.setStoreName( entity.getAlias() );
merchantStore.setMerchantName( entity.getAlias() );
if ( entity.getId() != null ) {
merchantStore.setId( entity.getId().intValue() );
}
merchantStore.setMerchantCode( entity.getMerchantCode() );
merchantStore.setCreateDt( entity.getCreateDt() );
merchantStore.setStatus( entity.getStatus() );
merchantStore.setEmail( entity.getEmail() );
merchantStore.setStoreHeadPic( entity.getStoreHeadPic() );
merchantStore.setStoreInsidePic( entity.getStoreInsidePic() );
merchantStore.setCashPic( entity.getCashPic() );
merchantStore.setProductDesc( entity.getProductDesc() );
merchantStore.setMerchantType( entity.getMerchantType() );
merchantStore.setStartTime( entity.getStartTime() );
merchantStore.setEndTime( entity.getEndTime() );
merchantStore.setAlias( entity.getAlias() );
return merchantStore;
}
@Override
public UserApp baseInfo2UserApp(MerchantBaseInfo entity) {
if ( entity == null ) {
return null;
}
UserApp userApp = new UserApp();
userApp.setId( entity.getId() );
userApp.setLoginName( entity.getLoginName() );
if ( entity.getUserId() != null ) {
userApp.setUserId( Long.parseLong( entity.getUserId() ) );
}
userApp.setUserName( entity.getUserName() );
userApp.setLogo( entity.getLogo() );
userApp.setCreateDt( entity.getCreateDt() );
userApp.setUpdateDt( entity.getUpdateDt() );
if ( entity.getStatus() != null ) {
userApp.setStatus( Integer.parseInt( entity.getStatus() ) );
}
userApp.setMerchantCode( entity.getMerchantCode() );
userApp.setMerchantName( entity.getMerchantName() );
userApp.setContactName( entity.getContactName() );
userApp.setProductDesc( entity.getProductDesc() );
userApp.setBussAuthNum( entity.getBussAuthNum() );
userApp.setIsVoice( entity.getIsVoice() );
userApp.setIsUnionPay( entity.getIsUnionPay() );
userApp.setPassword( entity.getPassword() );
userApp.setMerchantType( entity.getMerchantType() );
userApp.setAlias( entity.getAlias() );
userApp.setMerchantAuditStatus( entity.getMerchantAuditStatus() );
return userApp;
}
@Override
public List<MerchantBaseInfoDTO> domain2dto(List<MerchantBaseInfo> entityList) {
if ( entityList == null ) {
return null;
}
List<MerchantBaseInfoDTO> list = new ArrayList<MerchantBaseInfoDTO>( entityList.size() );
for ( MerchantBaseInfo merchantBaseInfo : entityList ) {
list.add( domain2dto( merchantBaseInfo ) );
}
return list;
}
}

33
pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantCashPlaceConverterImpl.java Normal file
View File

@ -0,0 +1,33 @@
package cn.pluss.platform.converter;
import cn.pluss.platform.entity.MerchantCashPlace;
import cn.pluss.platform.vo.MerchantCashPlaceVO;
import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2023-01-29T10:16:06+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class MerchantCashPlaceConverterImpl implements MerchantCashPlaceConverter {
@Override
public MerchantCashPlaceVO entity2VO(MerchantCashPlace merchantCashPlace) {
if ( merchantCashPlace == null ) {
return null;
}
MerchantCashPlaceVO merchantCashPlaceVO = new MerchantCashPlaceVO();
merchantCashPlaceVO.setId( merchantCashPlace.getId() );
merchantCashPlaceVO.setUserId( merchantCashPlace.getUserId() );
merchantCashPlaceVO.setName( merchantCashPlace.getName() );
merchantCashPlaceVO.setCode( merchantCashPlace.getCode() );
merchantCashPlaceVO.setAddress( merchantCashPlace.getAddress() );
merchantCashPlaceVO.setRemark( merchantCashPlace.getRemark() );
merchantCashPlaceVO.setCreateTime( merchantCashPlace.getCreateTime() );
merchantCashPlaceVO.setUpdateTime( merchantCashPlace.getUpdateTime() );
return merchantCashPlaceVO;
}
}

30
pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/MerchantStaffConverterImpl.java Normal file
View File

@ -0,0 +1,30 @@
package cn.pluss.platform.converter;
import cn.pluss.platform.dto.MerchantStaffDTO;
import cn.pluss.platform.entity.UserInfo;
import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2023-01-29T10:16:06+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class MerchantStaffConverterImpl implements MerchantStaffConverter {
@Override
public UserInfo toUserInfo(MerchantStaffDTO merchantStaffDTO) {
if ( merchantStaffDTO == null ) {
return null;
}
UserInfo userInfo = new UserInfo();
userInfo.setId( merchantStaffDTO.getUserId() );
userInfo.setLoginName( merchantStaffDTO.getLoginName() );
userInfo.setPhone( merchantStaffDTO.getPhone() );
userInfo.setPassword( merchantStaffDTO.getPassword() );
userInfo.setMerchantCode( merchantStaffDTO.getMerchantCode() );
return userInfo;
}
}

151
pluss-model-bundle/target/generated-sources/annotations/cn/pluss/platform/converter/UserAppConverterImpl.java Normal file
View File

@ -0,0 +1,151 @@
package cn.pluss.platform.converter;
import cn.pluss.platform.entity.MerchantBaseInfo;
import cn.pluss.platform.entity.MerchantStore;
import cn.pluss.platform.entity.UserApp;
import cn.pluss.platform.entity.UserInfo;
import java.text.SimpleDateFormat;
import javax.annotation.Generated;
@Generated(
value = "org.mapstruct.ap.MappingProcessor",
date = "2023-01-29T10:16:06+0800",
comments = "version: 1.4.2.Final, compiler: javac, environment: Java 1.8.0_362 (Amazon.com Inc.)"
)
public class UserAppConverterImpl implements UserAppConverter {
@Override
public void copyProperties(MerchantStore merchantStore, UserApp userApp) {
if ( merchantStore == null ) {
return;
}
if ( merchantStore.getId() != null ) {
userApp.setStoreId2( String.valueOf( merchantStore.getId() ) );
}
if ( merchantStore.getCreateDt() != null ) {
userApp.setCreateDt( merchantStore.getCreateDt() );
}
if ( merchantStore.getMerchantCode() != null ) {
userApp.setMerchantCode( merchantStore.getMerchantCode() );
}
if ( merchantStore.getMerchantName() != null ) {
userApp.setMerchantName( merchantStore.getMerchantName() );
}
if ( merchantStore.getStoreName() != null ) {
userApp.setStoreName( merchantStore.getStoreName() );
}
if ( merchantStore.getStoreId() != null ) {
userApp.setStoreId( merchantStore.getStoreId() );
}
if ( merchantStore.getProductDesc() != null ) {
userApp.setProductDesc( merchantStore.getProductDesc() );
}
if ( merchantStore.getPayEcdemicSwitch() != null ) {
userApp.setPayEcdemicSwitch( merchantStore.getPayEcdemicSwitch() );
}
if ( merchantStore.getIsMarket() != null ) {
userApp.setIsMarket( merchantStore.getIsMarket() );
}
if ( merchantStore.getMerchantType() != null ) {
userApp.setMerchantType( merchantStore.getMerchantType() );
}
if ( merchantStore.getAlias() != null ) {
userApp.setAlias( merchantStore.getAlias() );
}
if ( merchantStore.getMcsStatus() != null ) {
userApp.setMcsStatus( merchantStore.getMcsStatus() );
}
}
@Override
public void copyProperties(MerchantBaseInfo merchantBaseInfo, UserApp userApp) {
if ( merchantBaseInfo == null ) {
return;
}
if ( merchantBaseInfo.getAlias() != null ) {
userApp.setMerchantName( merchantBaseInfo.getAlias() );
}
if ( merchantBaseInfo.getId() != null ) {
userApp.setMercId( merchantBaseInfo.getId() );
}
if ( merchantBaseInfo.getLoginName() != null ) {
userApp.setLoginName( merchantBaseInfo.getLoginName() );
}
if ( merchantBaseInfo.getUserId() != null ) {
userApp.setUserId( Long.parseLong( merchantBaseInfo.getUserId() ) );
}
if ( merchantBaseInfo.getUserName() != null ) {
userApp.setUserName( merchantBaseInfo.getUserName() );
}
if ( merchantBaseInfo.getLogo() != null ) {
userApp.setLogo( merchantBaseInfo.getLogo() );
}
if ( merchantBaseInfo.getCreateDt() != null ) {
userApp.setCreateDt( merchantBaseInfo.getCreateDt() );
}
if ( merchantBaseInfo.getUpdateDt() != null ) {
userApp.setUpdateDt( merchantBaseInfo.getUpdateDt() );
}
if ( merchantBaseInfo.getMerchantCode() != null ) {
userApp.setMerchantCode( merchantBaseInfo.getMerchantCode() );
}
if ( merchantBaseInfo.getContactName() != null ) {
userApp.setContactName( merchantBaseInfo.getContactName() );
}
if ( merchantBaseInfo.getProductDesc() != null ) {
userApp.setProductDesc( merchantBaseInfo.getProductDesc() );
}
if ( merchantBaseInfo.getBussAuthNum() != null ) {
userApp.setBussAuthNum( merchantBaseInfo.getBussAuthNum() );
}
if ( merchantBaseInfo.getIsVoice() != null ) {
userApp.setIsVoice( merchantBaseInfo.getIsVoice() );
}
if ( merchantBaseInfo.getIsUnionPay() != null ) {
userApp.setIsUnionPay( merchantBaseInfo.getIsUnionPay() );
}
if ( merchantBaseInfo.getPassword() != null ) {
userApp.setPassword( merchantBaseInfo.getPassword() );
}
if ( merchantBaseInfo.getMerchantType() != null ) {
userApp.setMerchantType( merchantBaseInfo.getMerchantType() );
}
if ( merchantBaseInfo.getAlias() != null ) {
userApp.setAlias( merchantBaseInfo.getAlias() );
}
if ( merchantBaseInfo.getMerchantAuditStatus() != null ) {
userApp.setMerchantAuditStatus( merchantBaseInfo.getMerchantAuditStatus() );
}
}
@Override
public UserApp toUserApp(UserInfo userInfo) {
if ( userInfo == null ) {
return null;
}
UserApp userApp = new UserApp();
userApp.setCreateDt( userInfo.getCreateTime() );
userApp.setUserId( userInfo.getId() );
userApp.setLoginName( userInfo.getLoginName() );
userApp.setStatus( userInfo.getStatus() );
if ( userInfo.getParentId() != null ) {
userApp.setParentId( userInfo.getParentId().longValue() );
}
userApp.setPhone( userInfo.getPhone() );
userApp.setMerchantCode( userInfo.getMerchantCode() );
userApp.setStoreId( userInfo.getStoreId() );
userApp.setPassword( userInfo.getPassword() );
if ( userInfo.getUpdateTime() != null ) {
userApp.setUpdateTime( new SimpleDateFormat().format( userInfo.getUpdateTime() ) );
}
userApp.setPayPassword( userInfo.getPayPassword() );
userApp.setFaceCert( userInfo.getFaceCert() );
userApp.setFaceCompare( userInfo.getFaceCompare() );
return userApp;
}
}

BIN
pluss-service-bundle/target/classes/cn/pluss/platform/ys/impl/v20210929/YsAuditServiceImpl$1.class Normal file
View File

Binary file not shown.

BIN
pluss-service-bundle/target/classes/cn/pluss/platform/ysExtension/v20220615/YsAuditServiceImpl$1.class Normal file
View File

Binary file not shown.

2
pluss-wap-page/pluss-wap-page.iml
View File

@ -139,8 +139,6 @@
<orderEntry type="library" name="Maven: com.aliyun:tea:1.2.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.2.6" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.5" level="project" />
<orderEntry type="library" name="Maven: org.dom4j:dom4j:2.0.3" level="project" />

6
pluss-wap-page/src/main/resources/application-dev.yml
View File

@ -1,7 +1,7 @@
spring:
datasource:
druid:
url:
username:
password:
url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: root
password: CZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver

6
pluss-wap-page/src/main/resources/application-prod.yml
View File

@ -1,9 +1,9 @@
spring:
datasource:
druid:
url:
username:
password:
url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: root
password: CZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver
scheduling:

6
pluss-wap-page/src/main/resources/application-test.yml
View File

@ -1,7 +1,7 @@
spring:
datasource:
druid:
url:
username:
password:
url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: root
password: CZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver