bug fix

.idea/workspace.xml

@@ -5,148 +5,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="5dd66384-19bf-43a0-b6b4-b05d9b7b9cd4" name="Default" 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__com_aliyun_aliyun_java_sdk_core_4_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_4_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_2_8_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_2_8_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_0_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_0_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_0_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_0_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_0_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_0_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_0_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_0_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_0_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_0_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_0_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_0_6.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_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_2.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_18_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_18_0.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_squareup_okhttp_okhttp_2_5_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okhttp_okhttp_2_5_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okio_okio_1_6_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okio_okio_1_6_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_1_14.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_1_14.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_tencentcloudapi_tencentcloud_sdk_java_3_0_75.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_tencentcloudapi_tencentcloud_sdk_java_3_0_75.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_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_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__io_jsonwebtoken_jjwt_api_0_10_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_jsonwebtoken_jjwt_api_0_10_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_jsonwebtoken_jjwt_impl_0_10_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_jsonwebtoken_jjwt_impl_0_10_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_jsonwebtoken_jjwt_jackson_0_10_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_jsonwebtoken_jjwt_jackson_0_10_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_2_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_2_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_13.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_5_13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_5_13.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_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_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__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_8_0_15.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_15.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_12.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_12.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__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_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_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_11.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_17.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_17.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_17.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_17.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_17.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_17.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_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_16_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_16_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_21_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_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_mapstruct_mapstruct_1_1_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_1_0_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.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_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_18_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_reflections_reflections_0_9_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_reflections_reflections_0_9_11.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_26.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_26.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_26.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_26.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_2_1_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_2_1_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_1_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_1_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_4_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_4_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_spring_aop_5_1_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_1_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_1_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_1_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_1_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_1_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_1_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_1_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_1_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_1_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_messaging_5_1_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_messaging_5_1_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_1_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_1_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_1_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_1_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_1_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_1_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_6_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_websocket_5_1_6_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_websocket_5_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/service.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/service.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/WebSocketServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/WebSocketServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstUsherRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstUsherRecordController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMiniFormidsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMiniFormidsController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaFirstUsherRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaFirstUsherRecord.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ISysParamService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ISysParamService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCarService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCarService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFirstUsherRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaFirstUsherRecordService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/CameraServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/CameraServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/SysParamServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/SysParamServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/ImgController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/ImgController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaWechatUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaWechatUserController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstUsherRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstUsherRecordServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/AliFaceUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/AliFaceUtils.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/DateUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/DateUtils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/XFYun.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/XFYun.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/SysUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/SysUserMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaContentLibMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaContentLibMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaDeviceMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaDeviceMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaFirstpageContentMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaFirstpageContentMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaFirstpageMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaFirstpageMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaFirstpageNoticeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaFirstpageNoticeMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaImagesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaImagesMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaNoticeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaNoticeMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaPersonMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaPersonMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaPersonTypeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaPersonTypeMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaSyncLogMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaSyncLogMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaVisitingLogMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaVisitingLogMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/TaVisitingWordsMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/TaVisitingWordsMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/Encrypt.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/Encrypt.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -194,36 +61,57 @@
     <session id="-1397041257">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
+          <entry key="project.closed" value="1" />
+          <entry key="project.open.time.3" value="1" />
           <entry key="project.open.time.46" value="1" />
-          <entry key="project.opened" value="1" />
+          <entry key="project.opened" value="2" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="java" value="78" />
-          <entry key="yml" value="3" />
+          <entry key="java" value="106" />
+          <entry key="yml" value="6" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="JAVA" value="78" />
-          <entry key="YAML" value="3" />
+          <entry key="JAVA" value="106" />
+          <entry key="YAML" value="6" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="2492" />
+          <entry key="java" value="4311" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="2492" />
+          <entry key="JAVA" value="4311" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/XFYun.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="130">
+              <caret line="27" column="23" selection-start-line="27" selection-start-column="18" selection-end-line="27" selection-end-column="23" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="152">
+              <caret line="404" column="39" selection-start-line="404" selection-start-column="39" selection-end-line="404" selection-end-column="39" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -235,8 +123,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>newRecordByFront</find>
-      <find>notifyConsultant</find>
       <find>getMultipartFile</find>
       <find>分发人脸</find>
       <find>whitelist</find>
@@ -265,6 +151,8 @@
       <find>send2Front</find>
       <find>newCustByMainUsher</find>
       <find>todo</find>
+      <find>searchFace</find>
+      <find>voice</find>
     </findStrings>
     <replaceStrings>
       <replace>com.huiju.welcome</replace>
@@ -289,14 +177,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/SysUserController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaWechatUserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/config/AliProperties.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/interceptor/AccessInterceptor.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/config/TencentProperties.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/TencentFaceUtils.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/ImgController.java" />
         <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstpageController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ICameraService.java" />
@@ -323,9 +208,7 @@
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFollowupRecordServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/XFYun.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/WebSocketServer.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/AliFaceUtils.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ISysParamService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/DateUtils.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/SysParamServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaFirstUsherRecord.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaFirstUsherRecordController.java" />
@@ -335,11 +218,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMiniFormidsController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCustomerServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstUsherRecordServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaWechatUserController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/DateUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/Encrypt.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/ImgController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/CameraServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstUsherRecordServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/AliFaceUtils.java" />
         <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java" />
       </list>
     </option>
   </component>
@@ -374,18 +262,12 @@
           <item name="mainbiz" type="9519ce18:MavenProjectsStructure$ProjectNode" />
           <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
         </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="mainbiz" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
-        </path>
       </expand>
       <select />
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="1" />
-    <option name="width" value="1918" />
+    <option name="width" value="1919" />
     <option name="height" value="1030" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
@@ -398,7 +280,6 @@
     <panes>
       <pane id="Scope" />
       <pane id="AndroidView" />
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -448,17 +329,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="com.huiju.welcome" type="462c0819:PsiDirectoryNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="service-welcome3" type="b2602c69:ProjectViewProjectNode" />
-              <item name="service-welcome3" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com.huiju.welcome" type="462c0819:PsiDirectoryNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-              <item name="impl" type="462c0819:PsiDirectoryNode" />
+              <item name="utils" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="service-welcome3" type="b2602c69:ProjectViewProjectNode" />
@@ -471,6 +342,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -480,7 +352,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1562591492290" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1562675112470" />
     <property name="go.gopath.indexing.explicitly.defined" value="true" />
     <property name="last_opened_file_path" value="E:/learn/green-sdk-sample-doc-2018-05-09/green-sdk-sample/v2018-05-09/green-java-sdk-sample-v20180509" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
@@ -599,17 +471,19 @@
       <workItem from="1561692193235" duration="21369000" />
       <workItem from="1561966608632" duration="124000" />
       <workItem from="1561967334531" duration="1458000" />
-      <workItem from="1562216688143" duration="36967000" />
+      <workItem from="1562216688143" duration="37059000" />
+      <workItem from="1562634693683" duration="20963000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="534714000" />
+    <option name="totallyTimeSpent" value="555769000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1" y="0" width="1534" height="824" extended-state="0" />
+    <frame x="0" y="0" width="1535" height="824" extended-state="0" />
+    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.34146342" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2295193" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -619,13 +493,13 @@
       <window_info id="Capture Tool" order="7" />
       <window_info anchor="bottom" id="Find" order="0" sideWeight="0.49903476" weight="0.3295325" />
       <window_info anchor="bottom" id="Message" order="1" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.49903476" visible="true" weight="0.37724552" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49903476" weight="0.6511976" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49903476" visible="true" weight="0.24401198" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49903476" weight="0.6766467" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Spring" order="7" />
-      <window_info anchor="bottom" id="Terminal" order="8" weight="0.19384265" />
+      <window_info anchor="bottom" id="Terminal" order="8" weight="0.19311377" />
       <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50096524" side_tool="true" weight="0.39953408" />
       <window_info anchor="bottom" id="Java Enterprise" order="10" />
       <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
@@ -637,7 +511,7 @@
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="right" id="Maven Projects" order="5" visible="true" weight="0.124661244" />
+      <window_info anchor="right" id="Maven Projects" order="5" visible="true" weight="0.124576844" />
       <window_info anchor="right" id="Database" order="6" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
@@ -690,54 +564,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://D:/REPO/org/springframework/spring-webmvc/5.1.6.RELEASE/spring-webmvc-5.1.6.RELEASE.jar!/org/springframework/web/servlet/FrameworkServlet.class" />
-    <entry file="jar://D:/REPO/org/apache/tomcat/embed/tomcat-embed-core/9.0.17/tomcat-embed-core-9.0.17.jar!/org/apache/catalina/core/ApplicationFilterChain.class" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/interceptor/AccessInterceptor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="86">
-          <caret line="66" selection-start-line="66" selection-end-line="66" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaCar.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/mapper/TaCarMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="4" column="44" selection-start-line="4" selection-start-column="44" selection-end-line="4" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaCarMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaVisitorAppointment.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="35" column="21" selection-start-line="35" selection-start-column="11" selection-end-line="35" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/CommConstant.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="16" column="54" selection-start-line="16" selection-start-column="49" selection-end-line="16" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCarController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="328">
-          <caret line="62" column="48" lean-forward="true" selection-start-line="62" selection-start-column="48" selection-end-line="62" selection-end-column="48" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaMainUsherRecordMapper.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -790,20 +616,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/XFYun.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="339">
-          <caret line="44" column="11" lean-forward="true" selection-start-line="44" selection-start-column="11" selection-end-line="44" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/DateUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="398">
-          <caret line="43" column="51" selection-start-line="43" selection-start-column="32" selection-end-line="43" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/common/WebSocketServer.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="229">
@@ -832,13 +644,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-370">
-          <caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ISysParamService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="494">
@@ -867,9 +672,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="323">
           <caret line="17" column="22" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="22" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -880,16 +682,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/AliFaceUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-611">
-          <caret line="247" column="21" selection-start-line="247" selection-start-column="11" selection-end-line="247" selection-end-column="21" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaCustomerMapController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-603">
@@ -911,13 +703,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ICameraService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="9" column="12" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="254">
@@ -939,16 +724,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="206">
-          <caret line="247" lean-forward="true" selection-start-line="247" selection-end-line="247" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCustomerService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="238">
@@ -969,13 +744,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaPersonService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="319">
-          <caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/TaFirstUsherRecord.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-114">
@@ -997,52 +765,170 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstUsherRecordServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="228">
+          <caret line="99" column="23" lean-forward="true" selection-start-line="99" selection-start-column="23" selection-end-line="99" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaPersonService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="319">
+          <caret line="56" column="13" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/SysUserController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3633">
+          <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaWechatUserController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="81">
+          <caret line="149" selection-start-line="149" selection-end-line="149" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://D:/m2_yincheng/org/springframework/spring-core/5.1.6.RELEASE/spring-core-5.1.6.RELEASE-sources.jar!/org/springframework/util/MimeTypeUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="377">
-          <caret line="186" column="38" lean-forward="true" selection-start-line="186" selection-start-column="38" selection-end-line="186" selection-end-column="38" />
+        <state relative-caret-position="1740">
+          <caret line="308" column="25" selection-start-line="308" selection-start-column="25" selection-end-line="308" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://D:/m2_yincheng/org/springframework/spring-web/5.1.6.RELEASE/spring-web-5.1.6.RELEASE-sources.jar!/org/springframework/http/MediaType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="98">
+          <caret line="609" column="35" selection-start-line="609" selection-start-column="35" selection-end-line="609" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/MiniApp.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="85" column="9" selection-start-line="78" selection-start-column="8" selection-end-line="85" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/SAWeather.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-664">
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://D:/m2_yincheng/org/springframework/spring-web/5.1.6.RELEASE/spring-web-5.1.6.RELEASE-sources.jar!/org/springframework/http/HttpEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="139">
+          <caret line="99" column="11" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/DateUtils.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="257">
+          <caret line="56" column="31" selection-start-line="56" selection-start-column="31" selection-end-line="56" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/config/AliProperties.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="124">
+          <caret line="10" column="25" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/ImgController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="145">
+          <caret line="41" column="4" selection-start-line="41" selection-start-column="4" selection-end-line="41" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/Encrypt.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-976">
+          <caret line="4" column="15" selection-start-line="4" selection-start-column="15" selection-end-line="4" selection-end-column="15" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ITaCarRecordService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
+        <state relative-caret-position="160">
           <caret line="32" column="12" selection-start-line="32" selection-start-column="12" selection-end-line="32" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="64" column="18" selection-start-line="64" selection-start-column="11" selection-end-line="64" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/ICameraService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1315">
-          <caret line="331" column="37" selection-start-line="331" selection-start-column="20" selection-end-line="331" selection-end-column="37" />
+        <state relative-caret-position="95">
+          <caret line="7" column="11" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/CameraServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="566">
-          <caret line="166" lean-forward="true" selection-start-line="166" selection-end-line="166" />
+        <state relative-caret-position="180">
+          <caret line="87" selection-start-line="87" selection-end-line="87" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaFirstUsherRecordServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="99" column="23" lean-forward="true" selection-start-line="99" selection-start-column="23" selection-end-line="99" selection-end-column="23" />
+        <state relative-caret-position="287">
+          <caret line="163" column="13" selection-start-line="163" selection-start-column="13" selection-end-line="163" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaWechatUserController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/CameraController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="127" lean-forward="true" selection-start-line="127" selection-end-line="127" />
+        <state relative-caret-position="977">
+          <caret line="116" selection-start-line="116" selection-end-line="116" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="140">
+          <caret line="276" column="45" selection-start-line="276" selection-start-column="45" selection-end-line="276" selection-end-column="45" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/AliFaceUtils.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="117">
+          <caret line="349" selection-start-line="349" selection-end-line="349" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/utils/XFYun.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="130">
+          <caret line="27" column="23" selection-start-line="27" selection-start-column="18" selection-end-line="27" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="35">
-          <caret line="145" lean-forward="true" selection-start-line="145" selection-end-line="145" />
+        <state relative-caret-position="152">
+          <caret line="404" column="39" selection-start-line="404" selection-start-column="39" selection-end-line="404" selection-end-column="39" />
         </state>
       </provider>
     </entry>

src/main/java/com.huiju.welcome/controller/ImgController.java

@@ -1,75 +1,73 @@
-package com.huiju.welcome.controller;
-
-import com.huiju.welcome.common.base.ResponseBean;
-import com.huiju.welcome.utils.AliFaceUtils;
-import com.huiju.welcome.utils.AliOSSUtils;
-import com.huiju.welcome.utils.TencentFaceUtils;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.apache.http.HttpStatus;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-/**
- * @author FXF
- * @date 2019-03-13
- */
-@RestController
-@RequestMapping("/")
-public class ImgController {
-
-	@Autowired
-	TencentFaceUtils tencentFaceUtils;
-	
-	@Autowired
-	private AliFaceUtils aliFaceUtils;
-
-	@GetMapping("/face")
-	public ResponseBean testUpload2Aliface() {
-		try {
-			//tencentFaceUtils.searchFace("https://estateagents.oss-cn-shanghai.aliyuncs.com/1561458925754-%E6%9C%AA%E7%9F%A5%E6%96%87%E4%BB%B6.jpg");
-			//return ResponseBean.success("");
-			//aliFaceUtils.createFace("10087","https://estateagents.oss-cn-shanghai.aliyuncs.com/1561458925754-%E6%9C%AA%E7%9F%A5%E6%96%87%E4%BB%B6.jpg");
-			return ResponseBean.success(aliFaceUtils.searchFace("https://estateagents.oss-cn-shanghai.aliyuncs.com/1561458925754-%E6%9C%AA%E7%9F%A5%E6%96%87%E4%BB%B6.jpg"));
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return ResponseBean.error("", 400);
-	}
-	
-	@ApiOperation(value = "图片/视频上传以及获取url", notes = "图片/视频上传以及获取url")
-	@PostMapping(value = "/uploadFile", consumes = "multipart/*", headers = "content-type=multipart/form-data")
-	public ResponseBean uploadFile(@ApiParam(value = "uploadFile" ,required = true) MultipartFile uploadFile){
-		String defaultUploadDir = "/";
-
-		try {
-			String img = AliOSSUtils.putObject(uploadFile, defaultUploadDir);
-			return ResponseBean.success(img);
-		} catch (IOException e) {
-			return ResponseBean.error("上传图片失败: " + e.getMessage(), HttpStatus.SC_INTERNAL_SERVER_ERROR);
-		}
-	}
-
-	@PostMapping("/miniapp/upload")
-	public ResponseBean uploadImage(@RequestParam("file") MultipartFile multipartFile) {
-		String defaultUploadDir = "/";
-
-		try {
-			String img = AliOSSUtils.putObject(multipartFile, defaultUploadDir);
-			return ResponseBean.success(img);
-		} catch (IOException e) {
-			return ResponseBean.error("上传图片失败: " + e.getMessage(), HttpStatus.SC_INTERNAL_SERVER_ERROR);
-		}
-	}
-}
+package com.huiju.welcome.controller;
+
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.utils.AliFaceUtils;
+import com.huiju.welcome.utils.AliOSSUtils;
+import com.huiju.welcome.utils.Encrypt;
+import com.huiju.welcome.utils.TencentFaceUtils;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.http.HttpStatus;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+/**
+ * @author FXF
+ * @date 2019-03-13
+ */
+@RestController
+@RequestMapping("/")
+public class ImgController {
+
+	@Autowired
+	TencentFaceUtils tencentFaceUtils;
+	
+	@Autowired
+	private AliFaceUtils aliFaceUtils;
+
+	@GetMapping("/face")
+	public ResponseBean testUpload2Aliface() {
+		try {
+			return ResponseBean.success(aliFaceUtils.detectFace("https://estateagents.oss-cn-shanghai.aliyuncs.com/1562654830859-unknown.jpg"));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return ResponseBean.error("", 400);
+	}
+	
+	@ApiOperation(value = "图片/视频上传以及获取url", notes = "图片/视频上传以及获取url")
+	@PostMapping(value = "/uploadFile", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+	public ResponseBean uploadFile(@ApiParam(value = "uploadFile" ,required = true) MultipartFile uploadFile){
+		String defaultUploadDir = "/";
+
+		try {
+			String img = AliOSSUtils.putObject(uploadFile, defaultUploadDir);
+			return ResponseBean.success(img);
+		} catch (IOException e) {
+			return ResponseBean.error("上传图片失败: " + e.getMessage(), HttpStatus.SC_INTERNAL_SERVER_ERROR);
+		}
+	}
+
+	@PostMapping("/miniapp/upload")
+	public ResponseBean uploadImage(@RequestParam("file") MultipartFile multipartFile) {
+		String defaultUploadDir = "/";
+
+		try {
+			String img = AliOSSUtils.putObject(multipartFile, defaultUploadDir);
+			return ResponseBean.success(img);
+		} catch (IOException e) {
+			return ResponseBean.error("上传图片失败: " + e.getMessage(), HttpStatus.SC_INTERNAL_SERVER_ERROR);
+		}
+	}
+}

src/main/java/com.huiju.welcome/controller/TaWechatUserController.java

@@ -1,218 +1,218 @@
-package com.huiju.welcome.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.huiju.welcome.common.base.BaseController;
-import com.huiju.welcome.common.base.ResponseBean;
-import com.huiju.welcome.model.SysUser;
-import com.huiju.welcome.model.TaPerson;
-import com.huiju.welcome.model.TaWechatUser;
-import com.huiju.welcome.service.ISysUserService;
-import com.huiju.welcome.service.ITaPersonService;
-import com.huiju.welcome.service.ITaWechatUserService;
-import com.huiju.welcome.utils.CommConstant;
-import com.huiju.welcome.utils.JWTUtils;
-import com.huiju.welcome.utils.MiniApp;
-import com.huiju.welcome.utils.StatusUtils;
-import org.apache.http.HttpStatus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * <p>
-    *  前端控制器
-    * </p>
- *
- * @author jobob
- * @since 2019-06-11
- */
-@RestController
-@RequestMapping("/miniapp")
-public class TaWechatUserController extends BaseController {
-
-    private final Logger logger = LoggerFactory.getLogger(TaWechatUserController.class);
-
-    @Autowired
-    private MiniApp miniApp;
-
-    @Autowired
-    private ITaWechatUserService iTaWechatUserService;
-
-    @Autowired
-    private ITaPersonService iTaPersonService;
-
-    @Autowired
-    private ISysUserService iSysUserService;
-
-    @GetMapping("/login")
-    public ResponseBean login(@RequestParam String code) {
-        ResponseBean resp = miniApp.getOpenid(code);
-        if (resp.getCode() != 200) {
-            return resp;
-        }
-
-        JSONObject data = (JSONObject) resp.getData();
-        String openid = data.getString("openid");
-        String sessionKey = data.getString("session_key");
-        String unionId = data.getString("unionid");
-        String appid = miniApp.getAppid();
-
-        Map<String, Object> map = new HashMap<>();
-        map.put("openid", openid);
-        map.put("sessionKey", sessionKey);
-        map.put("unionId", unionId);
-        map.put("appid", appid);
-
-        // 如果已经存在的用户, 直接返回
-        TaWechatUser taWechatUser = iTaWechatUserService.getByOpenid(openid, appid);
-        if (null == taWechatUser) {
-            // 否则新增用户数据
-            taWechatUser = new TaWechatUser();
-            taWechatUser.setAppid(appid);
-            taWechatUser.setClientType(CommConstant.WECHAT_CLIENT_MINIAPP);
-            taWechatUser.setOpenid(openid);
-            taWechatUser.setUnionId(unionId);
-            taWechatUser.setStatus(StatusUtils.Normal);
-            taWechatUser.setCreateDate(LocalDateTime.now());
-
-            boolean success = iTaWechatUserService.save(taWechatUser);
-            if (!success) {
-                return ResponseBean.error("预存用户信息失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
-            }
-        }
-
-        if (null != taWechatUser.getPersonId()) {
-            SysUser sysUser = iSysUserService.getById(taWechatUser.getPersonId());
-            map.put("identity", sysUser.getUserIdentity());
-        }
-
-        map.put("user", taWechatUser);
-        map.put("token", JWTUtils.newToken(taWechatUser.getUserId() + ""));
-        return ResponseBean.success(map);
-    }
-
-    @PostMapping("/bind")
-    public ResponseBean bind(@RequestBody String paramStr, HttpServletRequest request) {
-        String userId = JWTUtils.getSubject(request);
-        TaWechatUser taWechatUser = iTaWechatUserService.getById(Integer.valueOf(userId));
-
-        if (null == taWechatUser) {
-            return ResponseBean.error("数据异常, 请清空缓存后重新操作", HttpStatus.SC_INTERNAL_SERVER_ERROR);
-        }
-
-        if (null != taWechatUser.getPersonId()) {
-            return ResponseBean.error("不支持人员重复绑定", HttpStatus.SC_BAD_REQUEST);
-        }
-
-        JSONObject params = JSONObject.parseObject(paramStr);
-        if (null == params) {
-            return ResponseBean.error("绑定参数为空或者非法", HttpStatus.SC_BAD_REQUEST);
-        }
-
-        String phone = params.getString("phone");
-        String captcha = params.getString("captcha");
-
-        if (null == phone || "".equals(phone.trim()) || null == captcha || "".equals(captcha.trim())) {
-            return ResponseBean.error("绑定参数为空或者非法", HttpStatus.SC_BAD_REQUEST);
-        }
-
-        // todo
-        // 先简单验证
-        if (!"1234".equals(captcha)) {
-            return ResponseBean.error("绑定参数为空或者非法", HttpStatus.SC_BAD_REQUEST);
-        }
-
-        SysUser sysUser = iSysUserService.getByPhone(phone);
-        if (null == sysUser) {
-            return ResponseBean.error("该手机号对应人员不存在", HttpStatus.SC_BAD_REQUEST);
-        }
-
-        taWechatUser.setPersonId(sysUser.getUserId());
-        boolean success = iTaWechatUserService.updateById(taWechatUser);
-
-        if (!success) {
-            return ResponseBean.error("人员绑定失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
-        }
-
-        Map<String, Object> map = new HashMap<>();
-        map.put("user", taWechatUser);
-        map.put("identity", sysUser.getUserIdentity());
-
-        return ResponseBean.success(taWechatUser);
-    }
-
-    /**
-     * 修改对象
-     * @param taWechatUser 实体对象
-     * @return
-     */
-    @RequestMapping(value="/user/{id}",method= RequestMethod.PUT)
-    public ResponseBean update(@RequestBody TaWechatUser taWechatUser, @PathVariable Integer id){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if (iTaWechatUserService.updateById(taWechatUser)){
-                responseBean.addSuccess("success");
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            logger.error("taWechatUserUpdate -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/user/{id}",method= RequestMethod.GET)
-    public ResponseBean get(@PathVariable Integer id, HttpServletRequest request){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if (id.intValue() == 0) {
-                String userId = JWTUtils.getSubject(request);
-                responseBean.addSuccess(iTaWechatUserService.getById(Integer.valueOf(userId)));
-            } else {
-                responseBean.addSuccess(iTaWechatUserService.getById(id));
-            }
-        }catch (Exception e){
-            logger.error("taWechatUserGetByID -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 分页查询
-     */
-    @RequestMapping(value="/user",method= RequestMethod.GET)
-    public ResponseBean list(
-        @RequestParam(defaultValue = "1") int pageNumber,
-        @RequestParam(defaultValue = "10") int pageSize
-    ){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            IPage<TaWechatUser> pg = new Page<>(pageNumber, pageSize);
-            QueryWrapper<TaWechatUser> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaWechatUser> result = iTaWechatUserService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
-        }catch (Exception e){
-            logger.error("taWechatUserList -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-}
+package com.huiju.welcome.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.welcome.common.base.BaseController;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.SysUser;
+import com.huiju.welcome.model.TaPerson;
+import com.huiju.welcome.model.TaWechatUser;
+import com.huiju.welcome.service.ISysUserService;
+import com.huiju.welcome.service.ITaPersonService;
+import com.huiju.welcome.service.ITaWechatUserService;
+import com.huiju.welcome.utils.CommConstant;
+import com.huiju.welcome.utils.JWTUtils;
+import com.huiju.welcome.utils.MiniApp;
+import com.huiju.welcome.utils.StatusUtils;
+import org.apache.http.HttpStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+    *  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-06-11
+ */
+@RestController
+@RequestMapping("/miniapp")
+public class TaWechatUserController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaWechatUserController.class);
+
+    @Autowired
+    private MiniApp miniApp;
+
+    @Autowired
+    private ITaWechatUserService iTaWechatUserService;
+
+    @Autowired
+    private ITaPersonService iTaPersonService;
+
+    @Autowired
+    private ISysUserService iSysUserService;
+
+    @GetMapping("/login")
+    public ResponseBean login(@RequestParam String code) {
+        ResponseBean resp = miniApp.getOpenid(code);
+        if (resp.getCode() != 200) {
+            return resp;
+        }
+
+        JSONObject data = (JSONObject) resp.getData();
+        String openid = data.getString("openid");
+        String sessionKey = data.getString("session_key");
+        String unionId = data.getString("unionid");
+        String appid = miniApp.getAppid();
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("openid", openid);
+        map.put("sessionKey", sessionKey);
+        map.put("unionId", unionId);
+        map.put("appid", appid);
+
+        // 如果已经存在的用户, 直接返回
+        TaWechatUser taWechatUser = iTaWechatUserService.getByOpenid(openid, appid);
+        if (null == taWechatUser) {
+            // 否则新增用户数据
+            taWechatUser = new TaWechatUser();
+            taWechatUser.setAppid(appid);
+            taWechatUser.setClientType(CommConstant.WECHAT_CLIENT_MINIAPP);
+            taWechatUser.setOpenid(openid);
+            taWechatUser.setUnionId(unionId);
+            taWechatUser.setStatus(StatusUtils.Normal);
+            taWechatUser.setCreateDate(LocalDateTime.now());
+
+            boolean success = iTaWechatUserService.save(taWechatUser);
+            if (!success) {
+                return ResponseBean.error("预存用户信息失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+            }
+        }
+
+        if (null != taWechatUser.getPersonId()) {
+            SysUser sysUser = iSysUserService.getById(taWechatUser.getPersonId());
+            map.put("identity", sysUser.getUserIdentity());
+        }
+
+        map.put("user", taWechatUser);
+        map.put("token", JWTUtils.newToken(taWechatUser.getUserId() + ""));
+        return ResponseBean.success(map);
+    }
+
+    @PostMapping("/bind")
+    public ResponseBean bind(@RequestBody String paramStr, HttpServletRequest request) {
+        String userId = JWTUtils.getSubject(request);
+        TaWechatUser taWechatUser = iTaWechatUserService.getById(Integer.valueOf(userId));
+
+        if (null == taWechatUser) {
+            return ResponseBean.error("数据异常, 请清空缓存后重新操作", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+        }
+
+        if (null != taWechatUser.getPersonId()) {
+            return ResponseBean.error("不支持人员重复绑定", HttpStatus.SC_BAD_REQUEST);
+        }
+
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (null == params) {
+            return ResponseBean.error("绑定参数为空或者非法", HttpStatus.SC_BAD_REQUEST);
+        }
+
+        String phone = params.getString("phone");
+        String captcha = params.getString("captcha");
+
+        if (null == phone || "".equals(phone.trim()) || null == captcha || "".equals(captcha.trim())) {
+            return ResponseBean.error("绑定参数为空或者非法", HttpStatus.SC_BAD_REQUEST);
+        }
+
+        // todo
+        // 先简单验证
+        if (!"1234".equals(captcha)) {
+            return ResponseBean.error("绑定参数为空或者非法", HttpStatus.SC_BAD_REQUEST);
+        }
+
+        SysUser sysUser = iSysUserService.getByPhone(phone);
+        if (null == sysUser) {
+            return ResponseBean.error("该手机号对应人员不存在", HttpStatus.SC_BAD_REQUEST);
+        }
+
+        taWechatUser.setPersonId(sysUser.getUserId());
+        boolean success = iTaWechatUserService.updateById(taWechatUser);
+
+        if (!success) {
+            return ResponseBean.error("人员绑定失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+        }
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("user", taWechatUser);
+        map.put("identity", sysUser.getUserIdentity());
+
+        return ResponseBean.success(map);
+    }
+
+    /**
+     * 修改对象
+     * @param taWechatUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/user/{id}",method= RequestMethod.PUT)
+    public ResponseBean update(@RequestBody TaWechatUser taWechatUser, @PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaWechatUserService.updateById(taWechatUser)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taWechatUserUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/user/{id}",method= RequestMethod.GET)
+    public ResponseBean get(@PathVariable Integer id, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (id.intValue() == 0) {
+                String userId = JWTUtils.getSubject(request);
+                responseBean.addSuccess(iTaWechatUserService.getById(Integer.valueOf(userId)));
+            } else {
+                responseBean.addSuccess(iTaWechatUserService.getById(id));
+            }
+        }catch (Exception e){
+            logger.error("taWechatUserGetByID -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value="/user",method= RequestMethod.GET)
+    public ResponseBean list(
+        @RequestParam(defaultValue = "1") int pageNumber,
+        @RequestParam(defaultValue = "10") int pageSize
+    ){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            IPage<TaWechatUser> pg = new Page<>(pageNumber, pageSize);
+            QueryWrapper<TaWechatUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaWechatUser> result = iTaWechatUserService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("taWechatUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com.huiju.welcome/service/impl/TaCarRecordServiceImpl.java

@@ -59,6 +59,9 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
     @Autowired
     private ISysParamService iSysParamService;
 
+    @Autowired
+    private ICameraService iCameraService;
+
     @Autowired
     private ITaVisitorAppointmentService iTaVisitorAppointmentService;
 
@@ -94,17 +97,20 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
         List<TaCustomer> taCustomerList = iTaCustomerService.getSomeCustMayBe(taCarRecord.getPlateNumber());
 
         // 如果没有对应人员
+        Integer personId = null;
         if (null == taCustomerList || taCustomerList.size() == 0) {
             // 再去人脸库比对一次
-            Integer personId = null;
-            try {
-                Float threshold = iSysParamService.getSamePersonThreshold();
-                JSONObject result = aliFaceUtils.searchFace(taCarRecord.getDriverImage());
-                if (result.getFloat("rate") >= threshold) {
-                    personId = Integer.valueOf(result.getString("personId"));
+            if (null != taCarRecord.getDriverImage() && aliFaceUtils.detectFace(taCarRecord.getDriverImage())) {
+                try {
+                    Float threshold = iSysParamService.getSamePersonThreshold();
+                    JSONObject result = aliFaceUtils.searchFace(taCarRecord.getDriverImage());
+
+                    if (null != result && result.getFloat("rate") * 100 >= threshold) {
+                        personId = Integer.valueOf(result.getString("personId"));
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
-            } catch (Exception e) {
-                e.printStackTrace();
             }
 
             // 依据人脸与预约判断
@@ -143,26 +149,50 @@ public class TaCarRecordServiceImpl extends ServiceImpl<TaCarRecordMapper, TaCar
         } else {
             // 对应客户, 先随机取一条
             taCustomer = taCustomerList.get(0);
+        }
 
-            // 新增人脸
-            if (null != taCarRecord.getDriverImage()) {
-                TaPerson person = new TaPerson();
+        // 新增人脸
+        if (null != taCarRecord.getDriverImage() && aliFaceUtils.detectFace(taCarRecord.getDriverImage())) {
+            TaPerson person = new TaPerson();
+            if (null != taCustomer) {
                 person.setRealId(taCustomer.getCustomerId());
                 person.setPhone(taCustomer.getPhone());
                 person.setName(taCustomer.getCustomerName());
-                person.setSex(String.valueOf(taCustomer.getSex()));
-                person.setTypeId(CommConstant.TYPE_VIP_PERSON);
-                person.setStatus(StatusUtils.Normal);
-                person.setCreateDate(LocalDateTime.now());
-                boolean success = iTaPersonService.save(person);
-
-                if (success) {
-                    TaCustomerMap mp = new TaCustomerMap();
-                    mp.setCustomerId(taCustomer.getCustomerId());
-                    mp.setPersonId(person.getPersonId());
-                    iTaCustomerMapService.save(mp);
+                if (null != taCustomer.getSex()) {
+                    person.setSex(String.valueOf(taCustomer.getSex()));
+                }
+            }
+            person.setTypeId(CommConstant.TYPE_VIP_PERSON);
+            person.setStatus(StatusUtils.Normal);
+            person.setCreateDate(LocalDateTime.now());
+            person.setAvatar(taCarRecord.getDriverImage());
+            if (null != personId) {
+                TaPerson psn = iTaPersonService.getById(personId);
+                if (null != psn) {
+                    person.setRealId(psn.getRealId());
                 }
             }
+
+            boolean success = iTaPersonService.save(person);
+
+            if (success && null != taCustomer) {
+                TaCustomerMap mp = new TaCustomerMap();
+                mp.setCustomerId(taCustomer.getCustomerId());
+                mp.setPersonId(person.getPersonId());
+                iTaCustomerMapService.save(mp);
+            }
+
+            if (null == person.getRealId()) {
+                person.setRealId(person.getPersonId());
+                iTaPersonService.updateById(person);
+            }
+
+            try {
+                iCameraService.dispatchPerson(person);
+            } catch (Exception e) {
+                log.error("下发驾驶员人脸失败: {}", e.getMessage());
+                e.printStackTrace();
+            }
         }
 
         // 先入库

src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java

@@ -275,8 +275,10 @@ public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordM
         } else if (null != taMainUsherRecord.getAvatar()) {
             // 依据人脸查询
             JSONObject result = aliFaceUtils.searchFace(taMainUsherRecord.getAvatar());
-            Integer personId = Integer.valueOf(result.getString("personId"));
-            taCustomer = iTaCustomerService.getSameByPerson(personId);
+            if (null != result) {
+                Integer personId = Integer.valueOf(result.getString("personId"));
+                taCustomer = iTaCustomerService.getSameByPerson(personId);
+            }
         }
 
         if (null == taCustomer && null == taMainUsherRecord.getCustomerId()) {

src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java

@@ -336,6 +336,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         person.setStatus(StatusUtils.Normal);
         person.setLastVisiteDate(taSnapshotPerson.getCreateDate());
         person.setLastVisiteDevice(taSnapshotPerson.getDeviceId());
+        person.setCreateDate(LocalDateTime.now());
 
         Integer sex = taSnapshotPerson.getSex();
         person.setSex(null == sex || sex == 0 ? null : String.valueOf(sex));
@@ -401,7 +402,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         Map<String,Object> data = new HashMap<>();
         data.put("person",taPerson);
         data.put("taVisitingWords",taVisitingWords);
-        data.put("audio", xfYun.voice( personName + "," + words, sex  == 2 ? 1 : 2));
+        data.put("audio", xfYun.voice( words, sex  == 2 ? 1 : 2));
 
         Map<String, Object> payload = new HashMap<>();
         payload.put("to", deviceId);

src/main/java/com.huiju.welcome/utils/AliFaceUtils.java

@@ -25,8 +25,14 @@ import org.apache.http.HttpStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.web.client.RestTemplate;
 
 import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -55,6 +61,54 @@ public class AliFaceUtils {
         IClientProfile iClientProfile = DefaultProfile.getProfile(AliProperties.face.getRegionId(), AliProperties.accessKeyId, AliProperties.accessKeySecret);
         recognitionClient = new DefaultAcsClient(iClientProfile);
     }
+
+    /**
+     * 检测照片中是否有人脸
+     * @param image
+     * @return
+     */
+    public boolean detectFace(String image)  {
+        if (null == image) return false;
+
+        log.info("阿里云开始检测是否有人脸");
+        log.info("人脸图 {}", image);
+
+        String url = "https://dtplus-cn-shanghai.data.aliyuncs.com/face/detect";
+        Date now = new Date();
+        String gmtStr = DateUtils.toGMTString(now);
+
+        Map<String, Object> sendData = new HashMap<String, Object>();
+        sendData.put("type", 0);
+        sendData.put("image_url", image);
+        String sendJSON = JSONObject.toJSONString(sendData);
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set("accept", MediaType.APPLICATION_JSON_VALUE);
+        headers.set("date", gmtStr);
+        headers.set("Authorization", "Dataplus "+ getSignature(url, "POST", MediaType.APPLICATION_JSON_VALUE, gmtStr, sendJSON));
+
+        RestTemplate restTemplate = new RestTemplate();
+        HttpEntity<String> request = new HttpEntity<>(sendJSON, headers);
+        String resp ="";
+        try{
+            resp = restTemplate.postForEntity(url, request, String.class).getBody();
+
+            JSONObject result = JSONObject.parseObject(resp);
+
+            Integer faceNum = result.getInteger("face_num");
+
+            log.info("人脸数目: {}", faceNum);
+
+            return null != faceNum && faceNum > 0;
+        }catch (Exception e){
+            log.error("检测人脸失败: {}", e.getMessage());
+            e.printStackTrace();
+        }
+
+        log.info("未检测到人脸");
+        return false;
+    }
     
     /**
      * 获取用户信息
@@ -291,9 +345,18 @@ public class AliFaceUtils {
                             JSONArray sceneResults = ((JSONObject)taskResult).getJSONArray("results");
                             for (Object sceneResult : sceneResults) {
                                 JSONArray personList = ((JSONObject) sceneResult).getJSONArray("topPersonData");
+                                log.info("查询阿里云人脸结果: {}", personList);
 
                                 if (null != personList && personList.size() > 0) {
-                                    return personList.getJSONObject(0).getJSONArray("persons").getJSONObject(0);
+                                    JSONArray persons = personList.getJSONObject(0).getJSONArray("persons");
+                                    if (null != persons && persons.size() > 0) {
+                                        JSONObject person = persons.getJSONObject(0);
+                                        if (null != person.getString("personId") && !"null".equals(person.getString("personId"))) {
+                                            return person;
+                                        } else if (persons.size() > 1) {
+                                            return persons.getJSONObject(1);
+                                        }
+                                    }
                                 }
                             }
                         }else{
@@ -400,4 +463,32 @@ public class AliFaceUtils {
         request.putBodyParameter("Group", AliProperties.face.getGroup());
         return request;
     }
+
+    private String getSignature(String url, String method, String contentType, String gmtStr, String data) {
+        URL realURL = null;
+        try {
+            realURL = new URL(url);
+        } catch (MalformedURLException e) {
+            log.error("解析 URL 失败: {}", e.getMessage());
+            e.printStackTrace();
+            return null;
+        }
+        String path = realURL.getFile();
+
+        String[] parts = new String[]{
+                method,
+                contentType,
+                Encrypt.MD5Base64(data),
+                contentType,
+                gmtStr,
+                path
+        };
+
+        String str2Sign = String.join("\n", parts);
+        log.info("---string to sign ===> {}", str2Sign);
+
+        String signature = AliProperties.accessKeyId + ":" + Encrypt.HMACSha1(str2Sign, AliProperties.accessKeySecret);
+        log.info("---signature ===> {}", signature);
+        return signature;
+    }
 }

src/main/java/com.huiju.welcome/utils/DateUtils.java

@@ -1,10 +1,12 @@
 package com.huiju.welcome.utils;
 
+import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
+import java.util.Locale;
 
 public class DateUtils {
     public static LocalDateTime date2LocalDateTime(Date date) {
@@ -48,4 +50,10 @@ public class DateUtils {
 
         return LocalDateTime.of(now.getYear(), now.getMonth(), now.getDayOfMonth(), Integer.valueOf(parts[0]), Integer.valueOf(parts[1]));
     }
+
+    public static String toGMTString(Date date) {
+        SimpleDateFormat df = new SimpleDateFormat("E, dd MMM yyyy HH:mm:ss z", Locale.UK);
+        df.setTimeZone(new java.util.SimpleTimeZone(0, "GMT"));
+        return df.format(date);
+    }
 }

src/main/java/com.huiju.welcome/utils/Encrypt.java

@@ -2,12 +2,18 @@ package com.huiju.welcome.utils;
 
 import org.apache.commons.codec.binary.Base64;
 import org.springframework.util.DigestUtils;
+import sun.misc.BASE64Encoder;
 
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.security.MessageDigest;
 
 public class Encrypt {
     public static String md5(String str, String ...salt) {
+        if (null == str) return null;
+
         byte[] secBytes = null;
 
         String plainText = str;
@@ -19,6 +25,8 @@ public class Encrypt {
     }
 
     public static String base64(String str) {
+        if (null == str) return "";
+
         String rtn = "";
         try {
             rtn = new String(Base64.encodeBase64(str.getBytes("UTF-8")));
@@ -38,4 +46,36 @@ public class Encrypt {
         }
         return rtn;
     }
+
+    public static String HMACSha1(String data, String key) {
+        String result;
+        try {
+            SecretKeySpec signingKey = new SecretKeySpec(key.getBytes(), "HmacSHA1");
+            Mac mac = Mac.getInstance("HmacSHA1");
+            mac.init(signingKey);
+            byte[] rawHmac = mac.doFinal(data.getBytes());
+            result =  new String(Base64.encodeBase64(rawHmac));
+        } catch (Exception e) {
+            throw new Error("Failed to generate HMAC : " + e.getMessage());
+        }
+        return result;
+    }
+
+    public static String MD5Base64(String s) {
+        if (s == null)
+            return null;
+        String encodeStr = "";
+        byte[] utfBytes = s.getBytes();
+        MessageDigest mdTemp;
+        try {
+            mdTemp = MessageDigest.getInstance("MD5");
+            mdTemp.update(utfBytes);
+            byte[] md5Bytes = mdTemp.digest();
+            BASE64Encoder b64Encoder = new BASE64Encoder();
+            encodeStr = b64Encoder.encode(md5Bytes);
+        } catch (Exception e) {
+            throw new Error("Failed to generate MD5 : " + e.getMessage());
+        }
+        return encodeStr;
+    }
 }