Skip to content

M
manager
Commit 349dadfd by manxiaoqiang
Options

Merge branch 'master' of git.minrow.com:reyun/manager

# Conflicts: # pom.xml # target/classes/common.properties # target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
parent e03e0f6c
Showing with 102 additions and 408 deletions
.idea/workspace.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/common/service/IOpenApiService.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/OpenApiServiceImpl.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/util/AwsS3Util.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/util/IOUtil.java" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/artifacts/manage_war.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/artifacts/manage_war_exploded.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/encodings.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_access_1_1_3.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_3.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_3.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_1_0_14.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_amazonaws_aws_java_sdk_core_1_11_52.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_amazonaws_aws_java_sdk_dynamodb_1_11_52.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_amazonaws_aws_java_sdk_kms_1_11_52.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_amazonaws_aws_java_sdk_s3_1_11_52.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_amazonaws_jmespath_java_1_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_belerweb_pinyin4j_2_5_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_beust_jcommander_1_48.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_0_8_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_5.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_5.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_5.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_cbor_2_6_6.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_api_ads_ads_lib_3_9_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_api_ads_ads_lib_axis_3_9_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_api_ads_adwords_axis_3_9_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_api_client_google_api_client_1_22_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_annotations_2_0_3.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_1_6.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_20_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_http_client_google_http_client_1_22_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_http_client_google_http_client_jackson2_1_22_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_inject_extensions_guice_assistedinject_4_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_inject_extensions_guice_multibindings_4_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_inject_guice_4_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_oauth_client_google_oauth_client_1_22_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_googlecode_ehcache_spring_annotations_ehcache_spring_annotations_1_1_2.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_googlecode_jmockit_jmockit_1_5.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_googlecode_jmockit_jmockit_coverage_0_999_24.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_8.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_8_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_configuration_commons_configuration_1_10.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_discovery_commons_discovery_0_4.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_2_2.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_4.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_net_commons_net_3_6.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__dnsjava_dnsjava_2_1_8.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_0_23_Final.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_activation_1_1.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_el_javax_el_api_2_2_4.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_inject_javax_inject_1.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_mail_mail_1_4_1.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_xml_jaxrpc_api_1_1.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__joda_time_joda_time_2_8_2.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_25.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ehcache_ehcache_2_9_1.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_1_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_opencsv_opencsv_1_8.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_anarres_lzo_lzo_core_1_0_5.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_axis_axis_1_4.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_email_1_2.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_3.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_16.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_16.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_16.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjrt_1_7_2.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_9.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_web_javax_el_2_2_4.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_1_Final.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_4_2_1_Final.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_4_2_1_Final.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_0_0_Final.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_0_api_1_0_1_Final.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_1_GA.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_1_spec_1_0_1_Final.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jdom_jdom_1_1_3.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20090211.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jsoup_jsoup_1_6_3.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_logback_extensions_logback_ext_spring_0_1_2.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_5.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_5.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_5_1_RELEASE.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_1_3_2_RELEASE.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_1_1_1_RELEASE.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_1_7_1_RELEASE.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_3_4_RELEASE.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aspects_4_3_4_RELEASE.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_3_4_RELEASE.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_3_4_RELEASE.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_4_RELEASE.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_3_4_RELEASE.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_3_4_RELEASE.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_3_1_4_RELEASE.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_3_1_4_RELEASE.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_4_2_5_RELEASE.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_4_2_5_RELEASE.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_3_4_RELEASE.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_4_RELEASE.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_webjars_npm_isemail_2_1_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_xerial_snappy_snappy_java_1_1_2_6.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__redis_clients_jedis_2_8_0.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__software_amazon_ion_ion_java_1_0_1.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__wsdl4j_wsdl4j_1_6_2.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/tkio/task/SyncAppDataTask.java" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/17monipdb.dat" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/applicationContext-schedule.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/applicationContext.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/context/AppUtils.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/controller/AppController.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/controller/LoginController.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/controller/MenuController.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/controller/UserController.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/controller/UserLogController.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/model/Account4Web.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/model/AppCategory.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/model/AppInfo.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/model/Auth.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/model/BackVisit.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/model/City.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/model/Code.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/model/Email.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/model/KeyValue.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/model/Menu.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/model/Payment.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/model/Reminder.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/model/RoleType.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/model/TrackAccount4Web.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/model/User.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/model/UserLog.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/repository/Account4WebRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/repository/AppCategoryRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/repository/AppInfoRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/repository/AuthRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/repository/BackVisitRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/repository/CityRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/repository/CodeRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/repository/MenuRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/repository/PaymentRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/repository/ReminderRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/repository/RoleTypeRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/repository/TrackAccount4WebRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/repository/UserLogRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/repository/UserRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/service/AppService.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/service/MenuService.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/service/UserLogService.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/service/UserService.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/service/impl/AppServiceImpl$1.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/service/impl/AppServiceImpl$2.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/service/impl/AppServiceImpl.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/service/impl/MenuServiceImpl.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/service/impl/UserLogServiceImpl.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/service/impl/UserServiceImpl.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/common/task/ReportCallable.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/db.properties" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/dic/OperateObjectTypeEnum.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/dic/RoleEnum.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/dic/RoleTypeEnum.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/dmp/model/OtPkgDevStats.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/dmp/model/TagCrawlerAppsWandoujia.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/dmp/repository/OtPkgDevStatsRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/dmp/repository/TagCrawlerAppsWandoujiaRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/exception/GlobalExceptionAdvice.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/exception/NotFoundException.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/exception/TipException.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/exception/TransferCurrentAccountException.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/logback.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/logback/dev/logback.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/logback/product/logback.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/mail.properties" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/persistence.properties" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/redis.properties" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/rest-servlet.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/security/AbstractTokenManager.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/security/RedisLoginStatusManager.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/security/RedisLoginStatusManagerImpl.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/security/RedisTokenManager.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/security/TokenManager.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/security/annotation/Authorization.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/security/annotation/CurrentAccount.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/security/cors/CorsFilter.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/security/exception/MethodNotSupportException.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/security/interceptor/AuthorizationInterceptor.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/security/resolvers/LoginUserMethodArgumentsResolver.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/controller/TkioAccountController.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/model/Account.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/model/AccountRestrict4Web.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/model/App.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/model/Auth.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/model/Campaign.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/model/Channel.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/model/DataAuth.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/model/IsNotified.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/model/PackageType.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/model/RoleAuth.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/model/RoleAuthDetail.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/model/SalesManLeader.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/model/UserLog.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/repository/AccountRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/repository/AppRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/repository/CampaignRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/repository/ChannelRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/repository/IsNotifiedRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/repository/PackageTypeRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/repository/SalesManLeaderRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/service/AccountFlowRestrictService.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/service/TkioAccountService.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/service/impl/AccountFlowRestrictServiceImpl.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/service/impl/TkioAccountServiceImpl.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/task/AccountTask.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/task/SyncAppDataTask.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/track/controller/TrackAccountController.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/track/model/Account.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/track/model/App.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/track/model/Campaign.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/track/model/Channel.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/track/repository/TrackAccountRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/track/repository/TrackAppRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/track/repository/TrackCampaignRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/track/repository/TrackChannelRepository.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/track/service/TrackAccountService.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/track/service/impl/TrackAccountServiceImpl.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/track/task/AccountTask.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/util/CharacterUtils.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/util/CipherUtil.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/util/Constant.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/util/DBUtil.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/util/DateUtil.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/util/HttpClientUtil.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/util/IP$1.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/util/IP.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/util/IPAddrUtil.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/util/MailUtils.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/util/RedisUtilNew.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/util/ResultModel.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/util/ResultStatus.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/util/StringUtil.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/util/UserLogThread.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/util/ValidateUtil.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/webdefault.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" />
<list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="Merge branch 'master' of git.minrow.com:reyun/manager&#10;&#10;# Conflicts:&#10;#&#9;pom.xml&#10;#&#9;target/classes/common.properties&#10;#&#9;target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst&#10;">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/manage.iml" afterPath="$PROJECT_DIR$/manage.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" afterPath="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml" afterPath="$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/applicationContext.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common.properties" afterPath="$PROJECT_DIR$/target/classes/common.properties" />
</list>
<list id="933e480d-1136-4c92-9651-6e74b37fc51c" name="Failed commit: Default" comment="track客户管理" />
<ignored path="$PROJECT_DIR$/target/" />
......@@ -293,16 +19,48 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
<file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="58">
<state relative-caret-position="-80">
<caret line="171" column="16" lean-forward="false" selection-start-line="171" selection-start-column="16" selection-end-line="171" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AwsS3Util.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/util/AwsS3Util.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="335">
<caret line="127" column="25" lean-forward="true" selection-start-line="127" selection-start-column="25" selection-end-line="127" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="workspace.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5382">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SyncAppDataTask.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2024">
<caret line="280" column="4" lean-forward="false" selection-start-line="280" selection-start-column="4" selection-end-line="280" selection-end-column="4" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -372,6 +130,7 @@
<option value="$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml" />
<option value="$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java" />
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
</option>
</component>
......@@ -393,6 +152,38 @@
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="myweb Maven Webapp" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Plugins" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$PluginsNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="myweb Maven Webapp" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Plugins" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$PluginsNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="jetty" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$PluginNode" />
</PATH_ELEMENT>
</PATH>
</treeState>
</component>
<component name="ProjectFrameBounds">
......@@ -405,7 +196,7 @@
<ConfirmationsSetting value="1" id="Add" />
</component>
<component name="ProjectView">
<navigator currentView="PackagesPane" proportions="" version="1">
<navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages />
<showMembers />
<showModules />
......@@ -449,94 +240,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="webapp" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="webapp" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="WEB-INF" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
......@@ -1050,11 +753,11 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="56835000" />
<option name="totallyTimeSpent" value="56933000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="0" />
<editor active="true" />
<editor active="false" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
......@@ -1069,15 +772,16 @@
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.44517186" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3289689" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3289689" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3289689" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3289689" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36497545" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3289689" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2647504" sideWeight="0.5" order="7" side_tool="false" content_ui="combo" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5581015" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2647504" sideWeight="0.5" order="7" side_tool="false" content_ui="combo" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
......@@ -1086,7 +790,6 @@
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="10" side_tool="false" content_ui="combo" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3289689" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="CheckStyle" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
......@@ -1176,13 +879,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="12" column="17" lean-forward="false" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AppCategoryRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
......@@ -1201,7 +897,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="6" column="12" lean-forward="false" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
......@@ -1209,7 +904,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="6" column="12" lean-forward="false" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
......@@ -1274,7 +968,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="11" column="1" lean-forward="false" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
......@@ -1405,22 +1098,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/AwsS3Util.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="545">
<caret line="127" column="25" lean-forward="true" selection-start-line="127" selection-start-column="25" selection-end-line="127" selection-end-column="25" />
<folding>
<element signature="e#4453#4454#0" expanded="false" />
<element signature="e#4538#4539#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/IOpenApiService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="12" column="8" lean-forward="false" selection-start-line="12" selection-start-column="8" selection-end-line="12" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
......@@ -1445,7 +1126,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="155" column="16" lean-forward="false" selection-start-line="155" selection-start-column="16" selection-end-line="155" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
......@@ -1465,16 +1145,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1226">
<caret line="280" column="4" lean-forward="false" selection-start-line="280" selection-start-column="4" selection-end-line="280" selection-end-column="4" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112">
......@@ -1487,7 +1157,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="997">
<caret line="203" column="57" lean-forward="false" selection-start-line="203" selection-start-column="57" selection-end-line="203" selection-end-column="57" />
<folding />
</state>
</provider>
</entry>
......@@ -1495,7 +1164,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="14" column="1" lean-forward="false" selection-start-line="14" selection-start-column="1" selection-end-line="14" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
......@@ -1511,17 +1179,42 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23">
<caret line="62" column="52" lean-forward="false" selection-start-line="62" selection-start-column="52" selection-end-line="62" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5382">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="58">
<state relative-caret-position="-80">
<caret line="171" column="16" lean-forward="false" selection-start-line="171" selection-start-column="16" selection-end-line="171" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/AwsS3Util.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="335">
<caret line="127" column="25" lean-forward="true" selection-start-line="127" selection-start-column="25" selection-end-line="127" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2024">
<caret line="280" column="4" lean-forward="false" selection-start-line="280" selection-start-column="4" selection-end-line="280" selection-end-column="4" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment