From ac88d4fb64ba32246c8636aba55d9f3d1c188357 Mon Sep 17 00:00:00 2001 From: qqkj Date: Mon, 8 Feb 2021 00:55:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8Dbackend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 + ...ven__com_ecwid_consul_consul_api_1_4_5.xml | 13 + .../Maven__com_fasterxml_classmate_1_5_1.xml | 13 + ...ackson_core_jackson_annotations_2_11_3.xml | 13 + ...erxml_jackson_core_jackson_core_2_11_3.xml | 13 + ...l_jackson_core_jackson_databind_2_11_3.xml | 13 + ...aformat_jackson_dataformat_yaml_2_11_3.xml | 13 + ..._datatype_jackson_datatype_jdk8_2_11_3.xml | 13 + ...atatype_jackson_datatype_jsr310_2_11_3.xml | 13 + ...dule_jackson_module_afterburner_2_11_3.xml | 13 + ..._jackson_module_parameter_names_2_11_3.xml | 13 + ...en__com_github_jknack_handlebars_4_2_0.xml | 13 + ...__com_github_jsqlparser_jsqlparser_3_2.xml | 13 + ...com_github_pagehelper_pagehelper_5_2_0.xml | 13 + ...b_stephenc_jcip_jcip_annotations_1_0_1.xml | 13 + ...ehurst_wiremock_jre8_standalone_2_27_1.xml | 13 + ...Maven__com_google_code_gson_gson_2_8_6.xml | 13 + ...com_googlecode_javaewah_JavaEWAH_1_1_6.xml | 13 + .../Maven__com_ibm_icu_icu4j_4_6.xml | 13 + .../Maven__com_jcraft_jsch_0_1_54.xml | 13 + ..._com_jcraft_jsch_agentproxy_core_0_0_9.xml | 13 + ..._com_jcraft_jsch_agentproxy_jsch_0_0_9.xml | 13 + ..._jcraft_jsch_agentproxy_sshagent_0_0_9.xml | 13 + ...raft_jsch_agentproxy_usocket_jna_0_0_9.xml | 13 + .../Maven__com_jcraft_jzlib_1_1_1.xml | 13 + ...p_mdp_audit_log_client_M_1_0_0_RELEASE.xml | 13 + ...m_mdp_mdp_boot_starter_M_1_0_0_RELEASE.xml | 13 + ..._mdp_mdp_cloud_starter_M_1_0_0_RELEASE.xml | 13 + ...__com_mdp_mdp_core_api_M_1_0_0_RELEASE.xml | 13 + ...om_mdp_mdp_dao_mybatis_M_1_0_0_RELEASE.xml | 13 + .../Maven__com_mdp_mdp_ds_M_1_0_0_RELEASE.xml | 13 + ..._com_mdp_mdp_ext_utils_M_1_0_0_RELEASE.xml | 13 + ...om_mdp_mdp_meta_client_M_1_0_0_RELEASE.xml | 13 + ...m_mdp_mdp_micro_client_M_1_0_0_RELEASE.xml | 13 + .../Maven__com_mdp_mdp_mq_M_1_0_0_RELEASE.xml | 13 + ...com_mdp_mdp_msg_client_M_1_0_0_RELEASE.xml | 13 + ...dp_mdp_mybatis_enhance_M_1_0_0_RELEASE.xml | 13 + ..._mdp_mdp_oauth2_client_M_1_0_0_RELEASE.xml | 13 + ...en__com_mdp_mdp_qx_api_M_1_0_0_RELEASE.xml | 13 + ...om_mdp_mdp_safe_client_M_1_0_0_RELEASE.xml | 13 + ...mdp_mdp_spring_enhance_M_1_0_0_RELEASE.xml | 13 + ...mdp_mdp_tomcat_enhance_M_1_0_0_RELEASE.xml | 13 + ...om_netflix_hystrix_hystrix_core_1_5_18.xml | 13 + ...etflix_hystrix_hystrix_javanica_1_5_18.xml | 13 + ...ix_hystrix_metrics_event_stream_1_5_18.xml | 13 + ...x_hystrix_hystrix_serialization_1_5_18.xml | 13 + .../Maven__com_nimbusds_content_type_2_1.xml | 13 + .../Maven__com_nimbusds_lang_tag_1_4_4.xml | 13 + ...en__com_nimbusds_nimbus_jose_jwt_9_1_3.xml | 13 + ...n__com_nimbusds_oauth2_oidc_sdk_8_23_1.xml | 13 + ...lipse_wst_xml_xpath2_processor_2_1_100.xml | 13 + .../Maven__com_stoyanr_evictor_1_0_0.xml | 13 + ...un_activation_jakarta_activation_1_2_2.xml | 13 + ...n_istack_istack_commons_runtime_3_0_11.xml | 13 + ...Maven__com_sun_mail_jakarta_mail_1_6_5.xml | 13 + ...muchcoding_jsonassert_jsonassert_0_5_0.xml | 13 + .../Maven__com_zaxxer_HikariCP_3_4_5.xml | 13 + ...mons_beanutils_commons_beanutils_1_9_4.xml | 13 + ...aven__commons_codec_commons_codec_1_15.xml | 13 + ..._collections_commons_collections_3_2_2.xml | 13 + ...onfiguration_commons_configuration_1_8.xml | 13 + .../Maven__commons_lang_commons_lang_2_6.xml | 13 + ...n__commons_logging_commons_logging_1_2.xml | 13 + ...n__dk_brics_automaton_automaton_1_11_8.xml | 13 + .../Maven__edu_princeton_cup_java_cup_10k.xml | 13 + ...n__io_micrometer_micrometer_core_1_6_2.xml | 13 + ...en__io_netty_netty_buffer_4_1_55_Final.xml | 13 + ...ven__io_netty_netty_codec_4_1_55_Final.xml | 13 + ..._io_netty_netty_codec_dns_4_1_55_Final.xml | 13 + ...o_netty_netty_codec_http2_4_1_55_Final.xml | 13 + ...io_netty_netty_codec_http_4_1_55_Final.xml | 13 + ...o_netty_netty_codec_socks_4_1_55_Final.xml | 13 + ...en__io_netty_netty_common_4_1_55_Final.xml | 13 + ...n__io_netty_netty_handler_4_1_55_Final.xml | 13 + ...netty_netty_handler_proxy_4_1_55_Final.xml | 13 + ...__io_netty_netty_resolver_4_1_55_Final.xml | 13 + ..._netty_netty_resolver_dns_4_1_55_Final.xml | 13 + ..._io_netty_netty_transport_4_1_55_Final.xml | 13 + ...native_epoll_linux_x86_64_4_1_55_Final.xml | 13 + ...nsport_native_unix_common_4_1_55_Final.xml | 13 + ...jectreactor_addons_reactor_extra_3_4_1.xml | 13 + ...ojectreactor_netty_reactor_netty_1_0_2.xml | 13 + ...reactor_netty_reactor_netty_core_1_0_2.xml | 13 + ...reactor_netty_reactor_netty_http_1_0_2.xml | 13 + ...r_netty_reactor_netty_http_brave_1_0_2.xml | 13 + ...__io_projectreactor_reactor_core_3_4_1.xml | 13 + .../Maven__io_reactivex_rxjava_1_3_8.xml | 13 + ...eactivex_rxjava_reactive_streams_1_2_1.xml | 13 + .../Maven__io_zipkin_brave_brave_5_13_2.xml | 13 + ...rave_brave_instrumentation_http_5_13_2.xml | 13 + ...ipkin_reporter2_zipkin_reporter_2_16_1.xml | 13 + ...reporter2_zipkin_reporter_brave_2_16_1.xml | 13 + ...Maven__io_zipkin_zipkin2_zipkin_2_23_0.xml | 13 + ...ctivation_jakarta_activation_api_1_2_2.xml | 13 + ...nnotation_jakarta_annotation_api_1_3_5.xml | 13 + ...alidation_jakarta_validation_api_2_0_2.xml | 13 + ...ta_xml_bind_jakarta_xml_bind_api_2_3_3.xml | 13 + ..._annotation_javax_annotation_api_1_3_2.xml | 13 + .../Maven__javax_inject_javax_inject_1.xml | 13 + .idea/libraries/Maven__junit_junit_4_13_1.xml | 13 + ...ven__mysql_mysql_connector_java_8_0_22.xml | 13 + ...aven__net_bytebuddy_byte_buddy_1_10_18.xml | 13 + ...net_bytebuddy_byte_buddy_agent_1_10_18.xml | 13 + .../Maven__net_java_dev_jna_jna_4_1_0.xml | 13 + ...n__net_java_dev_jna_jna_platform_4_1_0.xml | 13 + ...mbs_json_unit_json_unit_assertj_2_19_0.xml | 13 + ...crumbs_json_unit_json_unit_core_2_19_0.xml | 13 + ...s_json_unit_json_unit_json_path_2_19_0.xml | 13 + ..._org_apache_commons_commons_lang3_3_11.xml | 13 + ...org_apache_commons_commons_pool2_2_9_0.xml | 13 + ...n__org_apache_commons_commons_text_1_9.xml | 13 + ...pache_httpcomponents_httpclient_4_5_13.xml | 13 + ..._apache_httpcomponents_httpcore_4_4_14.xml | 13 + ...aven_resolver_maven_resolver_api_1_4_1.xml | 13 + ..._tomcat_embed_tomcat_embed_core_9_0_41.xml | 13 + ...at_embed_tomcat_embed_websocket_9_0_41.xml | 13 + ...e_tomcat_tomcat_annotations_api_9_0_41.xml | 13 + ..._org_apiguardian_apiguardian_api_1_1_0.xml | 13 + ...Maven__org_aspectj_aspectjweaver_1_9_6.xml | 13 + ...Maven__org_assertj_assertj_core_3_18_1.xml | 13 + ...__org_bouncycastle_bcpkix_jdk15on_1_64.xml | 13 + ...__org_bouncycastle_bcprov_jdk15on_1_64.xml | 13 + ...ven__org_codehaus_groovy_groovy_2_5_14.xml | 13 + ...org_codehaus_groovy_groovy_json_2_5_14.xml | 13 + ..._org_codehaus_groovy_groovy_nio_2_5_14.xml | 13 + ..._org_codehaus_groovy_groovy_xml_2_5_14.xml | 13 + ...rg_eclipse_jdt_core_compiler_ecj_4_4_2.xml | 13 + ..._org_eclipse_jgit_5_1_3_201810200350_r.xml | 13 + .../Maven__org_ehcache_ehcache_3_9_0.xml | 13 + .../Maven__org_glassfish_jakarta_el_3_0_3.xml | 13 + ..._org_glassfish_jaxb_jaxb_runtime_2_3_3.xml | 13 + .../Maven__org_glassfish_jaxb_txw2_2_3_3.xml | 13 + .../Maven__org_hamcrest_hamcrest_2_2.xml | 13 + .../Maven__org_hamcrest_hamcrest_core_2_2.xml | 13 + ...__org_hdrhistogram_HdrHistogram_2_1_12.xml | 13 + ...idator_hibernate_validator_6_1_6_Final.xml | 13 + ...boss_logging_jboss_logging_3_4_1_Final.xml | 13 + ..._org_junit_jupiter_junit_jupiter_5_7_0.xml | 13 + ..._junit_jupiter_junit_jupiter_api_5_7_0.xml | 13 + ...nit_jupiter_junit_jupiter_engine_5_7_0.xml | 13 + ...nit_jupiter_junit_jupiter_params_5_7_0.xml | 13 + ..._platform_junit_platform_commons_1_7_0.xml | 13 + ...t_platform_junit_platform_engine_1_7_0.xml | 13 + ...Maven__org_mockito_mockito_core_3_6_28.xml | 13 + ...g_mockito_mockito_junit_jupiter_3_6_28.xml | 13 + .../Maven__org_mybatis_mybatis_3_5_6.xml | 13 + ...aven__org_mybatis_mybatis_spring_2_0_6.xml | 13 + ...ybatis_spring_boot_autoconfigure_2_1_4.xml | 13 + ...boot_mybatis_spring_boot_starter_2_1_4.xml | 13 + .../Maven__org_objenesis_objenesis_3_1.xml | 13 + ...Maven__org_opentest4j_opentest4j_1_2_0.xml | 13 + ...aven__org_projectlombok_lombok_1_18_16.xml | 13 + ...reactivestreams_reactive_streams_1_0_3.xml | 13 + .../Maven__org_slf4j_jul_to_slf4j_1_7_30.xml | 13 + .../Maven__org_slf4j_slf4j_api_1_7_30.xml | 13 + ...springframework_boot_spring_boot_2_4_1.xml | 13 + ...mework_boot_spring_boot_actuator_2_4_1.xml | 13 + ...ring_boot_actuator_autoconfigure_2_4_1.xml | 13 + ...k_boot_spring_boot_autoconfigure_2_4_1.xml | 13 + ...amework_boot_spring_boot_starter_2_4_1.xml | 13 + ...oot_spring_boot_starter_actuator_2_4_1.xml | 13 + ...ork_boot_spring_boot_starter_aop_2_4_1.xml | 13 + ...k_boot_spring_boot_starter_cache_2_4_1.xml | 13 + ...rk_boot_spring_boot_starter_jdbc_2_4_1.xml | 13 + ...rk_boot_spring_boot_starter_json_2_4_1.xml | 13 + ...boot_spring_boot_starter_logging_2_4_1.xml | 13 + ...pring_boot_starter_oauth2_client_2_4_1.xml | 13 + ...oot_spring_boot_starter_security_2_4_1.xml | 13 + ...rk_boot_spring_boot_starter_test_2_4_1.xml | 13 + ..._boot_spring_boot_starter_tomcat_2_4_1.xml | 13 + ...t_spring_boot_starter_validation_2_4_1.xml | 13 + ...ork_boot_spring_boot_starter_web_2_4_1.xml | 13 + ...gframework_boot_spring_boot_test_2_4_1.xml | 13 + ...t_spring_boot_test_autoconfigure_2_4_1.xml | 13 + ...ework_cloud_spring_cloud_commons_3_0_0.xml | 13 + ...k_cloud_spring_cloud_consul_core_3_0_0.xml | 13 + ...ud_spring_cloud_consul_discovery_3_0_0.xml | 13 + ...ework_cloud_spring_cloud_context_3_0_0.xml | 13 + ...spring_cloud_contract_converters_3_0_0.xml | 13 + ...loud_spring_cloud_contract_shade_3_0_0.xml | 13 + ...cloud_spring_cloud_contract_spec_3_0_0.xml | 13 + ...pring_cloud_contract_spec_groovy_3_0_0.xml | 13 + ..._spring_cloud_contract_spec_java_3_0_0.xml | 13 + ...pring_cloud_contract_stub_runner_3_0_0.xml | 13 + ...d_spring_cloud_contract_verifier_3_0_0.xml | 13 + ...d_spring_cloud_contract_wiremock_3_0_0.xml | 13 + ..._cloud_function_compiler_3_0_6_RELEASE.xml | 13 + ..._cloud_spring_cloud_loadbalancer_3_0_0.xml | 13 + ...g_cloud_netflix_archaius_2_2_6_RELEASE.xml | 13 + ...ng_cloud_netflix_hystrix_2_2_6_RELEASE.xml | 13 + ...ing_cloud_netflix_ribbon_2_2_6_RELEASE.xml | 13 + ...ework_cloud_spring_cloud_starter_3_0_0.xml | 13 + ...loud_spring_cloud_starter_consul_3_0_0.xml | 13 + ...g_cloud_starter_consul_discovery_3_0_0.xml | 13 + ...oud_starter_contract_stub_runner_3_0_0.xml | 13 + ...pring_cloud_starter_loadbalancer_3_0_0.xml | 13 + ...starter_netflix_archaius_2_2_6_RELEASE.xml | 13 + ..._starter_netflix_hystrix_2_2_6_RELEASE.xml | 13 + ...amework_data_spring_data_commons_2_4_2.xml | 13 + ...mework_data_spring_data_keyvalue_2_4_2.xml | 13 + ...framework_data_spring_data_redis_2_4_2.xml | 13 + ..._security_spring_security_config_5_4_2.xml | 13 + ...rk_security_spring_security_core_5_4_2.xml | 13 + ..._security_spring_security_crypto_5_4_2.xml | 13 + ...ty_spring_security_oauth2_client_5_4_2.xml | 13 + ...rity_spring_security_oauth2_core_5_4_2.xml | 13 + ...rity_spring_security_oauth2_jose_5_4_2.xml | 13 + ..._security_oauth2_resource_server_5_4_2.xml | 13 + ...rity_spring_security_rsa_1_0_9_RELEASE.xml | 13 + ...ork_security_spring_security_web_5_4_2.xml | 13 + ...work_session_spring_session_core_2_4_1.xml | 13 + ...ession_spring_session_data_redis_2_4_1.xml | 13 + ...__org_springframework_spring_aop_5_3_2.xml | 13 + ...g_springframework_spring_aspects_5_3_2.xml | 13 + ...org_springframework_spring_beans_5_3_2.xml | 13 + ...g_springframework_spring_context_5_3_2.xml | 13 + ...framework_spring_context_support_5_3_2.xml | 13 + ..._org_springframework_spring_core_5_3_2.xml | 13 + ...pringframework_spring_expression_5_3_2.xml | 13 + ...__org_springframework_spring_jcl_5_3_2.xml | 13 + ..._org_springframework_spring_jdbc_5_3_2.xml | 13 + ...__org_springframework_spring_oxm_5_3_2.xml | 13 + ..._org_springframework_spring_test_5_3_2.xml | 13 + ...n__org_springframework_spring_tx_5_3_2.xml | 13 + ...__org_springframework_spring_web_5_3_2.xml | 13 + ...g_springframework_spring_webflux_5_3_2.xml | 13 + ...rg_springframework_spring_webmvc_5_3_2.xml | 13 + .../Maven__org_xmlunit_xmlunit_core_2_7_0.xml | 13 + .../Maven__org_yaml_snakeyaml_1_27.xml | 13 + .../Maven__redis_clients_jedis_3_3_0.xml | 13 + .idea/xm-backend.iml | 185 ++++++++++++ pom.xml | 2 +- xm-bootstrap/pom.xml | 3 +- .../src/main/java/com/qqkj/XmApplication.java | 41 --- .../com/qqkj/mdp/MdpWebAppConfigurer.java | 27 -- .../java/com/qqkj/mdp/WebSecurityConfig.java | 172 ----------- .../main/java/com/xm/WebSecurityConfig.java | 42 +++ .../src/main/java/com/xm/XmApplication.java | 17 ++ xm-bootstrap/xm-bootstrap.iml | 270 ++++++++++++++++++ xm-core/pom.xml | 2 +- .../com/xm/core/ctrl/XmEnvListController.java | 4 +- .../com/xm/core/ctrl/XmFileController.java | 4 +- .../core/ctrl/XmIterationMenuController.java | 4 +- .../com/xm/core/ctrl/XmMenuController.java | 6 +- .../xm/core/ctrl/XmMenuPlanController.java | 4 +- .../com/xm/core/ctrl/XmProductController.java | 4 +- .../com/xm/core/ctrl/XmProjectController.java | 4 +- .../core/ctrl/XmProjectEnvListController.java | 4 +- .../core/ctrl/XmProjectGroupController.java | 4 +- .../XmProjectMBudgetCostNouserController.java | 4 +- .../XmProjectMBudgetCostUserController.java | 4 +- .../ctrl/XmProjectMCostNouserController.java | 4 +- .../ctrl/XmProjectMCostUserController.java | 4 +- .../xm/core/ctrl/XmQuestionController.java | 8 +- .../com/xm/core/ctrl/XmTaskController.java | 8 +- .../core/ctrl/XmTaskExecuserController.java | 8 +- .../com/xm/core/entity/XmBranchState.java | 1 + .../xm/core/entity/XmBranchTaskTypeState.java | 1 + .../java/com/xm/core/entity/XmEnvList.java | 3 +- .../java/com/xm/core/entity/XmExchange.java | 1 + .../java/com/xm/core/entity/XmIteration.java | 3 +- .../com/xm/core/entity/XmIterationMenu.java | 1 + .../com/xm/core/entity/XmIterationState.java | 1 + .../com/xm/core/entity/XmMenuExchange.java | 1 + .../java/com/xm/core/entity/XmMenuPlan.java | 3 +- .../java/com/xm/core/entity/XmMenuState.java | 3 +- .../java/com/xm/core/entity/XmProduct.java | 1 + .../com/xm/core/entity/XmProductState.java | 3 +- .../com/xm/core/entity/XmProductTemplate.java | 1 + .../java/com/xm/core/entity/XmProject.java | 3 +- .../com/xm/core/entity/XmProjectBaseline.java | 3 +- .../com/xm/core/entity/XmProjectEnvList.java | 1 + .../xm/core/entity/XmProjectGroupState.java | 3 +- .../xm/core/entity/XmProjectGroupUser.java | 1 + .../java/com/xm/core/entity/XmProjectKpi.java | 1 + .../com/xm/core/entity/XmProjectKpiHis.java | 1 + .../entity/XmProjectMBudgetCostNouser.java | 1 + .../core/entity/XmProjectMBudgetCostUser.java | 1 + .../xm/core/entity/XmProjectMCostNouser.java | 3 +- .../xm/core/entity/XmProjectMCostUser.java | 3 +- .../com/xm/core/entity/XmProjectPhase.java | 3 +- .../core/entity/XmProjectPhaseBaseline.java | 3 +- .../core/entity/XmProjectPhaseTemplate.java | 3 +- .../com/xm/core/entity/XmProjectState.java | 1 + .../com/xm/core/entity/XmProjectStateHis.java | 1 + .../core/entity/XmProjectTaskTypeState.java | 1 + .../com/xm/core/entity/XmProjectTemplate.java | 3 +- .../java/com/xm/core/entity/XmQuestion.java | 3 +- .../com/xm/core/entity/XmQuestionHandle.java | 3 +- .../com/xm/core/entity/XmQuestionTag.java | 1 + .../java/com/xm/core/entity/XmRecord.java | 1 + .../com/xm/core/entity/XmTaskExecuser.java | 3 +- .../com/xm/core/entity/XmTaskTemplate.java | 3 +- .../java/com/xm/core/entity/XmTestCase.java | 1 + .../com/xm/core/entity/XmTestCaseExec.java | 1 + .../xm/core/service/XmBranchStateService.java | 2 +- .../service/XmBranchTaskTypeStateService.java | 2 +- .../com/xm/core/service/XmEnvListService.java | 17 +- .../xm/core/service/XmExchangeService.java | 2 +- .../com/xm/core/service/XmFileService.java | 15 +- .../core/service/XmIterationMenuService.java | 2 +- .../xm/core/service/XmIterationService.java | 5 +- .../core/service/XmIterationStateService.java | 2 +- .../core/service/XmMenuExchangeService.java | 2 +- .../xm/core/service/XmMenuPlanService.java | 17 +- .../com/xm/core/service/XmMenuService.java | 10 +- .../xm/core/service/XmMenuStateService.java | 6 +- .../core/service/XmMenuTemplateService.java | 2 +- .../com/xm/core/service/XmMyFocusService.java | 11 +- .../com/xm/core/service/XmProductService.java | 10 +- .../core/service/XmProductStateService.java | 2 +- .../service/XmProductTemplateService.java | 2 +- .../service/XmProjectBaselineService.java | 11 +- .../service/XmProjectContractService.java | 11 +- .../core/service/XmProjectEnvListService.java | 20 +- .../XmProjectGroupFormworkService.java | 8 +- .../core/service/XmProjectGroupService.java | 23 +- .../service/XmProjectGroupStateService.java | 2 +- .../service/XmProjectGroupUserService.java | 8 +- .../core/service/XmProjectKpiHisService.java | 2 +- .../xm/core/service/XmProjectKpiService.java | 2 +- .../XmProjectMBudgetCostNouserService.java | 17 +- .../XmProjectMBudgetCostUserService.java | 17 +- .../service/XmProjectMCostNouserService.java | 17 +- .../service/XmProjectMCostUserService.java | 17 +- .../core/service/XmProjectOptionsService.java | 2 +- .../XmProjectPhaseBaselineService.java | 2 +- .../core/service/XmProjectPhaseService.java | 19 +- .../XmProjectPhaseTemplateService.java | 2 +- .../com/xm/core/service/XmProjectService.java | 29 +- .../service/XmProjectStateHisService.java | 2 +- .../core/service/XmProjectStateService.java | 2 +- .../XmProjectTaskTypeStateService.java | 2 +- .../service/XmProjectTemplateService.java | 2 +- .../core/service/XmQuestionHandleService.java | 2 +- .../xm/core/service/XmQuestionService.java | 20 +- .../xm/core/service/XmQuestionTagService.java | 2 +- .../com/xm/core/service/XmRecordService.java | 12 +- .../core/service/XmTaskExecuserService.java | 23 +- .../com/xm/core/service/XmTaskService.java | 27 +- .../xm/core/service/XmTaskSkillService.java | 12 +- .../core/service/XmTaskTemplateService.java | 2 +- .../core/service/XmTestCaseExecService.java | 7 +- .../xm/core/service/XmTestCaseService.java | 2 +- .../service/cache/XmProjectCacheService.java | 5 +- .../cache/XmProjectGroupCacheService.java | 7 +- .../service/push/XmMenuPushMsgService.java | 11 +- .../core/service/push/XmPushMsgService.java | 7 +- .../test/java/com/qqkj/WebSecurityConfig.java | 172 ----------- .../src/test/java/com/qqkj/XmApplication.java | 35 --- .../java/com/qqkj/mdp/ImgCompressTest.java | 149 ---------- .../java/com/qqkj/xm/MdpWebAppConfigurer.java | 29 -- .../test/java/com/xm/WebSecurityConfig.java | 42 +++ .../src/test/java/com/xm/XmApplication.java | 17 ++ .../com/xm/core/dao/TestXmExchangeDao.java | 22 +- .../java/com/xm/core/dao/TestXmFileDao.java | 22 +- .../java/com/xm/core/dao/TestXmMenuDao.java | 16 +- .../com/xm/core/dao/TestXmMenuPlanDao.java | 22 +- .../com/xm/core/dao/TestXmMyFocusDao.java | 22 +- .../com/xm/core/dao/TestXmProductDao.java | 17 +- .../com/xm/core/dao/TestXmProjectDao.java | 22 +- .../com/xm/core/dao/TestXmQuestionDao.java | 22 +- .../java/com/xm/core/dao/TestXmTaskDao.java | 22 +- .../xm/push/TestXmPushMsgService.java | 2 +- 364 files changed, 3957 insertions(+), 1034 deletions(-) create mode 100644 .idea/libraries/Maven__com_ecwid_consul_consul_api_1_4_5.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_3.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_3.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_3.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_11_3.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_3.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_3.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_11_3.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_3.xml create mode 100644 .idea/libraries/Maven__com_github_jknack_handlebars_4_2_0.xml create mode 100644 .idea/libraries/Maven__com_github_jsqlparser_jsqlparser_3_2.xml create mode 100644 .idea/libraries/Maven__com_github_pagehelper_pagehelper_5_2_0.xml create mode 100644 .idea/libraries/Maven__com_github_stephenc_jcip_jcip_annotations_1_0_1.xml create mode 100644 .idea/libraries/Maven__com_github_tomakehurst_wiremock_jre8_standalone_2_27_1.xml create mode 100644 .idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml create mode 100644 .idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_1_1_6.xml create mode 100644 .idea/libraries/Maven__com_ibm_icu_icu4j_4_6.xml create mode 100644 .idea/libraries/Maven__com_jcraft_jsch_0_1_54.xml create mode 100644 .idea/libraries/Maven__com_jcraft_jsch_agentproxy_core_0_0_9.xml create mode 100644 .idea/libraries/Maven__com_jcraft_jsch_agentproxy_jsch_0_0_9.xml create mode 100644 .idea/libraries/Maven__com_jcraft_jsch_agentproxy_sshagent_0_0_9.xml create mode 100644 .idea/libraries/Maven__com_jcraft_jsch_agentproxy_usocket_jna_0_0_9.xml create mode 100644 .idea/libraries/Maven__com_jcraft_jzlib_1_1_1.xml create mode 100644 .idea/libraries/Maven__com_mdp_mdp_audit_log_client_M_1_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__com_mdp_mdp_boot_starter_M_1_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__com_mdp_mdp_cloud_starter_M_1_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__com_mdp_mdp_core_api_M_1_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__com_mdp_mdp_dao_mybatis_M_1_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__com_mdp_mdp_ds_M_1_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__com_mdp_mdp_ext_utils_M_1_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__com_mdp_mdp_meta_client_M_1_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__com_mdp_mdp_micro_client_M_1_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__com_mdp_mdp_mq_M_1_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__com_mdp_mdp_msg_client_M_1_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__com_mdp_mdp_mybatis_enhance_M_1_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__com_mdp_mdp_oauth2_client_M_1_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__com_mdp_mdp_qx_api_M_1_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__com_mdp_mdp_safe_client_M_1_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__com_mdp_mdp_spring_enhance_M_1_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__com_mdp_mdp_tomcat_enhance_M_1_0_0_RELEASE.xml create mode 100644 .idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_18.xml create mode 100644 .idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_18.xml create mode 100644 .idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_18.xml create mode 100644 .idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_18.xml create mode 100644 .idea/libraries/Maven__com_nimbusds_content_type_2_1.xml create mode 100644 .idea/libraries/Maven__com_nimbusds_lang_tag_1_4_4.xml create mode 100644 .idea/libraries/Maven__com_nimbusds_nimbus_jose_jwt_9_1_3.xml create mode 100644 .idea/libraries/Maven__com_nimbusds_oauth2_oidc_sdk_8_23_1.xml create mode 100644 .idea/libraries/Maven__com_rackspace_eclipse_webtools_sourceediting_org_eclipse_wst_xml_xpath2_processor_2_1_100.xml create mode 100644 .idea/libraries/Maven__com_stoyanr_evictor_1_0_0.xml create mode 100644 .idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml create mode 100644 .idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_11.xml create mode 100644 .idea/libraries/Maven__com_sun_mail_jakarta_mail_1_6_5.xml create mode 100644 .idea/libraries/Maven__com_toomuchcoding_jsonassert_jsonassert_0_5_0.xml create mode 100644 .idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml create mode 100644 .idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml create mode 100644 .idea/libraries/Maven__commons_codec_commons_codec_1_15.xml create mode 100644 .idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml create mode 100644 .idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml create mode 100644 .idea/libraries/Maven__commons_lang_commons_lang_2_6.xml create mode 100644 .idea/libraries/Maven__commons_logging_commons_logging_1_2.xml create mode 100644 .idea/libraries/Maven__dk_brics_automaton_automaton_1_11_8.xml create mode 100644 .idea/libraries/Maven__edu_princeton_cup_java_cup_10k.xml create mode 100644 .idea/libraries/Maven__io_micrometer_micrometer_core_1_6_2.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_buffer_4_1_55_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_codec_4_1_55_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_codec_dns_4_1_55_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_codec_http2_4_1_55_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_codec_http_4_1_55_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_codec_socks_4_1_55_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_common_4_1_55_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_handler_4_1_55_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_handler_proxy_4_1_55_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_resolver_4_1_55_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_resolver_dns_4_1_55_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_transport_4_1_55_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_transport_native_epoll_linux_x86_64_4_1_55_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_55_Final.xml create mode 100644 .idea/libraries/Maven__io_projectreactor_addons_reactor_extra_3_4_1.xml create mode 100644 .idea/libraries/Maven__io_projectreactor_netty_reactor_netty_1_0_2.xml create mode 100644 .idea/libraries/Maven__io_projectreactor_netty_reactor_netty_core_1_0_2.xml create mode 100644 .idea/libraries/Maven__io_projectreactor_netty_reactor_netty_http_1_0_2.xml create mode 100644 .idea/libraries/Maven__io_projectreactor_netty_reactor_netty_http_brave_1_0_2.xml create mode 100644 .idea/libraries/Maven__io_projectreactor_reactor_core_3_4_1.xml create mode 100644 .idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml create mode 100644 .idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml create mode 100644 .idea/libraries/Maven__io_zipkin_brave_brave_5_13_2.xml create mode 100644 .idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_http_5_13_2.xml create mode 100644 .idea/libraries/Maven__io_zipkin_reporter2_zipkin_reporter_2_16_1.xml create mode 100644 .idea/libraries/Maven__io_zipkin_reporter2_zipkin_reporter_brave_2_16_1.xml create mode 100644 .idea/libraries/Maven__io_zipkin_zipkin2_zipkin_2_23_0.xml create mode 100644 .idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml create mode 100644 .idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml create mode 100644 .idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml create mode 100644 .idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml create mode 100644 .idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml create mode 100644 .idea/libraries/Maven__javax_inject_javax_inject_1.xml create mode 100644 .idea/libraries/Maven__junit_junit_4_13_1.xml create mode 100644 .idea/libraries/Maven__mysql_mysql_connector_java_8_0_22.xml create mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_18.xml create mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_18.xml create mode 100644 .idea/libraries/Maven__net_java_dev_jna_jna_4_1_0.xml create mode 100644 .idea/libraries/Maven__net_java_dev_jna_jna_platform_4_1_0.xml create mode 100644 .idea/libraries/Maven__net_javacrumbs_json_unit_json_unit_assertj_2_19_0.xml create mode 100644 .idea/libraries/Maven__net_javacrumbs_json_unit_json_unit_core_2_19_0.xml create mode 100644 .idea/libraries/Maven__net_javacrumbs_json_unit_json_unit_json_path_2_19_0.xml create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_lang3_3_11.xml create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_pool2_2_9_0.xml create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_text_1_9.xml create mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_13.xml create mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_14.xml create mode 100644 .idea/libraries/Maven__org_apache_maven_resolver_maven_resolver_api_1_4_1.xml create mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_41.xml create mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_41.xml create mode 100644 .idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_9_0_41.xml create mode 100644 .idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml create mode 100644 .idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_6.xml create mode 100644 .idea/libraries/Maven__org_assertj_assertj_core_3_18_1.xml create mode 100644 .idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_64.xml create mode 100644 .idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_64.xml create mode 100644 .idea/libraries/Maven__org_codehaus_groovy_groovy_2_5_14.xml create mode 100644 .idea/libraries/Maven__org_codehaus_groovy_groovy_json_2_5_14.xml create mode 100644 .idea/libraries/Maven__org_codehaus_groovy_groovy_nio_2_5_14.xml create mode 100644 .idea/libraries/Maven__org_codehaus_groovy_groovy_xml_2_5_14.xml create mode 100644 .idea/libraries/Maven__org_eclipse_jdt_core_compiler_ecj_4_4_2.xml create mode 100644 .idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_5_1_3_201810200350_r.xml create mode 100644 .idea/libraries/Maven__org_ehcache_ehcache_3_9_0.xml create mode 100644 .idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml create mode 100644 .idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_3.xml create mode 100644 .idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_3.xml create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml create mode 100644 .idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_12.xml create mode 100644 .idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_1_6_Final.xml create mode 100644 .idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_0.xml create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_0.xml create mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml create mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml create mode 100644 .idea/libraries/Maven__org_mockito_mockito_core_3_6_28.xml create mode 100644 .idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_6_28.xml create mode 100644 .idea/libraries/Maven__org_mybatis_mybatis_3_5_6.xml create mode 100644 .idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml create mode 100644 .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_4.xml create mode 100644 .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_4.xml create mode 100644 .idea/libraries/Maven__org_objenesis_objenesis_3_1.xml create mode 100644 .idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml create mode 100644 .idea/libraries/Maven__org_projectlombok_lombok_1_18_16.xml create mode 100644 .idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml create mode 100644 .idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml create mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_oauth2_client_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_3_0_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_consul_core_3_0_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_consul_discovery_3_0_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_3_0_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_converters_3_0_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_shade_3_0_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_spec_3_0_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_spec_groovy_3_0_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_spec_java_3_0_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_stub_runner_3_0_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_verifier_3_0_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_wiremock_3_0_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_function_compiler_3_0_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_loadbalancer_3_0_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_2_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_hystrix_2_2_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_2_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_3_0_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_consul_3_0_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_consul_discovery_3_0_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_contract_stub_runner_3_0_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_loadbalancer_3_0_0.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_2_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_2_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_commons_2_4_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_4_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_redis_2_4_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_config_5_4_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_core_5_4_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_4_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_oauth2_client_5_4_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_oauth2_core_5_4_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_oauth2_jose_5_4_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_oauth2_resource_server_5_4_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_9_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_web_5_4_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_session_spring_session_core_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_session_spring_session_data_redis_2_4_1.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_aop_5_3_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_aspects_5_3_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_beans_5_3_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_context_5_3_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_context_support_5_3_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_core_5_3_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_expression_5_3_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_jcl_5_3_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_jdbc_5_3_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_oxm_5_3_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_test_5_3_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_tx_5_3_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_web_5_3_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_webflux_5_3_2.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_webmvc_5_3_2.xml create mode 100644 .idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml create mode 100644 .idea/libraries/Maven__org_yaml_snakeyaml_1_27.xml create mode 100644 .idea/libraries/Maven__redis_clients_jedis_3_3_0.xml delete mode 100644 xm-bootstrap/src/main/java/com/qqkj/XmApplication.java delete mode 100644 xm-bootstrap/src/main/java/com/qqkj/mdp/MdpWebAppConfigurer.java delete mode 100644 xm-bootstrap/src/main/java/com/qqkj/mdp/WebSecurityConfig.java create mode 100644 xm-bootstrap/src/main/java/com/xm/WebSecurityConfig.java create mode 100644 xm-bootstrap/src/main/java/com/xm/XmApplication.java delete mode 100644 xm-core/src/test/java/com/qqkj/WebSecurityConfig.java delete mode 100644 xm-core/src/test/java/com/qqkj/XmApplication.java delete mode 100644 xm-core/src/test/java/com/qqkj/mdp/ImgCompressTest.java delete mode 100644 xm-core/src/test/java/com/qqkj/xm/MdpWebAppConfigurer.java create mode 100644 xm-core/src/test/java/com/xm/WebSecurityConfig.java create mode 100644 xm-core/src/test/java/com/xm/XmApplication.java rename xm-core/src/test/java/com/{qqkj => }/xm/push/TestXmPushMsgService.java (99%) diff --git a/.gitignore b/.gitignore index 26f26b6d..d7fe142a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /xm-starter/target/ /target/ /xm-core/target/ +/.idea/ +/xm-bootstrap/target/ diff --git a/.idea/libraries/Maven__com_ecwid_consul_consul_api_1_4_5.xml b/.idea/libraries/Maven__com_ecwid_consul_consul_api_1_4_5.xml new file mode 100644 index 00000000..296a9040 --- /dev/null +++ b/.idea/libraries/Maven__com_ecwid_consul_consul_api_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml new file mode 100644 index 00000000..bc7d7fd8 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_3.xml new file mode 100644 index 00000000..d6408240 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_3.xml new file mode 100644 index 00000000..572ed924 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_3.xml new file mode 100644 index 00000000..c9ac6cc0 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_11_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_11_3.xml new file mode 100644 index 00000000..fa9fcc12 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_11_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_3.xml new file mode 100644 index 00000000..76ed7ddf --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_3.xml new file mode 100644 index 00000000..1ed87530 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_11_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_11_3.xml new file mode 100644 index 00000000..29962517 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_11_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_3.xml new file mode 100644 index 00000000..2aad1f70 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_jknack_handlebars_4_2_0.xml b/.idea/libraries/Maven__com_github_jknack_handlebars_4_2_0.xml new file mode 100644 index 00000000..918b6741 --- /dev/null +++ b/.idea/libraries/Maven__com_github_jknack_handlebars_4_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_3_2.xml b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_3_2.xml new file mode 100644 index 00000000..7c0b8e6b --- /dev/null +++ b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_2_0.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_2_0.xml new file mode 100644 index 00000000..b877688d --- /dev/null +++ b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_stephenc_jcip_jcip_annotations_1_0_1.xml b/.idea/libraries/Maven__com_github_stephenc_jcip_jcip_annotations_1_0_1.xml new file mode 100644 index 00000000..6fe105af --- /dev/null +++ b/.idea/libraries/Maven__com_github_stephenc_jcip_jcip_annotations_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_tomakehurst_wiremock_jre8_standalone_2_27_1.xml b/.idea/libraries/Maven__com_github_tomakehurst_wiremock_jre8_standalone_2_27_1.xml new file mode 100644 index 00000000..153a0ea4 --- /dev/null +++ b/.idea/libraries/Maven__com_github_tomakehurst_wiremock_jre8_standalone_2_27_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml new file mode 100644 index 00000000..82a9f20a --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_1_1_6.xml b/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_1_1_6.xml new file mode 100644 index 00000000..9ee346c5 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_1_1_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_ibm_icu_icu4j_4_6.xml b/.idea/libraries/Maven__com_ibm_icu_icu4j_4_6.xml new file mode 100644 index 00000000..670405c2 --- /dev/null +++ b/.idea/libraries/Maven__com_ibm_icu_icu4j_4_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jcraft_jsch_0_1_54.xml b/.idea/libraries/Maven__com_jcraft_jsch_0_1_54.xml new file mode 100644 index 00000000..2a43ce75 --- /dev/null +++ b/.idea/libraries/Maven__com_jcraft_jsch_0_1_54.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_core_0_0_9.xml b/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_core_0_0_9.xml new file mode 100644 index 00000000..6e468946 --- /dev/null +++ b/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_core_0_0_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_jsch_0_0_9.xml b/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_jsch_0_0_9.xml new file mode 100644 index 00000000..59623180 --- /dev/null +++ b/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_jsch_0_0_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_sshagent_0_0_9.xml b/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_sshagent_0_0_9.xml new file mode 100644 index 00000000..9ca1e392 --- /dev/null +++ b/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_sshagent_0_0_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_usocket_jna_0_0_9.xml b/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_usocket_jna_0_0_9.xml new file mode 100644 index 00000000..ff3245b2 --- /dev/null +++ b/.idea/libraries/Maven__com_jcraft_jsch_agentproxy_usocket_jna_0_0_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jcraft_jzlib_1_1_1.xml b/.idea/libraries/Maven__com_jcraft_jzlib_1_1_1.xml new file mode 100644 index 00000000..3795be8a --- /dev/null +++ b/.idea/libraries/Maven__com_jcraft_jzlib_1_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mdp_mdp_audit_log_client_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_mdp_mdp_audit_log_client_M_1_0_0_RELEASE.xml new file mode 100644 index 00000000..cdce8a60 --- /dev/null +++ b/.idea/libraries/Maven__com_mdp_mdp_audit_log_client_M_1_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mdp_mdp_boot_starter_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_mdp_mdp_boot_starter_M_1_0_0_RELEASE.xml new file mode 100644 index 00000000..6b74e44d --- /dev/null +++ b/.idea/libraries/Maven__com_mdp_mdp_boot_starter_M_1_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mdp_mdp_cloud_starter_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_mdp_mdp_cloud_starter_M_1_0_0_RELEASE.xml new file mode 100644 index 00000000..f0a81c0f --- /dev/null +++ b/.idea/libraries/Maven__com_mdp_mdp_cloud_starter_M_1_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mdp_mdp_core_api_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_mdp_mdp_core_api_M_1_0_0_RELEASE.xml new file mode 100644 index 00000000..f80c56c2 --- /dev/null +++ b/.idea/libraries/Maven__com_mdp_mdp_core_api_M_1_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mdp_mdp_dao_mybatis_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_mdp_mdp_dao_mybatis_M_1_0_0_RELEASE.xml new file mode 100644 index 00000000..69170489 --- /dev/null +++ b/.idea/libraries/Maven__com_mdp_mdp_dao_mybatis_M_1_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mdp_mdp_ds_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_mdp_mdp_ds_M_1_0_0_RELEASE.xml new file mode 100644 index 00000000..c9fd8a0d --- /dev/null +++ b/.idea/libraries/Maven__com_mdp_mdp_ds_M_1_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mdp_mdp_ext_utils_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_mdp_mdp_ext_utils_M_1_0_0_RELEASE.xml new file mode 100644 index 00000000..26d727b9 --- /dev/null +++ b/.idea/libraries/Maven__com_mdp_mdp_ext_utils_M_1_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mdp_mdp_meta_client_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_mdp_mdp_meta_client_M_1_0_0_RELEASE.xml new file mode 100644 index 00000000..a8033899 --- /dev/null +++ b/.idea/libraries/Maven__com_mdp_mdp_meta_client_M_1_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mdp_mdp_micro_client_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_mdp_mdp_micro_client_M_1_0_0_RELEASE.xml new file mode 100644 index 00000000..bdc5005a --- /dev/null +++ b/.idea/libraries/Maven__com_mdp_mdp_micro_client_M_1_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mdp_mdp_mq_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_mdp_mdp_mq_M_1_0_0_RELEASE.xml new file mode 100644 index 00000000..0252c1fd --- /dev/null +++ b/.idea/libraries/Maven__com_mdp_mdp_mq_M_1_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mdp_mdp_msg_client_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_mdp_mdp_msg_client_M_1_0_0_RELEASE.xml new file mode 100644 index 00000000..fefdffb8 --- /dev/null +++ b/.idea/libraries/Maven__com_mdp_mdp_msg_client_M_1_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mdp_mdp_mybatis_enhance_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_mdp_mdp_mybatis_enhance_M_1_0_0_RELEASE.xml new file mode 100644 index 00000000..54fc824b --- /dev/null +++ b/.idea/libraries/Maven__com_mdp_mdp_mybatis_enhance_M_1_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mdp_mdp_oauth2_client_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_mdp_mdp_oauth2_client_M_1_0_0_RELEASE.xml new file mode 100644 index 00000000..dfad3c65 --- /dev/null +++ b/.idea/libraries/Maven__com_mdp_mdp_oauth2_client_M_1_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mdp_mdp_qx_api_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_mdp_mdp_qx_api_M_1_0_0_RELEASE.xml new file mode 100644 index 00000000..ea193816 --- /dev/null +++ b/.idea/libraries/Maven__com_mdp_mdp_qx_api_M_1_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mdp_mdp_safe_client_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_mdp_mdp_safe_client_M_1_0_0_RELEASE.xml new file mode 100644 index 00000000..4f06f35e --- /dev/null +++ b/.idea/libraries/Maven__com_mdp_mdp_safe_client_M_1_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mdp_mdp_spring_enhance_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_mdp_mdp_spring_enhance_M_1_0_0_RELEASE.xml new file mode 100644 index 00000000..ff94937e --- /dev/null +++ b/.idea/libraries/Maven__com_mdp_mdp_spring_enhance_M_1_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mdp_mdp_tomcat_enhance_M_1_0_0_RELEASE.xml b/.idea/libraries/Maven__com_mdp_mdp_tomcat_enhance_M_1_0_0_RELEASE.xml new file mode 100644 index 00000000..ce4cab74 --- /dev/null +++ b/.idea/libraries/Maven__com_mdp_mdp_tomcat_enhance_M_1_0_0_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_18.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_18.xml new file mode 100644 index 00000000..588dca0f --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_18.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_18.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_18.xml new file mode 100644 index 00000000..4abf5770 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_18.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_18.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_18.xml new file mode 100644 index 00000000..eb0c81dd --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_18.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_18.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_18.xml new file mode 100644 index 00000000..0c801493 --- /dev/null +++ b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_18.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_nimbusds_content_type_2_1.xml b/.idea/libraries/Maven__com_nimbusds_content_type_2_1.xml new file mode 100644 index 00000000..04318afd --- /dev/null +++ b/.idea/libraries/Maven__com_nimbusds_content_type_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_nimbusds_lang_tag_1_4_4.xml b/.idea/libraries/Maven__com_nimbusds_lang_tag_1_4_4.xml new file mode 100644 index 00000000..81aa85cf --- /dev/null +++ b/.idea/libraries/Maven__com_nimbusds_lang_tag_1_4_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_nimbusds_nimbus_jose_jwt_9_1_3.xml b/.idea/libraries/Maven__com_nimbusds_nimbus_jose_jwt_9_1_3.xml new file mode 100644 index 00000000..f1e40ebc --- /dev/null +++ b/.idea/libraries/Maven__com_nimbusds_nimbus_jose_jwt_9_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_nimbusds_oauth2_oidc_sdk_8_23_1.xml b/.idea/libraries/Maven__com_nimbusds_oauth2_oidc_sdk_8_23_1.xml new file mode 100644 index 00000000..48850a35 --- /dev/null +++ b/.idea/libraries/Maven__com_nimbusds_oauth2_oidc_sdk_8_23_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_rackspace_eclipse_webtools_sourceediting_org_eclipse_wst_xml_xpath2_processor_2_1_100.xml b/.idea/libraries/Maven__com_rackspace_eclipse_webtools_sourceediting_org_eclipse_wst_xml_xpath2_processor_2_1_100.xml new file mode 100644 index 00000000..5624ade4 --- /dev/null +++ b/.idea/libraries/Maven__com_rackspace_eclipse_webtools_sourceediting_org_eclipse_wst_xml_xpath2_processor_2_1_100.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_stoyanr_evictor_1_0_0.xml b/.idea/libraries/Maven__com_stoyanr_evictor_1_0_0.xml new file mode 100644 index 00000000..4f6676e4 --- /dev/null +++ b/.idea/libraries/Maven__com_stoyanr_evictor_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml b/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml new file mode 100644 index 00000000..fea99f02 --- /dev/null +++ b/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_11.xml b/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_11.xml new file mode 100644 index 00000000..c4e94e64 --- /dev/null +++ b/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_mail_jakarta_mail_1_6_5.xml b/.idea/libraries/Maven__com_sun_mail_jakarta_mail_1_6_5.xml new file mode 100644 index 00000000..a86e1762 --- /dev/null +++ b/.idea/libraries/Maven__com_sun_mail_jakarta_mail_1_6_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_toomuchcoding_jsonassert_jsonassert_0_5_0.xml b/.idea/libraries/Maven__com_toomuchcoding_jsonassert_jsonassert_0_5_0.xml new file mode 100644 index 00000000..38790370 --- /dev/null +++ b/.idea/libraries/Maven__com_toomuchcoding_jsonassert_jsonassert_0_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml new file mode 100644 index 00000000..97e22912 --- /dev/null +++ b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml new file mode 100644 index 00000000..84eb1158 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_15.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_15.xml new file mode 100644 index 00000000..c88c2b71 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_15.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml new file mode 100644 index 00000000..13afda29 --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml new file mode 100644 index 00000000..772d6fed --- /dev/null +++ b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml new file mode 100644 index 00000000..2ec83767 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml new file mode 100644 index 00000000..eab40b32 --- /dev/null +++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dk_brics_automaton_automaton_1_11_8.xml b/.idea/libraries/Maven__dk_brics_automaton_automaton_1_11_8.xml new file mode 100644 index 00000000..40327c1e --- /dev/null +++ b/.idea/libraries/Maven__dk_brics_automaton_automaton_1_11_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__edu_princeton_cup_java_cup_10k.xml b/.idea/libraries/Maven__edu_princeton_cup_java_cup_10k.xml new file mode 100644 index 00000000..12ad41db --- /dev/null +++ b/.idea/libraries/Maven__edu_princeton_cup_java_cup_10k.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_micrometer_micrometer_core_1_6_2.xml b/.idea/libraries/Maven__io_micrometer_micrometer_core_1_6_2.xml new file mode 100644 index 00000000..e03387be --- /dev/null +++ b/.idea/libraries/Maven__io_micrometer_micrometer_core_1_6_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_55_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_55_Final.xml new file mode 100644 index 00000000..84187d3e --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_55_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_4_1_55_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_1_55_Final.xml new file mode 100644 index 00000000..6afe6ef1 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_codec_4_1_55_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_dns_4_1_55_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_dns_4_1_55_Final.xml new file mode 100644 index 00000000..6244ee85 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_codec_dns_4_1_55_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_http2_4_1_55_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_http2_4_1_55_Final.xml new file mode 100644 index 00000000..2f7fa7f7 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_codec_http2_4_1_55_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_55_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_55_Final.xml new file mode 100644 index 00000000..65ea50d9 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_55_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_socks_4_1_55_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_socks_4_1_55_Final.xml new file mode 100644 index 00000000..255a3ea5 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_codec_socks_4_1_55_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_common_4_1_55_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_1_55_Final.xml new file mode 100644 index 00000000..7d93efc8 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_common_4_1_55_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_handler_4_1_55_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_4_1_55_Final.xml new file mode 100644 index 00000000..6253672e --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_handler_4_1_55_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_handler_proxy_4_1_55_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_proxy_4_1_55_Final.xml new file mode 100644 index 00000000..7c03f851 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_handler_proxy_4_1_55_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_55_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_55_Final.xml new file mode 100644 index 00000000..c1fdc863 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_55_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_dns_4_1_55_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_dns_4_1_55_Final.xml new file mode 100644 index 00000000..81212306 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_resolver_dns_4_1_55_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_4_1_55_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_1_55_Final.xml new file mode 100644 index 00000000..a7e89fe6 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_transport_4_1_55_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_linux_x86_64_4_1_55_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_linux_x86_64_4_1_55_Final.xml new file mode 100644 index 00000000..74b21549 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_linux_x86_64_4_1_55_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_55_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_55_Final.xml new file mode 100644 index 00000000..a6b983c5 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_55_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_projectreactor_addons_reactor_extra_3_4_1.xml b/.idea/libraries/Maven__io_projectreactor_addons_reactor_extra_3_4_1.xml new file mode 100644 index 00000000..3c56e35b --- /dev/null +++ b/.idea/libraries/Maven__io_projectreactor_addons_reactor_extra_3_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_1_0_2.xml b/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_1_0_2.xml new file mode 100644 index 00000000..f3f6bbeb --- /dev/null +++ b/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_core_1_0_2.xml b/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_core_1_0_2.xml new file mode 100644 index 00000000..18f3ddad --- /dev/null +++ b/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_core_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_http_1_0_2.xml b/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_http_1_0_2.xml new file mode 100644 index 00000000..68192980 --- /dev/null +++ b/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_http_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_http_brave_1_0_2.xml b/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_http_brave_1_0_2.xml new file mode 100644 index 00000000..9ed853ae --- /dev/null +++ b/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_http_brave_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_4_1.xml b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_4_1.xml new file mode 100644 index 00000000..7ff22e7f --- /dev/null +++ b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml b/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml new file mode 100644 index 00000000..cda742ba --- /dev/null +++ b/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml b/.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml new file mode 100644 index 00000000..c77c4af8 --- /dev/null +++ b/.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_5_13_2.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_5_13_2.xml new file mode 100644 index 00000000..572ad254 --- /dev/null +++ b/.idea/libraries/Maven__io_zipkin_brave_brave_5_13_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_http_5_13_2.xml b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_http_5_13_2.xml new file mode 100644 index 00000000..a552191f --- /dev/null +++ b/.idea/libraries/Maven__io_zipkin_brave_brave_instrumentation_http_5_13_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_reporter_2_16_1.xml b/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_reporter_2_16_1.xml new file mode 100644 index 00000000..725109f2 --- /dev/null +++ b/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_reporter_2_16_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_reporter_brave_2_16_1.xml b/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_reporter_brave_2_16_1.xml new file mode 100644 index 00000000..98365110 --- /dev/null +++ b/.idea/libraries/Maven__io_zipkin_reporter2_zipkin_reporter_brave_2_16_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_zipkin_zipkin2_zipkin_2_23_0.xml b/.idea/libraries/Maven__io_zipkin_zipkin2_zipkin_2_23_0.xml new file mode 100644 index 00000000..1fa08572 --- /dev/null +++ b/.idea/libraries/Maven__io_zipkin_zipkin2_zipkin_2_23_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml new file mode 100644 index 00000000..be90656e --- /dev/null +++ b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml new file mode 100644 index 00000000..cba9dd24 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml b/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml new file mode 100644 index 00000000..e66afb95 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml new file mode 100644 index 00000000..04213f73 --- /dev/null +++ b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml new file mode 100644 index 00000000..e74f3ab2 --- /dev/null +++ b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_inject_javax_inject_1.xml b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml new file mode 100644 index 00000000..93cf65ab --- /dev/null +++ b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_13_1.xml b/.idea/libraries/Maven__junit_junit_4_13_1.xml new file mode 100644 index 00000000..9fa24fcb --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_13_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_22.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_22.xml new file mode 100644 index 00000000..4de6b45f --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_22.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_18.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_18.xml new file mode 100644 index 00000000..532908c8 --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_18.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_18.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_18.xml new file mode 100644 index 00000000..a3dcc5b4 --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_18.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_java_dev_jna_jna_4_1_0.xml b/.idea/libraries/Maven__net_java_dev_jna_jna_4_1_0.xml new file mode 100644 index 00000000..7ee934a0 --- /dev/null +++ b/.idea/libraries/Maven__net_java_dev_jna_jna_4_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_java_dev_jna_jna_platform_4_1_0.xml b/.idea/libraries/Maven__net_java_dev_jna_jna_platform_4_1_0.xml new file mode 100644 index 00000000..148c52a2 --- /dev/null +++ b/.idea/libraries/Maven__net_java_dev_jna_jna_platform_4_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_javacrumbs_json_unit_json_unit_assertj_2_19_0.xml b/.idea/libraries/Maven__net_javacrumbs_json_unit_json_unit_assertj_2_19_0.xml new file mode 100644 index 00000000..ceb29e36 --- /dev/null +++ b/.idea/libraries/Maven__net_javacrumbs_json_unit_json_unit_assertj_2_19_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_javacrumbs_json_unit_json_unit_core_2_19_0.xml b/.idea/libraries/Maven__net_javacrumbs_json_unit_json_unit_core_2_19_0.xml new file mode 100644 index 00000000..223fb785 --- /dev/null +++ b/.idea/libraries/Maven__net_javacrumbs_json_unit_json_unit_core_2_19_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_javacrumbs_json_unit_json_unit_json_path_2_19_0.xml b/.idea/libraries/Maven__net_javacrumbs_json_unit_json_unit_json_path_2_19_0.xml new file mode 100644 index 00000000..050eba8c --- /dev/null +++ b/.idea/libraries/Maven__net_javacrumbs_json_unit_json_unit_json_path_2_19_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_11.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_11.xml new file mode 100644 index 00000000..7a30e6e3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_9_0.xml b/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_9_0.xml new file mode 100644 index 00000000..895f7550 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_9_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_text_1_9.xml b/.idea/libraries/Maven__org_apache_commons_commons_text_1_9.xml new file mode 100644 index 00000000..c23dddc2 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_text_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_13.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_13.xml new file mode 100644 index 00000000..63bee0e1 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_14.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_14.xml new file mode 100644 index 00000000..427f319c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_resolver_maven_resolver_api_1_4_1.xml b/.idea/libraries/Maven__org_apache_maven_resolver_maven_resolver_api_1_4_1.xml new file mode 100644 index 00000000..7182feb4 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_resolver_maven_resolver_api_1_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_41.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_41.xml new file mode 100644 index 00000000..7ea265d9 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_41.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_41.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_41.xml new file mode 100644 index 00000000..08509920 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_41.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_9_0_41.xml b/.idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_9_0_41.xml new file mode 100644 index 00000000..729a3ef1 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_9_0_41.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml new file mode 100644 index 00000000..f854ab00 --- /dev/null +++ b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_6.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_6.xml new file mode 100644 index 00000000..d0ca7052 --- /dev/null +++ b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_18_1.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_18_1.xml new file mode 100644 index 00000000..6a2f2054 --- /dev/null +++ b/.idea/libraries/Maven__org_assertj_assertj_core_3_18_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_64.xml b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_64.xml new file mode 100644 index 00000000..56cfc40f --- /dev/null +++ b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_64.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_64.xml b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_64.xml new file mode 100644 index 00000000..861cb282 --- /dev/null +++ b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_64.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_5_14.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_5_14.xml new file mode 100644 index 00000000..179c9746 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_5_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_json_2_5_14.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_json_2_5_14.xml new file mode 100644 index 00000000..695bb0f9 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_groovy_groovy_json_2_5_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_nio_2_5_14.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_nio_2_5_14.xml new file mode 100644 index 00000000..4d272ae6 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_groovy_groovy_nio_2_5_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_xml_2_5_14.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_xml_2_5_14.xml new file mode 100644 index 00000000..9e85ba33 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_groovy_groovy_xml_2_5_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jdt_core_compiler_ecj_4_4_2.xml b/.idea/libraries/Maven__org_eclipse_jdt_core_compiler_ecj_4_4_2.xml new file mode 100644 index 00000000..98a69166 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jdt_core_compiler_ecj_4_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_5_1_3_201810200350_r.xml b/.idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_5_1_3_201810200350_r.xml new file mode 100644 index 00000000..93b51034 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_5_1_3_201810200350_r.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ehcache_ehcache_3_9_0.xml b/.idea/libraries/Maven__org_ehcache_ehcache_3_9_0.xml new file mode 100644 index 00000000..973cbc73 --- /dev/null +++ b/.idea/libraries/Maven__org_ehcache_ehcache_3_9_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml b/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml new file mode 100644 index 00000000..ae5020d6 --- /dev/null +++ b/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_3.xml b/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_3.xml new file mode 100644 index 00000000..23fbd58d --- /dev/null +++ b/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_3.xml b/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_3.xml new file mode 100644 index 00000000..67d5d9ec --- /dev/null +++ b/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml new file mode 100644 index 00000000..6b5496ff --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml new file mode 100644 index 00000000..15f1e4c1 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_12.xml b/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_12.xml new file mode 100644 index 00000000..6908885f --- /dev/null +++ b/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_1_6_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_1_6_Final.xml new file mode 100644 index 00000000..5264723d --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_1_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml new file mode 100644 index 00000000..0b76247c --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_0.xml new file mode 100644 index 00000000..f7cf4fec --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml new file mode 100644 index 00000000..cc01e3f5 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml new file mode 100644 index 00000000..f198e4bb --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_0.xml new file mode 100644 index 00000000..a53686b2 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml new file mode 100644 index 00000000..cde8a482 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml new file mode 100644 index 00000000..3391deb2 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_3_6_28.xml b/.idea/libraries/Maven__org_mockito_mockito_core_3_6_28.xml new file mode 100644 index 00000000..62ca28e9 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_3_6_28.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_6_28.xml b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_6_28.xml new file mode 100644 index 00000000..79fde7d1 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_6_28.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_6.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_6.xml new file mode 100644 index 00000000..25ded40a --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml new file mode 100644 index 00000000..a3593055 --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_4.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_4.xml new file mode 100644 index 00000000..eea97670 --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_4.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_4.xml new file mode 100644 index 00000000..aca3b77a --- /dev/null +++ b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_3_1.xml b/.idea/libraries/Maven__org_objenesis_objenesis_3_1.xml new file mode 100644 index 00000000..ae733997 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml new file mode 100644 index 00000000..fbc1b163 --- /dev/null +++ b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_16.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_16.xml new file mode 100644 index 00000000..33d4265f --- /dev/null +++ b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_16.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml new file mode 100644 index 00000000..f17253bf --- /dev/null +++ b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml new file mode 100644 index 00000000..27229ce3 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml new file mode 100644 index 00000000..02b6812c --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_4_1.xml new file mode 100644 index 00000000..4197b089 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_4_1.xml new file mode 100644 index 00000000..cef03e6e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_4_1.xml new file mode 100644 index 00000000..c23dfe43 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_4_1.xml new file mode 100644 index 00000000..feda5579 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_4_1.xml new file mode 100644 index 00000000..60152913 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_4_1.xml new file mode 100644 index 00000000..45071a5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_4_1.xml new file mode 100644 index 00000000..7864cf27 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_4_1.xml new file mode 100644 index 00000000..62830d6b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_4_1.xml new file mode 100644 index 00000000..52b71cdb --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_4_1.xml new file mode 100644 index 00000000..d5d9720a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_4_1.xml new file mode 100644 index 00000000..4695cb06 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_oauth2_client_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_oauth2_client_2_4_1.xml new file mode 100644 index 00000000..078055bc --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_oauth2_client_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_4_1.xml new file mode 100644 index 00000000..f695444f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_4_1.xml new file mode 100644 index 00000000..4d5f9b1f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_4_1.xml new file mode 100644 index 00000000..d6612572 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_4_1.xml new file mode 100644 index 00000000..768a1f7e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_4_1.xml new file mode 100644 index 00000000..34d61f07 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_4_1.xml new file mode 100644 index 00000000..b2872ea3 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_4_1.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_4_1.xml new file mode 100644 index 00000000..67569acc --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_3_0_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_3_0_0.xml new file mode 100644 index 00000000..c0251f01 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_consul_core_3_0_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_consul_core_3_0_0.xml new file mode 100644 index 00000000..b714031f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_consul_core_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_consul_discovery_3_0_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_consul_discovery_3_0_0.xml new file mode 100644 index 00000000..dc190153 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_consul_discovery_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_3_0_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_3_0_0.xml new file mode 100644 index 00000000..ee6559de --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_converters_3_0_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_converters_3_0_0.xml new file mode 100644 index 00000000..9a52e8a8 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_converters_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_shade_3_0_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_shade_3_0_0.xml new file mode 100644 index 00000000..6275e1e2 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_shade_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_spec_3_0_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_spec_3_0_0.xml new file mode 100644 index 00000000..13cac91c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_spec_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_spec_groovy_3_0_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_spec_groovy_3_0_0.xml new file mode 100644 index 00000000..69ea6760 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_spec_groovy_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_spec_java_3_0_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_spec_java_3_0_0.xml new file mode 100644 index 00000000..b04b655e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_spec_java_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_stub_runner_3_0_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_stub_runner_3_0_0.xml new file mode 100644 index 00000000..3485d0f7 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_stub_runner_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_verifier_3_0_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_verifier_3_0_0.xml new file mode 100644 index 00000000..66423b45 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_verifier_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_wiremock_3_0_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_wiremock_3_0_0.xml new file mode 100644 index 00000000..36346c3a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_contract_wiremock_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_function_compiler_3_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_function_compiler_3_0_6_RELEASE.xml new file mode 100644 index 00000000..97c69019 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_function_compiler_3_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_loadbalancer_3_0_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_loadbalancer_3_0_0.xml new file mode 100644 index 00000000..f6f5fa3d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_loadbalancer_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_2_6_RELEASE.xml new file mode 100644 index 00000000..95251e52 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_hystrix_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_hystrix_2_2_6_RELEASE.xml new file mode 100644 index 00000000..54b67a63 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_hystrix_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_2_6_RELEASE.xml new file mode 100644 index 00000000..1e8f79d0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_3_0_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_3_0_0.xml new file mode 100644 index 00000000..2852748e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_consul_3_0_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_consul_3_0_0.xml new file mode 100644 index 00000000..a661dceb --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_consul_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_consul_discovery_3_0_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_consul_discovery_3_0_0.xml new file mode 100644 index 00000000..0dde8d9c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_consul_discovery_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_contract_stub_runner_3_0_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_contract_stub_runner_3_0_0.xml new file mode 100644 index 00000000..55cbf91f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_contract_stub_runner_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_loadbalancer_3_0_0.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_loadbalancer_3_0_0.xml new file mode 100644 index 00000000..5083a8b3 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_loadbalancer_3_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_2_6_RELEASE.xml new file mode 100644 index 00000000..a3340e4d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_2_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_2_6_RELEASE.xml new file mode 100644 index 00000000..c1f4ec0d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_2_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_4_2.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_4_2.xml new file mode 100644 index 00000000..006537c9 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_4_2.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_4_2.xml new file mode 100644 index 00000000..b8ef42cc --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_4_2.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_4_2.xml new file mode 100644 index 00000000..c1c6b4ce --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_4_2.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_4_2.xml new file mode 100644 index 00000000..31af903c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_4_2.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_4_2.xml new file mode 100644 index 00000000..be467e48 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_4_2.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_4_2.xml new file mode 100644 index 00000000..adfba900 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_oauth2_client_5_4_2.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_oauth2_client_5_4_2.xml new file mode 100644 index 00000000..ca82e2a3 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_oauth2_client_5_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_oauth2_core_5_4_2.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_oauth2_core_5_4_2.xml new file mode 100644 index 00000000..49f6695f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_oauth2_core_5_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_oauth2_jose_5_4_2.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_oauth2_jose_5_4_2.xml new file mode 100644 index 00000000..a9f5b7df --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_oauth2_jose_5_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_oauth2_resource_server_5_4_2.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_oauth2_resource_server_5_4_2.xml new file mode 100644 index 00000000..ce9b7b83 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_oauth2_resource_server_5_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_9_RELEASE.xml new file mode 100644 index 00000000..60972566 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_4_2.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_4_2.xml new file mode 100644 index 00000000..827baa4f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_session_spring_session_core_2_4_1.xml b/.idea/libraries/Maven__org_springframework_session_spring_session_core_2_4_1.xml new file mode 100644 index 00000000..742b6295 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_session_spring_session_core_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_session_spring_session_data_redis_2_4_1.xml b/.idea/libraries/Maven__org_springframework_session_spring_session_data_redis_2_4_1.xml new file mode 100644 index 00000000..7f9f8cf2 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_session_spring_session_data_redis_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_3_2.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_3_2.xml new file mode 100644 index 00000000..96144a80 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_5_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aspects_5_3_2.xml b/.idea/libraries/Maven__org_springframework_spring_aspects_5_3_2.xml new file mode 100644 index 00000000..03a77954 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aspects_5_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_3_2.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_3_2.xml new file mode 100644 index 00000000..8ff344e7 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_5_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_3_2.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_3_2.xml new file mode 100644 index 00000000..c9588212 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_5_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_2.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_2.xml new file mode 100644 index 00000000..f950f219 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_3_2.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_3_2.xml new file mode 100644 index 00000000..15b7a85b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_5_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_3_2.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_3_2.xml new file mode 100644 index 00000000..438fdd50 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_5_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_2.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_2.xml new file mode 100644 index 00000000..238d6516 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_2.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_2.xml new file mode 100644 index 00000000..a89d3add --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_oxm_5_3_2.xml b/.idea/libraries/Maven__org_springframework_spring_oxm_5_3_2.xml new file mode 100644 index 00000000..f31de141 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_oxm_5_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_3_2.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_3_2.xml new file mode 100644 index 00000000..c69b97c7 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_5_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_3_2.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_3_2.xml new file mode 100644 index 00000000..1ec62641 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_5_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_3_2.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_3_2.xml new file mode 100644 index 00000000..2cb7ff22 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_5_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webflux_5_3_2.xml b/.idea/libraries/Maven__org_springframework_spring_webflux_5_3_2.xml new file mode 100644 index 00000000..ba6ca8e4 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webflux_5_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_2.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_2.xml new file mode 100644 index 00000000..a296698a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml new file mode 100644 index 00000000..006a8d34 --- /dev/null +++ b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_27.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_27.xml new file mode 100644 index 00000000..5f4b15df --- /dev/null +++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_27.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__redis_clients_jedis_3_3_0.xml b/.idea/libraries/Maven__redis_clients_jedis_3_3_0.xml new file mode 100644 index 00000000..b3d42020 --- /dev/null +++ b/.idea/libraries/Maven__redis_clients_jedis_3_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/xm-backend.iml b/.idea/xm-backend.iml index f409c0ea..8f05b870 100644 --- a/.idea/xm-backend.iml +++ b/.idea/xm-backend.iml @@ -8,5 +8,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 46953257..1f8db79a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.xm xm-backend pom - 唛盟云-项目管理系统 + xm-backend 唛盟云-项目管理系统 唛盟云-项目管理系统 com.mdp diff --git a/xm-bootstrap/pom.xml b/xm-bootstrap/pom.xml index 608838e3..f5522db1 100644 --- a/xm-bootstrap/pom.xml +++ b/xm-bootstrap/pom.xml @@ -4,7 +4,7 @@ 4.0.0 xm-bootstrap jar - 唛盟云-项目管理系统服务端启动器 + xm-bootstrap 唛盟云-项目管理系统服务端启动器 com.xm xm-backend @@ -14,6 +14,7 @@ com.mdp mdp-cloud-starter + ${mdp.version} com.xm diff --git a/xm-bootstrap/src/main/java/com/qqkj/XmApplication.java b/xm-bootstrap/src/main/java/com/qqkj/XmApplication.java deleted file mode 100644 index d5a5d0a2..00000000 --- a/xm-bootstrap/src/main/java/com/qqkj/XmApplication.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.qqkj; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.SpringApplication; -//org.springframework.boot.web.support.SpringBootServletInitializer; -import org.springframework.cloud.client.SpringCloudApplication; -import org.springframework.cloud.client.loadbalancer.LoadBalanced; -import org.springframework.context.annotation.Bean; -import org.springframework.http.client.SimpleClientHttpRequestFactory; -import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession; -import org.springframework.web.client.RestTemplate; - -import com.mdp.core.entity.AppAuth; -import com.mdp.safe.common.rest.MdpRestTemplate; -//@SpringBootApplication -@SpringCloudApplication - -@EnableRedisHttpSession -public class XmApplication { - - - public static void main(String[] args) { - SpringApplication.run(XmApplication.class,args); - - } - @Bean - @LoadBalanced - public RestTemplate restTemplate () - { - SimpleClientHttpRequestFactory simpleClientHttpRequestFactory = new SimpleClientHttpRequestFactory (); - simpleClientHttpRequestFactory.setConnectTimeout(20000); - simpleClientHttpRequestFactory.setReadTimeout(20000); - return new RestTemplate(simpleClientHttpRequestFactory); - } - @Bean - @Autowired - public MdpRestTemplate mdpRestTemplate(RestTemplate restTemplate,AppAuth appAuth) { - return new MdpRestTemplate(restTemplate, appAuth); - - } -} diff --git a/xm-bootstrap/src/main/java/com/qqkj/mdp/MdpWebAppConfigurer.java b/xm-bootstrap/src/main/java/com/qqkj/mdp/MdpWebAppConfigurer.java deleted file mode 100644 index c255e481..00000000 --- a/xm-bootstrap/src/main/java/com/qqkj/mdp/MdpWebAppConfigurer.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mdp; - -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; - -@Configuration -public class MdpWebAppConfigurer - extends WebMvcConfigurerAdapter { - - @Override - public void addInterceptors(InterceptorRegistry registry) { - } - - @Override - public void addCorsMappings(CorsRegistry registry) { - - registry.addMapping("/**") - .allowCredentials(true) - .allowedHeaders("*") - .allowedOrigins("*") - .allowedMethods("*"); - - } - -} \ No newline at end of file diff --git a/xm-bootstrap/src/main/java/com/qqkj/mdp/WebSecurityConfig.java b/xm-bootstrap/src/main/java/com/qqkj/mdp/WebSecurityConfig.java deleted file mode 100644 index 1585810c..00000000 --- a/xm-bootstrap/src/main/java/com/qqkj/mdp/WebSecurityConfig.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.mdp; - -import java.util.ArrayList; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.access.AccessDecisionManager; -import org.springframework.security.access.AccessDecisionVoter; -import org.springframework.security.access.vote.AffirmativeBased; -import org.springframework.security.access.vote.AuthenticatedVoter; -import org.springframework.security.access.vote.RoleVoter; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.builders.WebSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.crypto.password.StandardPasswordEncoder; -import org.springframework.security.web.AuthenticationEntryPoint; -import org.springframework.security.web.access.AccessDeniedHandler; -import org.springframework.security.web.access.channel.ChannelProcessingFilter; -import org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler; -import org.springframework.security.web.access.expression.WebExpressionVoter; -import org.springframework.security.web.authentication.AuthenticationFailureHandler; -import org.springframework.security.web.authentication.AuthenticationSuccessHandler; -import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; -import org.springframework.security.web.authentication.logout.HttpStatusReturningLogoutSuccessHandler; -import org.springframework.web.cors.CorsUtils; - -import com.mdp.core.log.MdpLogFilter; -import com.mdp.safe.common.entrypoint.SafeAuthenticationEntryPoint; -import com.mdp.safe.common.expression.DbPermissionEvaluator; -import com.mdp.safe.common.filter.MdpApiAuthorizationFilter; -import com.mdp.safe.common.filter.MdpUserAuthenticationFilter; -import com.mdp.safe.common.filter.MdpUserAuthorizationFilter; -import com.mdp.safe.common.handle.SafeAccessDeniedHandler; -import com.mdp.safe.common.handle.SafeAuthenticationFailureHandler; -import com.mdp.safe.common.handle.SafeAuthenticationSuccessHandler; -import com.mdp.safe.common.pwd.SafePasswordEncoder; -import com.mdp.safe.common.service.SafeUserService; - -@Configuration -@EnableWebSecurity -public class WebSecurityConfig extends WebSecurityConfigurerAdapter { - - - - @Autowired - SafeUserService userService; - - - @Override - public void configure(WebSecurity web) throws Exception { - web.ignoring().antMatchers("/**/*.ttf","/**/*.woff","/**/*.woff2","/**/*.eot","/**/*.css","/**/*.js","/**/*.gif","/**/*.png","/**/*.jpg","/**/*.ico","/**/*.GIF","/**/*.PNG","/**/*.JPG","/**/*.ICO","/**/*.html","/**/*.HTML","/**/*.htm","/**/*.js.map","/**/*.jsp","/**/*.bmp"); - } - - @Override - protected void configure(HttpSecurity http) throws Exception { - - http.authorizeRequests().accessDecisionManager(accessDecisionManager()).expressionHandler(webSecurityExpressionHandler()) - .antMatchers("/actuator/**","/**/common/login","/**/common/user/reg/web","/","/index.html","/login","/error","/","/index","/**/safe/app/auth**","/**/arc/image/upload").permitAll() - - .requestMatchers(CorsUtils::isPreFlightRequest).permitAll() - .anyRequest().authenticated().and() - //.addFilterAfter(wxpubLoginFilter(), UsernamePasswordAuthenticationFilter.class).authorizeRequests().and() - //.antMatcher(wxaAuthorizePattern).addFilterAfter(wxaLoginFilter(), UsernamePasswordAuthenticationFilter.class).authorizeRequests().and() - .addFilterBefore(new MdpLogFilter(), ChannelProcessingFilter.class) - .addFilterBefore(userAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class) - .addFilterAt(userAuthorizationFilter(), UsernamePasswordAuthenticationFilter.class) - .addFilterAfter(apiAuthorizationFilter(), UsernamePasswordAuthenticationFilter.class) - .formLogin().disable() - .logout().logoutSuccessHandler(new HttpStatusReturningLogoutSuccessHandler()) - .and().csrf().disable().httpBasic().disable().exceptionHandling().and().exceptionHandling().accessDeniedHandler(accessDeniedHandler()).authenticationEntryPoint(safeAuthenticationEntryPoint()) - ; - } - @Bean - public AuthenticationEntryPoint safeAuthenticationEntryPoint() { - // TODO Auto-generated method stub - return new SafeAuthenticationEntryPoint(); - } - - @Bean - public AccessDeniedHandler accessDeniedHandler() { - // TODO Auto-generated method stub - return new SafeAccessDeniedHandler(); - } - - @Bean - public AuthenticationFailureHandler authenticationFailureHandler() { - // TODO Auto-generated method stub - return new SafeAuthenticationFailureHandler(); - } - @Bean - public AuthenticationSuccessHandler successHandler() { - // TODO Auto-generated method stub - return new SafeAuthenticationSuccessHandler(); - } - @Bean - @Override - public AuthenticationManager authenticationManagerBean() throws Exception { - return super.authenticationManagerBean(); - } - @Bean - public MdpUserAuthenticationFilter userAuthenticationFilter() throws Exception{ - MdpUserAuthenticationFilter f=new MdpUserAuthenticationFilter(); - - f.setAuthenticationManager(authenticationManagerBean()); - f.setFilterProcessesUrl("/**/common/login"); - f.setAuthenticationSuccessHandler(successHandler()); - f.setUsernameParameter("displayUserid"); - f.setAuthenticationFailureHandler(authenticationFailureHandler()); - - return f; - - } - @Bean - public MdpUserAuthorizationFilter userAuthorizationFilter() throws Exception{ - MdpUserAuthorizationFilter f=new MdpUserAuthorizationFilter(authenticationManagerBean()); - return f; - - } - @Bean - public MdpApiAuthorizationFilter apiAuthorizationFilter() throws Exception{ - MdpApiAuthorizationFilter f=new MdpApiAuthorizationFilter(authenticationManagerBean()); - return f; - - } - @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { - auth.userDetailsService(userService).passwordEncoder(new SafePasswordEncoder()); - } - /* - * - * 这里可以增加自定义的投票器 - */ - @SuppressWarnings("rawtypes") - @Bean(name = "accessDecisionManager") - public AccessDecisionManager accessDecisionManager() { - List> decisionVoters = new ArrayList<>(); - decisionVoters.add(new RoleVoter()); - decisionVoters.add(new AuthenticatedVoter()); - decisionVoters.add(webExpressionVoter());// 启用表达式投票器 - - AffirmativeBased accessDecisionManager = new AffirmativeBased(decisionVoters); - - return accessDecisionManager; - } - - /* - * 表达式控制器 - */ - @Bean(name = "expressionHandler") - public DefaultWebSecurityExpressionHandler webSecurityExpressionHandler() { - DefaultWebSecurityExpressionHandler webSecurityExpressionHandler = new DefaultWebSecurityExpressionHandler(); - webSecurityExpressionHandler.setPermissionEvaluator(new DbPermissionEvaluator()); - return webSecurityExpressionHandler; - } - - /* - * 表达式投票器 - */ - @Bean(name = "expressionVoter") - public WebExpressionVoter webExpressionVoter() { - WebExpressionVoter webExpressionVoter = new WebExpressionVoter(); - webExpressionVoter.setExpressionHandler(webSecurityExpressionHandler()); - return webExpressionVoter; - } - -} \ No newline at end of file diff --git a/xm-bootstrap/src/main/java/com/xm/WebSecurityConfig.java b/xm-bootstrap/src/main/java/com/xm/WebSecurityConfig.java new file mode 100644 index 00000000..7b3e06b9 --- /dev/null +++ b/xm-bootstrap/src/main/java/com/xm/WebSecurityConfig.java @@ -0,0 +1,42 @@ +package com.xm; + +import com.mdp.oauth2.client.resource.MdpJwtAuthenticationConverter; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.builders.WebSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; + +/** + * com.qqkj.WebSecurityConfig + * + * @author chenyc + * @date 2019/10/10 + */ +@EnableWebSecurity +public class WebSecurityConfig extends WebSecurityConfigurerAdapter { + + @Autowired + MdpJwtAuthenticationConverter jwtConverter; + + + @Override + public void configure(WebSecurity web) throws Exception { + web.ignoring().antMatchers("/webjars/**"); + } + + /** + * 允许匿名访问所有接口 主要是 oauth 接口 + * @param http + * @throws Exception + */ + @Override + protected void configure(HttpSecurity http) throws Exception { + http.authorizeRequests().mvcMatchers("/authorize","/authorized","/","/index","/oauth2/login/token","/oauth2/login/token/web").permitAll().and().oauth2Client().and().logout().disable(); + http.formLogin().usernameParameter("userloginid"); + http.oauth2Login(); + http.oauth2ResourceServer().jwt().jwtAuthenticationConverter(jwtConverter); + http.csrf().disable(); + } + +} diff --git a/xm-bootstrap/src/main/java/com/xm/XmApplication.java b/xm-bootstrap/src/main/java/com/xm/XmApplication.java new file mode 100644 index 00000000..052e327a --- /dev/null +++ b/xm-bootstrap/src/main/java/com/xm/XmApplication.java @@ -0,0 +1,17 @@ +package com.xm; + +import org.springframework.boot.SpringApplication; +import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession; + +@SpringCloudApplication +@EnableRedisHttpSession +public class XmApplication { + + + public static void main(String[] args) { + SpringApplication.run(XmApplication.class,args); + + } + +} diff --git a/xm-bootstrap/xm-bootstrap.iml b/xm-bootstrap/xm-bootstrap.iml index cb6ef783..5ddb71f4 100644 --- a/xm-bootstrap/xm-bootstrap.iml +++ b/xm-bootstrap/xm-bootstrap.iml @@ -10,5 +10,275 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xm-core/pom.xml b/xm-core/pom.xml index 73a39ae5..fef4ccd7 100644 --- a/xm-core/pom.xml +++ b/xm-core/pom.xml @@ -4,7 +4,7 @@ 4.0.0 xm-core jar - 唛盟云-项目管理系统服务端核心 + xm-core 唛盟云-项目管理系统服务端核心 唛盟云-项目管理系统服务端核心 com.xm diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmEnvListController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmEnvListController.java index 252a542b..a4ac9d7a 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmEnvListController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmEnvListController.java @@ -5,8 +5,8 @@ import com.mdp.core.err.BizException; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; import com.mdp.qx.HasQx; -import com.qqkj.audit.log.client.annotation.AuditLog; -import com.qqkj.audit.log.client.annotation.OperType; +import com.mdp.audit.log.client.annotation.AuditLog; +import com.mdp.audit.log.client.annotation.OperType; import com.xm.core.entity.XmEnvList; import com.xm.core.service.XmEnvListService; import io.swagger.annotations.*; diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmFileController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmFileController.java index f229ed19..d1378d2c 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmFileController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmFileController.java @@ -5,8 +5,8 @@ import com.mdp.core.err.BizException; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; import com.mdp.qx.HasQx; -import com.qqkj.audit.log.client.annotation.AuditLog; -import com.qqkj.audit.log.client.annotation.OperType; +import com.mdp.audit.log.client.annotation.AuditLog; +import com.mdp.audit.log.client.annotation.OperType; import com.xm.core.entity.XmFile; import com.xm.core.service.XmFileService; import com.xm.core.vo.XmFileVo; diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java index 17240fd9..76507627 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java @@ -4,8 +4,8 @@ import com.mdp.core.entity.Tips; import com.mdp.core.err.BizException; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; -import com.mdp.safe.common.entity.User; -import com.mdp.safe.common.utils.LoginUtils; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmIterationMenu; import com.xm.core.service.XmIterationMenuService; import com.xm.core.service.push.XmMenuPushMsgService; diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java index 23571a33..f350aaa6 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java @@ -5,8 +5,8 @@ import com.mdp.core.err.BizException; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; import com.mdp.qx.HasQx; -import com.mdp.safe.common.entity.User; -import com.mdp.safe.common.utils.LoginUtils; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmMenu; import com.xm.core.entity.XmTask; import com.xm.core.service.XmMenuService; @@ -128,7 +128,7 @@ public class XmMenuController { return m; } } - User user=LoginUtils.getCurrentUserInfo(); + User user= LoginUtils.getCurrentUserInfo(); if(StringUtils.isEmpty(xmMenu.getMmUserid())) { xmMenu.setMmUserid(user.getUserid()); xmMenu.setMmUsername(user.getUsername()); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java index 0ac9449b..a5320fc7 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java @@ -5,8 +5,8 @@ import com.mdp.core.err.BizException; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; import com.mdp.qx.HasQx; -import com.mdp.safe.common.entity.User; -import com.mdp.safe.common.utils.LoginUtils; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmMenuPlan; import com.xm.core.service.XmMenuPlanService; import com.xm.core.service.push.XmMenuPushMsgService; diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java index 926bdb70..b1d59e92 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java @@ -5,8 +5,8 @@ import com.mdp.core.err.BizException; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; import com.mdp.qx.HasQx; -import com.mdp.safe.common.entity.User; -import com.mdp.safe.common.utils.LoginUtils; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmProduct; import com.xm.core.service.XmProductService; import io.swagger.annotations.*; diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java index ba2a4d1f..2debaf59 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java @@ -5,8 +5,8 @@ import com.mdp.core.err.BizException; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; import com.mdp.qx.HasQx; -import com.qqkj.audit.log.client.annotation.AuditLog; -import com.qqkj.audit.log.client.annotation.OperType; +import com.mdp.audit.log.client.annotation.AuditLog; +import com.mdp.audit.log.client.annotation.OperType; import com.xm.core.entity.XmProject; import com.xm.core.service.XmProjectService; import com.xm.core.vo.XmProjectVo; diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectEnvListController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectEnvListController.java index 4045b7d4..69bf4ab6 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectEnvListController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectEnvListController.java @@ -4,8 +4,8 @@ import com.mdp.core.entity.Tips; import com.mdp.core.err.BizException; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; -import com.qqkj.audit.log.client.annotation.AuditLog; -import com.qqkj.audit.log.client.annotation.OperType; +import com.mdp.audit.log.client.annotation.AuditLog; +import com.mdp.audit.log.client.annotation.OperType; import com.xm.core.entity.XmProjectEnvList; import com.xm.core.service.XmProjectEnvListService; import io.swagger.annotations.*; diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java index 8ebc7209..8bcc7c6e 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java @@ -6,8 +6,8 @@ import com.mdp.core.err.BizException; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; import com.mdp.qx.HasQx; -import com.mdp.safe.common.entity.User; -import com.mdp.safe.common.utils.LoginUtils; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmProject; import com.xm.core.entity.XmProjectGroup; import com.xm.core.service.XmProjectGroupService; diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostNouserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostNouserController.java index da701211..444a1311 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostNouserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostNouserController.java @@ -6,8 +6,8 @@ import com.mdp.core.err.BizException; import com.mdp.core.utils.NumberUtil; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; -import com.qqkj.audit.log.client.annotation.AuditLog; -import com.qqkj.audit.log.client.annotation.OperType; +import com.mdp.audit.log.client.annotation.AuditLog; +import com.mdp.audit.log.client.annotation.OperType; import com.xm.core.entity.XmProjectMBudgetCostNouser; import com.xm.core.service.XmProjectMBudgetCostNouserService; import com.xm.core.service.XmRecordService; diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostUserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostUserController.java index 09f88111..4cec4c32 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostUserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMBudgetCostUserController.java @@ -6,8 +6,8 @@ import com.mdp.core.err.BizException; import com.mdp.core.utils.NumberUtil; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; -import com.qqkj.audit.log.client.annotation.AuditLog; -import com.qqkj.audit.log.client.annotation.OperType; +import com.mdp.audit.log.client.annotation.AuditLog; +import com.mdp.audit.log.client.annotation.OperType; import com.xm.core.entity.XmProjectMBudgetCostUser; import com.xm.core.service.XmProjectMBudgetCostUserService; import com.xm.core.service.XmRecordService; diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostNouserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostNouserController.java index 4658d201..95507607 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostNouserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostNouserController.java @@ -6,8 +6,8 @@ import com.mdp.core.err.BizException; import com.mdp.core.utils.NumberUtil; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; -import com.qqkj.audit.log.client.annotation.AuditLog; -import com.qqkj.audit.log.client.annotation.OperType; +import com.mdp.audit.log.client.annotation.AuditLog; +import com.mdp.audit.log.client.annotation.OperType; import com.xm.core.entity.XmProjectMCostNouser; import com.xm.core.service.XmProjectMCostNouserService; import com.xm.core.service.XmRecordService; diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostUserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostUserController.java index 41b86c41..ca44e871 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostUserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectMCostUserController.java @@ -6,8 +6,8 @@ import com.mdp.core.err.BizException; import com.mdp.core.utils.NumberUtil; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; -import com.qqkj.audit.log.client.annotation.AuditLog; -import com.qqkj.audit.log.client.annotation.OperType; +import com.mdp.audit.log.client.annotation.AuditLog; +import com.mdp.audit.log.client.annotation.OperType; import com.xm.core.entity.XmProjectMBudgetCostNouser; import com.xm.core.entity.XmProjectMCostUser; import com.xm.core.service.XmProjectMCostUserService; diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java index b493502e..4966e65b 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java @@ -5,10 +5,10 @@ import com.mdp.core.err.BizException; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; import com.mdp.qx.HasQx; -import com.mdp.safe.common.entity.User; -import com.mdp.safe.common.utils.LoginUtils; -import com.qqkj.audit.log.client.annotation.AuditLog; -import com.qqkj.audit.log.client.annotation.OperType; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; +import com.mdp.audit.log.client.annotation.AuditLog; +import com.mdp.audit.log.client.annotation.OperType; import com.xm.core.entity.XmQuestion; import com.xm.core.service.XmQuestionService; import com.xm.core.service.push.XmPushMsgService; diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index a7793ef5..15b8b8be 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -7,10 +7,10 @@ import com.mdp.core.utils.NumberUtil; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; import com.mdp.qx.HasQx; -import com.mdp.safe.common.entity.User; -import com.mdp.safe.common.utils.LoginUtils; -import com.qqkj.audit.log.client.annotation.AuditLog; -import com.qqkj.audit.log.client.annotation.OperType; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; +import com.mdp.audit.log.client.annotation.AuditLog; +import com.mdp.audit.log.client.annotation.OperType; import com.xm.core.entity.XmTask; import com.xm.core.service.XmProjectGroupService; import com.xm.core.service.XmRecordService; diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java index 863b5be8..7f5294a3 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java @@ -5,10 +5,10 @@ import com.mdp.core.err.BizException; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; import com.mdp.qx.HasQx; -import com.mdp.safe.common.entity.User; -import com.mdp.safe.common.utils.LoginUtils; -import com.qqkj.audit.log.client.annotation.AuditLog; -import com.qqkj.audit.log.client.annotation.OperType; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; +import com.mdp.audit.log.client.annotation.AuditLog; +import com.mdp.audit.log.client.annotation.OperType; import com.xm.core.entity.XmTaskExecuser; import com.xm.core.service.XmProjectGroupService; import com.xm.core.service.XmProjectGroupUserService; diff --git a/xm-core/src/main/java/com/xm/core/entity/XmBranchState.java b/xm-core/src/main/java/com/xm/core/entity/XmBranchState.java index 1cfd253d..bcb41036 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmBranchState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmBranchState.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.math.BigDecimal; import java.util.Date; diff --git a/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java b/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java index 77df8b14..57655da5 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmBranchTaskTypeState.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.math.BigDecimal; import java.util.Date; diff --git a/xm-core/src/main/java/com/xm/core/entity/XmEnvList.java b/xm-core/src/main/java/com/xm/core/entity/XmEnvList.java index f1ec8b87..fccd2e01 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmEnvList.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmEnvList.java @@ -2,8 +2,9 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; + import java.math.BigDecimal; +import java.util.Date; /** * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmExchange.java b/xm-core/src/main/java/com/xm/core/entity/XmExchange.java index 7e154a64..5dffd733 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmExchange.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmExchange.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.util.Date; /** diff --git a/xm-core/src/main/java/com/xm/core/entity/XmIteration.java b/xm-core/src/main/java/com/xm/core/entity/XmIteration.java index e445cdc0..dd9cf5ac 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmIteration.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmIteration.java @@ -2,8 +2,9 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; + import java.math.BigDecimal; +import java.util.Date; /** * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmIterationMenu.java b/xm-core/src/main/java/com/xm/core/entity/XmIterationMenu.java index 7f91b164..3d670e15 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmIterationMenu.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmIterationMenu.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.util.Date; /** diff --git a/xm-core/src/main/java/com/xm/core/entity/XmIterationState.java b/xm-core/src/main/java/com/xm/core/entity/XmIterationState.java index 5f5dba56..956af380 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmIterationState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmIterationState.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.math.BigDecimal; import java.util.Date; diff --git a/xm-core/src/main/java/com/xm/core/entity/XmMenuExchange.java b/xm-core/src/main/java/com/xm/core/entity/XmMenuExchange.java index d86c57de..3a084a4d 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmMenuExchange.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmMenuExchange.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.util.Date; /** diff --git a/xm-core/src/main/java/com/xm/core/entity/XmMenuPlan.java b/xm-core/src/main/java/com/xm/core/entity/XmMenuPlan.java index 7f903a2d..5e7a8f7a 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmMenuPlan.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmMenuPlan.java @@ -2,8 +2,9 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; + import java.math.BigDecimal; +import java.util.Date; /** * 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmMenuState.java b/xm-core/src/main/java/com/xm/core/entity/XmMenuState.java index 1d37e88c..56dbc401 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmMenuState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmMenuState.java @@ -2,8 +2,9 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; + import java.math.BigDecimal; +import java.util.Date; /** * 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProduct.java b/xm-core/src/main/java/com/xm/core/entity/XmProduct.java index 4b6d65fb..24a72684 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProduct.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProduct.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.util.Date; /** diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProductState.java b/xm-core/src/main/java/com/xm/core/entity/XmProductState.java index c40004e0..f6b46500 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProductState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProductState.java @@ -2,8 +2,9 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; + import java.math.BigDecimal; +import java.util.Date; /** * 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProductTemplate.java b/xm-core/src/main/java/com/xm/core/entity/XmProductTemplate.java index 28380b4d..84c8d535 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProductTemplate.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProductTemplate.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.util.Date; /** diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProject.java b/xm-core/src/main/java/com/xm/core/entity/XmProject.java index b0911ffc..ff8e145c 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProject.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProject.java @@ -2,8 +2,9 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; + import java.math.BigDecimal; +import java.util.Date; /** * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectBaseline.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectBaseline.java index 7032bbab..109b8ec8 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectBaseline.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectBaseline.java @@ -2,8 +2,9 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; + import java.math.BigDecimal; +import java.util.Date; /** * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectEnvList.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectEnvList.java index 13168ee3..e4ead974 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectEnvList.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectEnvList.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.util.Date; /** diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupState.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupState.java index 10a75b59..9f6714b8 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupState.java @@ -2,8 +2,9 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; + import java.math.BigDecimal; +import java.util.Date; /** * 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupUser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupUser.java index 9641e65d..90838e14 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupUser.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectGroupUser.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.util.Date; /** diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectKpi.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectKpi.java index beb8e28e..732dc831 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectKpi.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectKpi.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.util.Date; /** diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectKpiHis.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectKpiHis.java index 4e14ea39..207a1662 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectKpiHis.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectKpiHis.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.util.Date; /** diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostNouser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostNouser.java index 7ec7a7f8..7cddc2eb 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostNouser.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostNouser.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.math.BigDecimal; import java.util.Date; diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostUser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostUser.java index 7336d3b1..43d55386 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostUser.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectMBudgetCostUser.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.math.BigDecimal; import java.util.Date; diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostNouser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostNouser.java index c6607e64..05f319d1 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostNouser.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostNouser.java @@ -2,8 +2,9 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; + import java.math.BigDecimal; +import java.util.Date; /** * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostUser.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostUser.java index 46273093..4ba3b85e 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostUser.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectMCostUser.java @@ -2,8 +2,9 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; + import java.math.BigDecimal; +import java.util.Date; /** * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectPhase.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectPhase.java index 6e3593ad..ed5f8fed 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectPhase.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectPhase.java @@ -2,8 +2,9 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; + import java.math.BigDecimal; +import java.util.Date; /** * 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseBaseline.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseBaseline.java index 99a69e90..4e756ab2 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseBaseline.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseBaseline.java @@ -2,8 +2,9 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; + import java.math.BigDecimal; +import java.util.Date; /** * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseTemplate.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseTemplate.java index 868efd18..07bba2f7 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseTemplate.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectPhaseTemplate.java @@ -2,8 +2,9 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; + import java.math.BigDecimal; +import java.util.Date; /** * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectState.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectState.java index cceaf2a1..8879313d 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectState.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.math.BigDecimal; import java.util.Date; diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectStateHis.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectStateHis.java index 488f821d..99de44b4 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectStateHis.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectStateHis.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.math.BigDecimal; import java.util.Date; diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectTaskTypeState.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectTaskTypeState.java index b60842bd..facb8c36 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectTaskTypeState.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectTaskTypeState.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.math.BigDecimal; import java.util.Date; diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProjectTemplate.java b/xm-core/src/main/java/com/xm/core/entity/XmProjectTemplate.java index 3f362572..587e42c6 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmProjectTemplate.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmProjectTemplate.java @@ -2,8 +2,9 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; + import java.math.BigDecimal; +import java.util.Date; /** * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java b/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java index 969d1d30..d79bb976 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java @@ -2,8 +2,9 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; + import java.math.BigDecimal; +import java.util.Date; /** * 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmQuestionHandle.java b/xm-core/src/main/java/com/xm/core/entity/XmQuestionHandle.java index 4af31110..49ccd719 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmQuestionHandle.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmQuestionHandle.java @@ -2,8 +2,9 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; + import java.math.BigDecimal; +import java.util.Date; /** * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmQuestionTag.java b/xm-core/src/main/java/com/xm/core/entity/XmQuestionTag.java index 586860de..26811e38 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmQuestionTag.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmQuestionTag.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.util.Date; /** diff --git a/xm-core/src/main/java/com/xm/core/entity/XmRecord.java b/xm-core/src/main/java/com/xm/core/entity/XmRecord.java index d6237b4d..1756a801 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmRecord.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmRecord.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.util.Date; /** diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java index 82a387fc..2b14d02a 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java @@ -2,8 +2,9 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; + import java.math.BigDecimal; +import java.util.Date; /** * 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskTemplate.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskTemplate.java index dc669e93..8f1f79ae 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmTaskTemplate.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskTemplate.java @@ -2,8 +2,9 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; + import java.math.BigDecimal; +import java.util.Date; /** * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTestCase.java b/xm-core/src/main/java/com/xm/core/entity/XmTestCase.java index ca1d1e23..956ced5b 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmTestCase.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmTestCase.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.util.Date; /** diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTestCaseExec.java b/xm-core/src/main/java/com/xm/core/entity/XmTestCaseExec.java index c7be653c..4043d93c 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmTestCaseExec.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmTestCaseExec.java @@ -2,6 +2,7 @@ package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.util.Date; /** diff --git a/xm-core/src/main/java/com/xm/core/service/XmBranchStateService.java b/xm-core/src/main/java/com/xm/core/service/XmBranchStateService.java index cded597c..abbb381b 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmBranchStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmBranchStateService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmBranchTaskTypeStateService.java b/xm-core/src/main/java/com/xm/core/service/XmBranchTaskTypeStateService.java index d9db7074..943645a9 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmBranchTaskTypeStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmBranchTaskTypeStateService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmEnvListService.java b/xm-core/src/main/java/com/xm/core/service/XmEnvListService.java index c45b5d0f..5aab39c2 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmEnvListService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmEnvListService.java @@ -1,19 +1,18 @@ package com.xm.core.service; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.mdp.safe.common.entity.User; -import com.mdp.safe.common.utils.LoginUtils; -import org.springframework.stereotype.Service; - import com.mdp.core.err.BizException; import com.mdp.core.service.BaseService; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmEnvList; +import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/service/XmExchangeService.java b/xm-core/src/main/java/com/xm/core/service/XmExchangeService.java index 78707cf8..d9610493 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmExchangeService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmExchangeService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmFileService.java b/xm-core/src/main/java/com/xm/core/service/XmFileService.java index f9177d2e..93574b0e 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmFileService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmFileService.java @@ -1,20 +1,23 @@ package com.xm.core.service; -import java.util.*; - import com.mdp.core.entity.Tips; import com.mdp.core.err.BizException; -import com.mdp.safe.common.entity.User; -import com.mdp.safe.common.utils.LoginUtils; -import com.qqkj.xm.core.entity.*; +import com.mdp.core.service.BaseService; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; +import com.xm.core.entity.*; import com.xm.core.entity.XmFile; import com.xm.core.vo.XmFileVo; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.mdp.core.service.BaseService; import org.springframework.util.StringUtils; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/service/XmIterationMenuService.java b/xm-core/src/main/java/com/xm/core/service/XmIterationMenuService.java index db50eca4..0491bb64 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmIterationMenuService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmIterationMenuService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmIterationService.java b/xm-core/src/main/java/com/xm/core/service/XmIterationService.java index c16f3ede..2e4f0d6b 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmIterationService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmIterationService.java @@ -1,9 +1,10 @@ package com.xm.core.service; +import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; + import java.util.List; import java.util.Map; -import org.springframework.stereotype.Service; -import com.mdp.core.service.BaseService; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java b/xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java index c8020777..01b04865 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuExchangeService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuExchangeService.java index 68941c06..bcf8cb3b 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuExchangeService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuExchangeService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java index f93433d9..7094113c 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java @@ -1,20 +1,15 @@ package com.xm.core.service; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.util.StringUtils; -import org.springframework.stereotype.Service; - import com.mdp.core.entity.Tips; import com.mdp.core.service.BaseService; -import com.mdp.safe.common.entity.User; -import com.mdp.safe.common.utils.LoginUtils; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmMenu; import com.xm.core.entity.XmMenuPlan; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import java.util.*; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuService.java index afd29046..fac316b9 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuService.java @@ -1,13 +1,13 @@ package com.xm.core.service; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import com.mdp.core.service.BaseService; +import com.xm.core.vo.XmMenuVo; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.mdp.core.service.BaseService; -import com.xm.core.vo.XmMenuVo; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java index cf9cbe15..6c3abc9a 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java @@ -2,12 +2,12 @@ package com.xm.core.service; import com.mdp.core.entity.Tips; import com.mdp.core.service.BaseService; -import com.mdp.safe.common.entity.User; -import com.mdp.safe.common.utils.LoginUtils; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmMenu; import com.xm.core.entity.XmMenuState; -import org.springframework.util.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import java.util.*; diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuTemplateService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuTemplateService.java index 15fb2731..806891ab 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuTemplateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuTemplateService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmMyFocusService.java b/xm-core/src/main/java/com/xm/core/service/XmMyFocusService.java index 752782c1..6e265552 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMyFocusService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMyFocusService.java @@ -1,14 +1,13 @@ package com.xm.core.service; -import java.util.List; - -import org.springframework.util.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.mdp.core.err.BizException; import com.mdp.core.service.BaseService; import com.xm.core.entity.XmMyFocus; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import java.util.List; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProductService.java b/xm-core/src/main/java/com/xm/core/service/XmProductService.java index a451a099..4c9a8518 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProductService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProductService.java @@ -1,12 +1,12 @@ package com.xm.core.service; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; import com.xm.core.entity.XmMenu; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProductStateService.java b/xm-core/src/main/java/com/xm/core/service/XmProductStateService.java index a63cec7c..31ffbd55 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProductStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProductStateService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProductTemplateService.java b/xm-core/src/main/java/com/xm/core/service/XmProductTemplateService.java index b4853986..c0a5d7d1 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProductTemplateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProductTemplateService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectBaselineService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectBaselineService.java index 99566687..4b53e880 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectBaselineService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectBaselineService.java @@ -1,15 +1,14 @@ package com.xm.core.service; -import java.util.Date; - -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.mdp.core.service.BaseService; import com.mdp.core.service.SequenceService; import com.xm.core.entity.XmProject; import com.xm.core.entity.XmProjectBaseline; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java index da39cc8c..12394cfa 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java @@ -1,14 +1,13 @@ package com.xm.core.service; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.mdp.core.err.BizException; +import com.mdp.core.service.BaseService; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import com.mdp.core.err.BizException; -import com.mdp.core.service.BaseService; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectEnvListService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectEnvListService.java index bf51e07c..ccec015c 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectEnvListService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectEnvListService.java @@ -1,20 +1,18 @@ package com.xm.core.service; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.mdp.safe.common.entity.User; -import com.mdp.safe.common.utils.LoginUtils; - +import com.mdp.core.err.BizException; +import com.mdp.core.service.BaseService; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; +import com.xm.core.entity.XmProjectEnvList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import com.mdp.core.err.BizException; -import com.mdp.core.service.BaseService; -import com.xm.core.entity.XmProjectEnvList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectGroupFormworkService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectGroupFormworkService.java index 48d2fada..de44ed0f 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectGroupFormworkService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectGroupFormworkService.java @@ -1,11 +1,11 @@ package com.xm.core.service; -import java.util.List; -import java.util.Map; - +import com.mdp.core.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.mdp.core.service.BaseService; + +import java.util.List; +import java.util.Map; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectGroupService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectGroupService.java index e8560341..06e59d8b 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectGroupService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectGroupService.java @@ -1,17 +1,12 @@ package com.xm.core.service; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Predicate; - import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.google.common.util.concurrent.Monitor.Guard; -import com.mdp.core.entity.Tips; import com.mdp.core.err.BizException; +import com.mdp.core.service.BaseService; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; +import com.xm.core.entity.XmProject; +import com.xm.core.entity.XmProjectGroup; import com.xm.core.entity.XmProjectGroupUser; import com.xm.core.service.cache.XmProjectGroupCacheService; import com.xm.core.service.push.XmPushMsgService; @@ -19,13 +14,11 @@ import com.xm.core.vo.XmProjectGroupVo; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.mdp.core.service.BaseService; -import com.mdp.safe.common.entity.User; -import com.mdp.safe.common.utils.LoginUtils; -import com.xm.core.entity.XmProject; -import com.xm.core.entity.XmProjectGroup; import org.springframework.util.StringUtils; +import java.util.*; +import java.util.function.Predicate; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectGroupStateService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectGroupStateService.java index 9a18c984..7493a6d5 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectGroupStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectGroupStateService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectGroupUserService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectGroupUserService.java index 2299e84f..592646cc 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectGroupUserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectGroupUserService.java @@ -1,11 +1,11 @@ package com.xm.core.service; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; import com.xm.core.entity.XmProjectGroupUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectKpiHisService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectKpiHisService.java index 713ee01c..3d7ab781 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectKpiHisService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectKpiHisService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectKpiService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectKpiService.java index efba02f9..4fc21126 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectKpiService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectKpiService.java @@ -1,8 +1,8 @@ package com.xm.core.service; +import com.mdp.core.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.mdp.core.service.BaseService; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectMBudgetCostNouserService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectMBudgetCostNouserService.java index 158a6af7..909c6f63 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectMBudgetCostNouserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectMBudgetCostNouserService.java @@ -1,18 +1,17 @@ package com.xm.core.service; -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - import com.mdp.core.entity.Tips; import com.mdp.core.err.BizException; import com.mdp.core.service.BaseService; import com.mdp.core.utils.NumberUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectMBudgetCostUserService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectMBudgetCostUserService.java index 3154cb42..6ce0cd90 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectMBudgetCostUserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectMBudgetCostUserService.java @@ -1,18 +1,17 @@ package com.xm.core.service; -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - import com.mdp.core.entity.Tips; import com.mdp.core.err.BizException; import com.mdp.core.service.BaseService; import com.mdp.core.utils.NumberUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectMCostNouserService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectMCostNouserService.java index 4316d3a2..553d9d23 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectMCostNouserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectMCostNouserService.java @@ -1,18 +1,17 @@ package com.xm.core.service; -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - import com.mdp.core.entity.Tips; import com.mdp.core.err.BizException; import com.mdp.core.service.BaseService; import com.mdp.core.utils.NumberUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectMCostUserService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectMCostUserService.java index a744bfd7..b6751a74 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectMCostUserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectMCostUserService.java @@ -1,18 +1,17 @@ package com.xm.core.service; -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - import com.mdp.core.entity.Tips; import com.mdp.core.err.BizException; import com.mdp.core.service.BaseService; import com.mdp.core.utils.NumberUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectOptionsService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectOptionsService.java index 7f9596c2..7ad1a225 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectOptionsService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectOptionsService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseBaselineService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseBaselineService.java index e2d7d829..76bd61da 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseBaselineService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseBaselineService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java index 75668796..486980e6 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java @@ -1,20 +1,19 @@ package com.xm.core.service; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.mdp.core.entity.Tips; import com.mdp.core.service.BaseService; import com.mdp.core.utils.NumberUtil; import com.xm.core.entity.XmProjectPhase; import com.xm.core.vo.XmProjectPhaseVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseTemplateService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseTemplateService.java index f9309223..ea7460aa 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseTemplateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectPhaseTemplateService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java index 1be0e60b..8e012bbc 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java @@ -1,17 +1,5 @@ package com.xm.core.service; -import java.math.BigDecimal; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; - import com.alibaba.fastjson.JSONObject; import com.mdp.core.entity.Tips; import com.mdp.core.err.BizException; @@ -19,11 +7,22 @@ import com.mdp.core.service.BaseService; import com.mdp.core.service.SequenceService; import com.mdp.core.utils.BaseUtils; import com.mdp.core.utils.DateUtils; -import com.mdp.safe.common.entity.User; -import com.mdp.safe.common.utils.LoginUtils; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmProject; import com.xm.core.service.cache.XmProjectCacheService; import com.xm.core.vo.XmProjectVo; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
@@ -82,7 +81,7 @@ public class XmProjectService extends BaseService { public List> getProject(Map params) { List> xmProjectList = null; if(params.containsKey("compete")){ - params.put("userid",LoginUtils.getCurrentUserInfo().getUserid()); + params.put("userid", LoginUtils.getCurrentUserInfo().getUserid()); xmProjectList = this.selectListMapByWhere(params); }else{ xmProjectList = this.selectListMapByWhere(params); //列出XmProject列表 diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectStateHisService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectStateHisService.java index 85e5c860..bff428d0 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectStateHisService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectStateHisService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectStateService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectStateService.java index 0fa098d7..aeebc88e 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectStateService.java @@ -1,8 +1,8 @@ package com.xm.core.service; +import com.mdp.core.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.mdp.core.service.BaseService; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java index 946dc6d7..e425bc0a 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectTemplateService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectTemplateService.java index 539e35cc..5c34b1a4 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectTemplateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectTemplateService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmQuestionHandleService.java b/xm-core/src/main/java/com/xm/core/service/XmQuestionHandleService.java index 941079a1..c97ea134 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmQuestionHandleService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmQuestionHandleService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java b/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java index 36a4a5cd..00abd418 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java @@ -1,22 +1,24 @@ package com.xm.core.service; -import java.util.*; - import com.mdp.core.entity.Tips; import com.mdp.core.err.BizException; -import com.xm.core.vo.XmQuestionVo; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; import com.mdp.core.utils.BaseUtils; -import com.mdp.safe.common.entity.User; -import com.mdp.safe.common.utils.LoginUtils; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmQuestion; import com.xm.core.entity.XmQuestionHandle; - +import com.xm.core.vo.XmQuestionVo; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/service/XmQuestionTagService.java b/xm-core/src/main/java/com/xm/core/service/XmQuestionTagService.java index caaf1225..6685fe24 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmQuestionTagService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmQuestionTagService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmRecordService.java b/xm-core/src/main/java/com/xm/core/service/XmRecordService.java index 7b8cb12b..0e84a443 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmRecordService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmRecordService.java @@ -1,14 +1,14 @@ package com.xm.core.service; -import java.util.Date; - +import com.mdp.core.service.BaseService; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; +import com.xm.core.entity.XmRecord; import org.slf4j.MDC; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import com.mdp.core.service.BaseService; -import com.mdp.safe.common.entity.User; -import com.mdp.safe.common.utils.LoginUtils; -import com.xm.core.entity.XmRecord; + +import java.util.Date; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java index 5a54fd29..f0ad3bd2 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java @@ -1,29 +1,24 @@ package com.xm.core.service; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.xm.core.service.push.XmPushMsgService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - import com.alibaba.fastjson.JSONObject; import com.mdp.core.err.BizException; import com.mdp.core.service.BaseService; import com.mdp.core.utils.BaseUtils; import com.mdp.core.utils.DateUtils; import com.mdp.core.utils.NumberUtil; -import com.mdp.safe.common.entity.User; -import com.mdp.safe.common.utils.LoginUtils; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmProjectMCostUser; import com.xm.core.entity.XmTask; import com.xm.core.entity.XmTaskExecuser; +import com.xm.core.service.push.XmPushMsgService; import com.xm.core.vo.XmProjectGroupVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import java.math.BigDecimal; +import java.util.*; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java index 85a2f38c..55c1c097 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java @@ -1,30 +1,25 @@ package com.xm.core.service; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Consumer; - -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; - import com.alibaba.fastjson.JSONObject; import com.mdp.core.entity.Tips; import com.mdp.core.err.BizException; import com.mdp.core.service.BaseService; import com.mdp.core.utils.BaseUtils; import com.mdp.core.utils.NumberUtil; -import com.mdp.safe.common.entity.User; -import com.mdp.safe.common.utils.LoginUtils; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmTask; import com.xm.core.entity.XmTaskSkill; import com.xm.core.vo.XmTaskVo; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; + +import java.math.BigDecimal; +import java.util.*; +import java.util.function.Consumer; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java index 6569efb6..72c610e6 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java @@ -1,16 +1,14 @@ package com.xm.core.service; +import com.mdp.core.service.BaseService; +import com.xm.core.entity.XmTaskSkill; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import com.mdp.core.service.BaseService; -import com.xm.core.entity.XmTaskSkill; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskTemplateService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskTemplateService.java index fce44233..4dca2c93 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskTemplateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskTemplateService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTestCaseExecService.java b/xm-core/src/main/java/com/xm/core/service/XmTestCaseExecService.java index dc1bfc3e..704a372a 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTestCaseExecService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTestCaseExecService.java @@ -1,11 +1,12 @@ package com.xm.core.service; +import com.mdp.core.service.BaseService; +import com.xm.core.entity.XmTestCaseExec; +import org.springframework.stereotype.Service; + import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.stereotype.Service; -import com.mdp.core.service.BaseService; -import com.xm.core.entity.XmTestCaseExec; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java b/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java index c77b2e0f..8427e279 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java @@ -1,7 +1,7 @@ package com.xm.core.service; -import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; +import org.springframework.stereotype.Service; /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
diff --git a/xm-core/src/main/java/com/xm/core/service/cache/XmProjectCacheService.java b/xm-core/src/main/java/com/xm/core/service/cache/XmProjectCacheService.java index 667ee02c..7995fcde 100644 --- a/xm-core/src/main/java/com/xm/core/service/cache/XmProjectCacheService.java +++ b/xm-core/src/main/java/com/xm/core/service/cache/XmProjectCacheService.java @@ -1,12 +1,11 @@ package com.xm.core.service.cache; -import java.util.concurrent.TimeUnit; - +import com.xm.core.entity.XmProject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; -import com.xm.core.entity.XmProject; +import java.util.concurrent.TimeUnit; @Service public class XmProjectCacheService { diff --git a/xm-core/src/main/java/com/xm/core/service/cache/XmProjectGroupCacheService.java b/xm-core/src/main/java/com/xm/core/service/cache/XmProjectGroupCacheService.java index 591ee041..eefe7073 100644 --- a/xm-core/src/main/java/com/xm/core/service/cache/XmProjectGroupCacheService.java +++ b/xm-core/src/main/java/com/xm/core/service/cache/XmProjectGroupCacheService.java @@ -1,13 +1,12 @@ package com.xm.core.service.cache; -import java.util.List; -import java.util.concurrent.TimeUnit; - +import com.xm.core.vo.XmProjectGroupVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; -import com.xm.core.vo.XmProjectGroupVo; +import java.util.List; +import java.util.concurrent.TimeUnit; @Service public class XmProjectGroupCacheService { diff --git a/xm-core/src/main/java/com/xm/core/service/push/XmMenuPushMsgService.java b/xm-core/src/main/java/com/xm/core/service/push/XmMenuPushMsgService.java index 6e4fd3d8..992f8a3b 100644 --- a/xm-core/src/main/java/com/xm/core/service/push/XmMenuPushMsgService.java +++ b/xm-core/src/main/java/com/xm/core/service/push/XmMenuPushMsgService.java @@ -1,16 +1,15 @@ package com.xm.core.service.push; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.mdp.msg.client.PushMsgService; -import org.springframework.util.StringUtils; +import com.xm.core.service.XmMenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; -import com.xm.core.service.XmMenuService; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class XmMenuPushMsgService extends PushMsgService { diff --git a/xm-core/src/main/java/com/xm/core/service/push/XmPushMsgService.java b/xm-core/src/main/java/com/xm/core/service/push/XmPushMsgService.java index 21d8e455..fefdfbb6 100644 --- a/xm-core/src/main/java/com/xm/core/service/push/XmPushMsgService.java +++ b/xm-core/src/main/java/com/xm/core/service/push/XmPushMsgService.java @@ -1,14 +1,13 @@ package com.xm.core.service.push; +import com.mdp.msg.client.PushMsgService; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.mdp.msg.client.PushMsgService; -import org.springframework.util.StringUtils; -import org.springframework.stereotype.Service; - @Service public class XmPushMsgService extends PushMsgService { diff --git a/xm-core/src/test/java/com/qqkj/WebSecurityConfig.java b/xm-core/src/test/java/com/qqkj/WebSecurityConfig.java deleted file mode 100644 index dd511860..00000000 --- a/xm-core/src/test/java/com/qqkj/WebSecurityConfig.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.qqkj; - -import java.util.ArrayList; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.access.AccessDecisionManager; -import org.springframework.security.access.AccessDecisionVoter; -import org.springframework.security.access.vote.AffirmativeBased; -import org.springframework.security.access.vote.AuthenticatedVoter; -import org.springframework.security.access.vote.RoleVoter; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.builders.WebSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.crypto.password.StandardPasswordEncoder; -import org.springframework.security.web.AuthenticationEntryPoint; -import org.springframework.security.web.access.AccessDeniedHandler; -import org.springframework.security.web.access.channel.ChannelProcessingFilter; -import org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler; -import org.springframework.security.web.access.expression.WebExpressionVoter; -import org.springframework.security.web.authentication.AuthenticationFailureHandler; -import org.springframework.security.web.authentication.AuthenticationSuccessHandler; -import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; -import org.springframework.security.web.authentication.logout.HttpStatusReturningLogoutSuccessHandler; -import org.springframework.web.cors.CorsUtils; - -import com.mdp.core.log.MdpLogFilter; -import com.mdp.safe.common.entrypoint.SafeAuthenticationEntryPoint; -import com.mdp.safe.common.expression.DbPermissionEvaluator; -import com.mdp.safe.common.filter.MdpApiAuthorizationFilter; -import com.mdp.safe.common.filter.MdpUserAuthenticationFilter; -import com.mdp.safe.common.filter.MdpUserAuthorizationFilter; -import com.mdp.safe.common.handle.SafeAccessDeniedHandler; -import com.mdp.safe.common.handle.SafeAuthenticationFailureHandler; -import com.mdp.safe.common.handle.SafeAuthenticationSuccessHandler; -import com.mdp.safe.common.pwd.SafePasswordEncoder; -import com.mdp.safe.common.service.SafeUserService; - -@Configuration -@EnableWebSecurity -public class WebSecurityConfig extends WebSecurityConfigurerAdapter { - - - - @Autowired - SafeUserService userService; - - - @Override - public void configure(WebSecurity web) throws Exception { - web.ignoring().antMatchers("/**/*.ttf","/**/*.woff","/**/*.woff2","/**/*.eot","/**/*.css","/**/*.js","/**/*.gif","/**/*.png","/**/*.jpg","/**/*.ico","/**/*.html","/**/*.HTML","/**/*.htm","/**/*.js.map","/**/*.jsp","/**/*.bmp"); - } - - @Override - protected void configure(HttpSecurity http) throws Exception { - - http.authorizeRequests().accessDecisionManager(accessDecisionManager()).expressionHandler(webSecurityExpressionHandler()) - .antMatchers("/actuator/**","/**/common/login","/**/common/user/reg/web","/","/index.html","/login","/error","/","/index","/**/safe/app/auth**","/**/arc/image/upload").permitAll() - - .requestMatchers(CorsUtils::isPreFlightRequest).permitAll() - .anyRequest().authenticated().and() - //.addFilterAfter(wxpubLoginFilter(), UsernamePasswordAuthenticationFilter.class).authorizeRequests().and() - //.antMatcher(wxaAuthorizePattern).addFilterAfter(wxaLoginFilter(), UsernamePasswordAuthenticationFilter.class).authorizeRequests().and() - .addFilterBefore(new MdpLogFilter(), ChannelProcessingFilter.class) - .addFilterBefore(userAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class) - .addFilterAt(userAuthorizationFilter(), UsernamePasswordAuthenticationFilter.class) - .addFilterAfter(apiAuthorizationFilter(), UsernamePasswordAuthenticationFilter.class) - .formLogin().disable() - .logout().logoutSuccessHandler(new HttpStatusReturningLogoutSuccessHandler()) - .and().csrf().disable().httpBasic().disable().exceptionHandling().and().exceptionHandling().accessDeniedHandler(accessDeniedHandler()).authenticationEntryPoint(safeAuthenticationEntryPoint()) - ; - } - @Bean - public AuthenticationEntryPoint safeAuthenticationEntryPoint() { - // TODO Auto-generated method stub - return new SafeAuthenticationEntryPoint(); - } - - @Bean - public AccessDeniedHandler accessDeniedHandler() { - // TODO Auto-generated method stub - return new SafeAccessDeniedHandler(); - } - - @Bean - public AuthenticationFailureHandler authenticationFailureHandler() { - // TODO Auto-generated method stub - return new SafeAuthenticationFailureHandler(); - } - @Bean - public AuthenticationSuccessHandler successHandler() { - // TODO Auto-generated method stub - return new SafeAuthenticationSuccessHandler(); - } - @Bean - @Override - public AuthenticationManager authenticationManagerBean() throws Exception { - return super.authenticationManagerBean(); - } - @Bean - public MdpUserAuthenticationFilter userAuthenticationFilter() throws Exception{ - MdpUserAuthenticationFilter f=new MdpUserAuthenticationFilter(); - - f.setAuthenticationManager(authenticationManagerBean()); - f.setFilterProcessesUrl("/**/common/login"); - f.setAuthenticationSuccessHandler(successHandler()); - f.setUsernameParameter("displayUserid"); - f.setAuthenticationFailureHandler(authenticationFailureHandler()); - - return f; - - } - @Bean - public MdpUserAuthorizationFilter userAuthorizationFilter() throws Exception{ - MdpUserAuthorizationFilter f=new MdpUserAuthorizationFilter(authenticationManagerBean()); - return f; - - } - @Bean - public MdpApiAuthorizationFilter apiAuthorizationFilter() throws Exception{ - MdpApiAuthorizationFilter f=new MdpApiAuthorizationFilter(authenticationManagerBean()); - return f; - - } - @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { - auth.userDetailsService(userService).passwordEncoder(new SafePasswordEncoder()); - } - /* - * - * 这里可以增加自定义的投票器 - */ - @SuppressWarnings("rawtypes") - @Bean(name = "accessDecisionManager") - public AccessDecisionManager accessDecisionManager() { - List> decisionVoters = new ArrayList<>(); - decisionVoters.add(new RoleVoter()); - decisionVoters.add(new AuthenticatedVoter()); - decisionVoters.add(webExpressionVoter());// 启用表达式投票器 - - AffirmativeBased accessDecisionManager = new AffirmativeBased(decisionVoters); - - return accessDecisionManager; - } - - /* - * 表达式控制器 - */ - @Bean(name = "expressionHandler") - public DefaultWebSecurityExpressionHandler webSecurityExpressionHandler() { - DefaultWebSecurityExpressionHandler webSecurityExpressionHandler = new DefaultWebSecurityExpressionHandler(); - webSecurityExpressionHandler.setPermissionEvaluator(new DbPermissionEvaluator()); - return webSecurityExpressionHandler; - } - - /* - * 表达式投票器 - */ - @Bean(name = "expressionVoter") - public WebExpressionVoter webExpressionVoter() { - WebExpressionVoter webExpressionVoter = new WebExpressionVoter(); - webExpressionVoter.setExpressionHandler(webSecurityExpressionHandler()); - return webExpressionVoter; - } - -} \ No newline at end of file diff --git a/xm-core/src/test/java/com/qqkj/XmApplication.java b/xm-core/src/test/java/com/qqkj/XmApplication.java deleted file mode 100644 index cef39b42..00000000 --- a/xm-core/src/test/java/com/qqkj/XmApplication.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.qqkj; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.http.client.SimpleClientHttpRequestFactory; -import org.springframework.web.client.RestTemplate; - -import com.mdp.core.entity.AppAuth; -import com.mdp.safe.common.rest.MdpRestTemplate; -@SpringBootApplication -//@SpringCloudApplication -public class XmApplication { - - - public static void main(String[] args) { - SpringApplication.run(XmApplication.class,args); - - } - @Bean - public RestTemplate restTemplate () - { - SimpleClientHttpRequestFactory simpleClientHttpRequestFactory = new SimpleClientHttpRequestFactory (); - simpleClientHttpRequestFactory.setConnectTimeout(20000); - simpleClientHttpRequestFactory.setReadTimeout(20000); - return new RestTemplate(simpleClientHttpRequestFactory); - } - @Bean - @Autowired - public MdpRestTemplate mdpRestTemplate(RestTemplate restTemplate,AppAuth appAuth) { - return new MdpRestTemplate(restTemplate, appAuth); - - } -} diff --git a/xm-core/src/test/java/com/qqkj/mdp/ImgCompressTest.java b/xm-core/src/test/java/com/qqkj/mdp/ImgCompressTest.java deleted file mode 100644 index 01c2e650..00000000 --- a/xm-core/src/test/java/com/qqkj/mdp/ImgCompressTest.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.mdp; - -import java.io.IOException; - -import net.coobird.thumbnailator.Thumbnails; - -public class ImgCompressTest { - - public static void main(String[] args) { - try { - //1.jpg压缩测试 - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/1.jpg") - .scale(1f) - .outputQuality(1f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/1_1f.jpg"); - - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/1.jpg") - .scale(1f) - .outputQuality(0.5f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/1_0.5f.jpg"); - - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/1.jpg") - .scale(1f) - .outputQuality(0.2f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/1_0.2f.jpg"); - - - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/1.jpg") - .scale(1f) - .outputQuality(0.1f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/1_0.1f.jpg"); - - - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/1.jpg") - .scale(0.5f) - .outputQuality(0.5f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/1_0.5f_0.5f.jpg"); - - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/1.jpg") - .scale(0.5f) - .outputQuality(0.2f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/1_0.5f_0.2f.jpg"); - - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/1.jpg") - .scale(0.5f) - .outputQuality(0.1f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/1_0.5f_0.1f.jpg"); - - - //2.jpg压缩测试 - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/2.jpg") - .scale(1f) - .outputQuality(0.5f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/2_0.5f.jpg"); - - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/2.jpg") - .scale(1f) - .outputQuality(0.2f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/2_0.2f.jpg"); - - - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/2.jpg") - .scale(1f) - .outputQuality(0.1f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/2_0.1f.jpg"); - - - //3.jpg压缩测试 - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/3.jpg") - .scale(1f) - .outputQuality(0.5f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/3_0.5f.jpg"); - - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/3.jpg") - .scale(1f) - .outputQuality(0.2f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/3_0.2f.jpg"); - - - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/3.jpg") - .scale(1f) - .outputQuality(0.1f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/3_0.1f.jpg"); - - //4.jpg压缩测试 - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/4.jpg") - .scale(1f) - .outputQuality(1f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/4_1f.jpg"); - - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/4.jpg") - .scale(1f) - .outputQuality(0.5f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/4_0.5f.jpg"); - - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/4.jpg") - .scale(1f) - .outputQuality(0.2f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/4_0.2f.jpg"); - - - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/4.jpg") - .scale(1f) - .outputQuality(0.1f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/4_0.1f.jpg"); - - //11.jpg风景图片压缩测试 - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/11.jpg") - .scale(1f) - .outputQuality(0.5f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/11_0.5f.jpg"); - - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/11.jpg") - .scale(1f) - .outputQuality(0.2f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/11_0.2f.jpg"); - - - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/11.jpg") - .scale(1f) - .outputQuality(0.1f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/11_0.1f.jpg"); - - - //12.png png图片压缩测试 - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/12.png") - .scale(1f) - .outputQuality(0.5f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/12_0.5f.png"); - - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/12.png") - .scale(1f) - .outputQuality(0.2f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/12_0.2f.png"); - - - Thumbnails.of("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/12.png") - .scale(1f) - .outputQuality(0.1f) - .toFile("C:/Users/陈裕财/wsp/mdp-arc/src/test/resources/商品图片/压缩后/12_0.1f.png"); - - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - -} diff --git a/xm-core/src/test/java/com/qqkj/xm/MdpWebAppConfigurer.java b/xm-core/src/test/java/com/qqkj/xm/MdpWebAppConfigurer.java deleted file mode 100644 index b2f53f0f..00000000 --- a/xm-core/src/test/java/com/qqkj/xm/MdpWebAppConfigurer.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.qqkj.xm; - -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; - -@Configuration -public class MdpWebAppConfigurer - extends WebMvcConfigurerAdapter { - - @Override - public void addInterceptors(InterceptorRegistry registry) { - // 多个拦截器组成一个拦截器链 - // addPathPatterns 用于添加拦截规则 - } - - @Override - public void addCorsMappings(CorsRegistry registry) { - - registry.addMapping("/**") - .allowCredentials(true) - .allowedHeaders("*") - .allowedOrigins("*") - .allowedMethods("*"); - - } - -} \ No newline at end of file diff --git a/xm-core/src/test/java/com/xm/WebSecurityConfig.java b/xm-core/src/test/java/com/xm/WebSecurityConfig.java new file mode 100644 index 00000000..7b3e06b9 --- /dev/null +++ b/xm-core/src/test/java/com/xm/WebSecurityConfig.java @@ -0,0 +1,42 @@ +package com.xm; + +import com.mdp.oauth2.client.resource.MdpJwtAuthenticationConverter; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.builders.WebSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; + +/** + * com.qqkj.WebSecurityConfig + * + * @author chenyc + * @date 2019/10/10 + */ +@EnableWebSecurity +public class WebSecurityConfig extends WebSecurityConfigurerAdapter { + + @Autowired + MdpJwtAuthenticationConverter jwtConverter; + + + @Override + public void configure(WebSecurity web) throws Exception { + web.ignoring().antMatchers("/webjars/**"); + } + + /** + * 允许匿名访问所有接口 主要是 oauth 接口 + * @param http + * @throws Exception + */ + @Override + protected void configure(HttpSecurity http) throws Exception { + http.authorizeRequests().mvcMatchers("/authorize","/authorized","/","/index","/oauth2/login/token","/oauth2/login/token/web").permitAll().and().oauth2Client().and().logout().disable(); + http.formLogin().usernameParameter("userloginid"); + http.oauth2Login(); + http.oauth2ResourceServer().jwt().jwtAuthenticationConverter(jwtConverter); + http.csrf().disable(); + } + +} diff --git a/xm-core/src/test/java/com/xm/XmApplication.java b/xm-core/src/test/java/com/xm/XmApplication.java new file mode 100644 index 00000000..31b89803 --- /dev/null +++ b/xm-core/src/test/java/com/xm/XmApplication.java @@ -0,0 +1,17 @@ +package com.xm; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession; + +@SpringBootApplication +@EnableRedisHttpSession +public class XmApplication { + + + public static void main(String[] args) { + SpringApplication.run(XmApplication.class,args); + + } + +} diff --git a/xm-core/src/test/java/com/xm/core/dao/TestXmExchangeDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmExchangeDao.java index d575bcf7..8c89b96a 100644 --- a/xm-core/src/test/java/com/xm/core/dao/TestXmExchangeDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmExchangeDao.java @@ -1,22 +1,22 @@ package com.xm.core.dao; -import java.util.*; -import java.text.SimpleDateFormat; - +import com.github.pagehelper.Page; +import com.mdp.core.dao.BaseDao; +import com.mdp.core.utils.BaseUtils; +import com.mdp.mybatis.PageUtils; import com.xm.core.entity.XmExchange; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.ContextHierarchy; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.mdp.core.dao.BaseDao; -import com.mdp.mybatis.PageUtils; -import com.github.pagehelper.Page; -import org.springframework.boot.test.context.SpringBootTest; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; /** * XmExchangeDao的测试案例 * 组织 com.qqkj
diff --git a/xm-core/src/test/java/com/xm/core/dao/TestXmFileDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmFileDao.java index 0628de35..74d11d78 100644 --- a/xm-core/src/test/java/com/xm/core/dao/TestXmFileDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmFileDao.java @@ -1,22 +1,22 @@ package com.xm.core.dao; -import java.util.*; -import java.text.SimpleDateFormat; - +import com.github.pagehelper.Page; +import com.mdp.core.dao.BaseDao; +import com.mdp.core.utils.BaseUtils; +import com.mdp.mybatis.PageUtils; import com.xm.core.entity.XmFile; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.ContextHierarchy; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.mdp.core.dao.BaseDao; -import com.mdp.mybatis.PageUtils; -import com.github.pagehelper.Page; -import org.springframework.boot.test.context.SpringBootTest; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; /** * XmFileDao的测试案例 * 组织 com.qqkj
diff --git a/xm-core/src/test/java/com/xm/core/dao/TestXmMenuDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmMenuDao.java index a2d79c8c..63a0c2e2 100644 --- a/xm-core/src/test/java/com/xm/core/dao/TestXmMenuDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmMenuDao.java @@ -1,21 +1,15 @@ package com.xm.core.dao; -import java.util.*; - +import com.mdp.core.dao.BaseDao; +import com.mdp.core.utils.BaseUtils; import com.xm.core.entity.XmMenu; -import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.ContextHierarchy; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.mdp.core.dao.BaseDao; -import com.mdp.mybatis.PageUtils; -import com.github.pagehelper.Page; -import org.springframework.boot.test.context.SpringBootTest; +import java.util.Map; /** * XmMenuDao的测试案例 * 组织 com.qqkj
diff --git a/xm-core/src/test/java/com/xm/core/dao/TestXmMenuPlanDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmMenuPlanDao.java index 0d179ac7..d0327329 100644 --- a/xm-core/src/test/java/com/xm/core/dao/TestXmMenuPlanDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmMenuPlanDao.java @@ -1,22 +1,22 @@ package com.xm.core.dao; -import java.util.*; -import java.text.SimpleDateFormat; - +import com.github.pagehelper.Page; +import com.mdp.core.dao.BaseDao; +import com.mdp.core.utils.BaseUtils; +import com.mdp.mybatis.PageUtils; import com.xm.core.entity.XmMenuPlan; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.ContextHierarchy; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.mdp.core.dao.BaseDao; -import com.mdp.mybatis.PageUtils; -import com.github.pagehelper.Page; -import org.springframework.boot.test.context.SpringBootTest; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; /** * XmMenuPlanDao的测试案例 * 组织 com.qqkj
diff --git a/xm-core/src/test/java/com/xm/core/dao/TestXmMyFocusDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmMyFocusDao.java index 17653fc9..f88284b1 100644 --- a/xm-core/src/test/java/com/xm/core/dao/TestXmMyFocusDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmMyFocusDao.java @@ -1,22 +1,22 @@ package com.xm.core.dao; -import java.util.*; -import java.text.SimpleDateFormat; - +import com.github.pagehelper.Page; +import com.mdp.core.dao.BaseDao; +import com.mdp.core.utils.BaseUtils; +import com.mdp.mybatis.PageUtils; import com.xm.core.entity.XmMyFocus; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.ContextHierarchy; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.mdp.core.dao.BaseDao; -import com.mdp.mybatis.PageUtils; -import com.github.pagehelper.Page; -import org.springframework.boot.test.context.SpringBootTest; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; /** * XmMyFocusDao的测试案例 * 组织 com.qqkj
diff --git a/xm-core/src/test/java/com/xm/core/dao/TestXmProductDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProductDao.java index b1152bbb..b4ee7357 100644 --- a/xm-core/src/test/java/com/xm/core/dao/TestXmProductDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProductDao.java @@ -1,21 +1,16 @@ package com.xm.core.dao; -import java.util.*; - +import com.mdp.core.dao.BaseDao; +import com.mdp.core.utils.BaseUtils; import com.xm.core.entity.XmProduct; -import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.ContextHierarchy; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.mdp.core.dao.BaseDao; -import com.mdp.mybatis.PageUtils; -import com.github.pagehelper.Page; -import org.springframework.boot.test.context.SpringBootTest; +import java.util.Date; +import java.util.Map; /** * XmProductDao的测试案例 * 组织 com.qqkj
diff --git a/xm-core/src/test/java/com/xm/core/dao/TestXmProjectDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectDao.java index cb8b30a3..15d1c4d0 100644 --- a/xm-core/src/test/java/com/xm/core/dao/TestXmProjectDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmProjectDao.java @@ -1,22 +1,22 @@ package com.xm.core.dao; -import java.util.*; -import java.text.SimpleDateFormat; - +import com.github.pagehelper.Page; +import com.mdp.core.dao.BaseDao; +import com.mdp.core.utils.BaseUtils; +import com.mdp.mybatis.PageUtils; import com.xm.core.entity.XmProject; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.ContextHierarchy; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.mdp.core.dao.BaseDao; -import com.mdp.mybatis.PageUtils; -import com.github.pagehelper.Page; -import org.springframework.boot.test.context.SpringBootTest; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; /** * XmProjectDao的测试案例 * 组织 com.qqkj
diff --git a/xm-core/src/test/java/com/xm/core/dao/TestXmQuestionDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmQuestionDao.java index 0c4462a9..4c531a6f 100644 --- a/xm-core/src/test/java/com/xm/core/dao/TestXmQuestionDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmQuestionDao.java @@ -1,22 +1,22 @@ package com.xm.core.dao; -import java.util.*; -import java.text.SimpleDateFormat; - +import com.github.pagehelper.Page; +import com.mdp.core.dao.BaseDao; +import com.mdp.core.utils.BaseUtils; +import com.mdp.mybatis.PageUtils; import com.xm.core.entity.XmQuestion; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.ContextHierarchy; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.mdp.core.dao.BaseDao; -import com.mdp.mybatis.PageUtils; -import com.github.pagehelper.Page; -import org.springframework.boot.test.context.SpringBootTest; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; /** * XmQuestionDao的测试案例 * 组织 com.qqkj
diff --git a/xm-core/src/test/java/com/xm/core/dao/TestXmTaskDao.java b/xm-core/src/test/java/com/xm/core/dao/TestXmTaskDao.java index 91a3e480..621091c4 100644 --- a/xm-core/src/test/java/com/xm/core/dao/TestXmTaskDao.java +++ b/xm-core/src/test/java/com/xm/core/dao/TestXmTaskDao.java @@ -1,22 +1,22 @@ package com.xm.core.dao; -import java.util.*; -import java.text.SimpleDateFormat; - +import com.github.pagehelper.Page; +import com.mdp.core.dao.BaseDao; +import com.mdp.core.utils.BaseUtils; +import com.mdp.mybatis.PageUtils; import com.xm.core.entity.XmTask; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.ContextHierarchy; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import com.mdp.core.dao.BaseDao; -import com.mdp.mybatis.PageUtils; -import com.github.pagehelper.Page; -import org.springframework.boot.test.context.SpringBootTest; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; /** * XmTaskDao的测试案例 * 组织 com.qqkj
diff --git a/xm-core/src/test/java/com/qqkj/xm/push/TestXmPushMsgService.java b/xm-core/src/test/java/com/xm/push/TestXmPushMsgService.java similarity index 99% rename from xm-core/src/test/java/com/qqkj/xm/push/TestXmPushMsgService.java rename to xm-core/src/test/java/com/xm/push/TestXmPushMsgService.java index 7cabbf59..183461f4 100644 --- a/xm-core/src/test/java/com/qqkj/xm/push/TestXmPushMsgService.java +++ b/xm-core/src/test/java/com/xm/push/TestXmPushMsgService.java @@ -1,4 +1,4 @@ -package com.qqkj.xm.push; +package com.xm.push; import java.util.*;