From d38b34887492457b477ec193343de9d140df72f8 Mon Sep 17 00:00:00 2001 From: jiangzhen <1433094469@qq.com> Date: Wed, 6 Sep 2023 15:51:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- power-grid/.idea/jarRepositories.xml | 5 + ..._ch_qos_logback_logback_classic_1_2_10.xml | 6 +- ...en__ch_qos_logback_logback_core_1_2_10.xml | 6 +- .../Maven__cn_hutool_hutool_all_5_8_4.xml | 6 +- .../Maven__com_alibaba_druid_1_2_8.xml | 6 +- ...libaba_druid_spring_boot_starter_1_2_8.xml | 6 +- .../Maven__com_alibaba_fastjson_1_2_79.xml | 6 +- ..._aliyun_alibabacloud_gateway_spi_0_0_1.xml | 6 +- ...ven__com_aliyun_credentials_java_0_2_4.xml | 6 +- ...ven__com_aliyun_dysmsapi20170525_2_0_9.xml | 6 +- .../Maven__com_aliyun_endpoint_util_0_0_6.xml | 6 +- .../Maven__com_aliyun_openapiutil_0_1_14.xml | 6 +- .../Maven__com_aliyun_tea_1_1_14.xml | 6 +- .../Maven__com_aliyun_tea_openapi_0_2_2.xml | 6 +- .../Maven__com_aliyun_tea_util_0_2_13.xml | 6 +- .../Maven__com_fasterxml_classmate_1_5_1.xml | 6 +- ...ackson_core_jackson_annotations_2_12_6.xml | 6 +- ...erxml_jackson_core_jackson_core_2_12_6.xml | 6 +- ...l_jackson_core_jackson_databind_2_12_6.xml | 6 +- ...aformat_jackson_dataformat_yaml_2_12_6.xml | 6 +- ..._datatype_jackson_datatype_jdk8_2_12_6.xml | 6 +- ...atatype_jackson_datatype_jsr310_2_12_6.xml | 6 +- ..._jackson_module_parameter_names_2_12_6.xml | 6 +- ...__com_github_jsqlparser_jsqlparser_4_2.xml | 6 +- ...Maven__com_github_oshi_oshi_core_6_1_2.xml | 6 +- ...com_github_pagehelper_pagehelper_5_3_0.xml | 6 +- ...helper_spring_boot_autoconfigure_1_4_1.xml | 6 +- ...r_pagehelper_spring_boot_starter_1_4_1.xml | 6 +- ...aven__com_github_penggle_kaptcha_2_3_2.xml | 6 +- ...ulisesbocchio_jasypt_spring_boot_3_0_3.xml | 13 + ...cchio_jasypt_spring_boot_starter_3_0_3.xml | 13 + ...en__com_github_virtuald_curvesapi_1_06.xml | 6 +- ...hub_xiaoymin_knife4j_annotations_3_0_3.xml | 6 +- ...com_github_xiaoymin_knife4j_core_3_0_3.xml | 6 +- ...m_github_xiaoymin_knife4j_spring_3_0_3.xml | 6 +- ...nife4j_spring_boot_autoconfigure_3_0_3.xml | 6 +- ...ymin_knife4j_spring_boot_starter_3_0_3.xml | 6 +- ...ithub_xiaoymin_knife4j_spring_ui_3_0_3.xml | 6 +- ..._com_google_code_findbugs_jsr305_3_0_2.xml | 6 +- ...Maven__com_google_code_gson_gson_2_8_9.xml | 6 +- ...rorprone_error_prone_annotations_2_2_0.xml | 6 +- ...__com_google_guava_failureaccess_1_0_1.xml | 6 +- ..._com_google_guava_guava_27_0_1_android.xml | 6 +- ...9_0_empty_to_avoid_conflict_with_guava.xml | 6 +- ...m_google_j2objc_j2objc_annotations_1_1.xml | 6 +- ...n__com_jayway_jsonpath_json_path_2_5_0.xml | 6 +- .../Maven__com_jhlabs_filters_2_0_235_1.xml | 6 +- ...om_mchange_mchange_commons_java_0_2_15.xml | 6 +- ...Maven__com_qiniu_qiniu_java_sdk_7_10_4.xml | 6 +- ...en__com_squareup_okhttp3_okhttp_3_14_9.xml | 6 +- .../Maven__com_squareup_okio_okio_1_17_2.xml | 6 +- ...aven__com_sun_xml_bind_jaxb_core_2_3_0.xml | 6 +- ...aven__com_sun_xml_bind_jaxb_impl_2_3_0.xml | 6 +- ...ogle_android_json_0_0_20131108_vaadin1.xml | 6 +- .../Maven__com_zaxxer_HikariCP_4_0_3.xml | 6 +- .../Maven__com_zaxxer_SparseBitSet_1_2.xml | 6 +- ...aven__commons_codec_commons_codec_1_15.xml | 6 +- ..._collections_commons_collections_3_2_2.xml | 6 +- ...mons_fileupload_commons_fileupload_1_4.xml | 6 +- .../Maven__commons_io_commons_io_2_11_0.xml | 13 - .../Maven__commons_io_commons_io_2_4.xml | 13 + ...aven__eu_bitwalker_UserAgentUtils_1_21.xml | 6 +- ...io_github_classgraph_classgraph_4_8_83.xml | 6 +- .../Maven__io_jsonwebtoken_jjwt_0_9_1.xml | 6 +- ..._io_lettuce_lettuce_core_6_1_6_RELEASE.xml | 6 +- ...en__io_netty_netty_buffer_4_1_74_Final.xml | 6 +- ...ven__io_netty_netty_codec_4_1_74_Final.xml | 6 +- ...en__io_netty_netty_common_4_1_74_Final.xml | 6 +- ...n__io_netty_netty_handler_4_1_74_Final.xml | 6 +- ...__io_netty_netty_resolver_4_1_74_Final.xml | 6 +- ...ty_netty_tcnative_classes_2_0_48_Final.xml | 6 +- ..._io_netty_netty_transport_4_1_74_Final.xml | 6 +- ..._io_projectreactor_reactor_core_3_4_15.xml | 6 +- ...ingfox_springfox_bean_validators_3_0_0.xml | 6 +- ...springfox_springfox_boot_starter_3_0_0.xml | 6 +- ...ven__io_springfox_springfox_core_3_0_0.xml | 6 +- ...io_springfox_springfox_data_rest_3_0_0.xml | 6 +- ...aven__io_springfox_springfox_oas_3_0_0.xml | 6 +- ...n__io_springfox_springfox_schema_3_0_0.xml | 6 +- ...aven__io_springfox_springfox_spi_3_0_0.xml | 6 +- ...o_springfox_springfox_spring_web_3_0_0.xml | 6 +- ...ringfox_springfox_spring_webflux_3_0_0.xml | 6 +- ...pringfox_springfox_spring_webmvc_3_0_0.xml | 6 +- ..._io_springfox_springfox_swagger2_3_0_0.xml | 6 +- ...ringfox_springfox_swagger_common_3_0_0.xml | 6 +- ...gger_core_v3_swagger_annotations_2_1_2.xml | 6 +- ...o_swagger_core_v3_swagger_models_2_1_2.xml | 6 +- ..._io_swagger_swagger_annotations_1_5_22.xml | 6 +- .../Maven__io_swagger_swagger_core_1_5_22.xml | 6 +- ...aven__io_swagger_swagger_models_1_5_22.xml | 6 +- ...ctivation_jakarta_activation_api_1_2_2.xml | 6 +- ...nnotation_jakarta_annotation_api_1_3_5.xml | 6 +- ...alidation_jakarta_validation_api_2_0_2.xml | 6 +- ...ta_xml_bind_jakarta_xml_bind_api_2_3_3.xml | 6 +- ..._activation_javax_activation_api_1_2_0.xml | 6 +- ..._annotation_javax_annotation_api_1_3_2.xml | 6 +- ..._validation_validation_api_2_0_1_Final.xml | 6 +- .../Maven__javax_xml_bind_jaxb_api_2_3_1.xml | 6 +- ...ven__mysql_mysql_connector_java_8_0_28.xml | 6 +- ...aven__net_bytebuddy_byte_buddy_1_10_22.xml | 6 +- ...net_bytebuddy_byte_buddy_agent_1_10_22.xml | 6 +- .../Maven__net_java_dev_jna_jna_5_10_0.xml | 6 +- ...__net_java_dev_jna_jna_platform_5_10_0.xml | 6 +- ...ven__net_minidev_accessors_smart_2_4_8.xml | 6 +- .../Maven__net_minidev_json_smart_2_4_8.xml | 6 +- ...pache_commons_commons_collections4_4_4.xml | 6 +- ...g_apache_commons_commons_compress_1_19.xml | 6 +- ...rg_apache_commons_commons_lang3_3_12_0.xml | 6 +- ...org_apache_commons_commons_math3_3_6_1.xml | 6 +- ...org_apache_commons_commons_pool2_2_9_0.xml | 6 +- ..._apache_logging_log4j_log4j_api_2_17_1.xml | 6 +- ...apache_logging_log4j_log4j_core_2_17_1.xml | 6 +- ..._apache_logging_log4j_log4j_jul_2_17_1.xml | 6 +- ..._logging_log4j_log4j_slf4j_impl_2_17_1.xml | 6 +- ...he_logging_log4j_log4j_to_slf4j_2_17_1.xml | 6 +- .../Maven__org_apache_poi_poi_4_1_2.xml | 6 +- .../Maven__org_apache_poi_poi_ooxml_4_1_2.xml | 6 +- ...org_apache_poi_poi_ooxml_schemas_4_1_2.xml | 6 +- ..._tomcat_embed_tomcat_embed_core_9_0_58.xml | 6 +- ...he_tomcat_embed_tomcat_embed_el_9_0_58.xml | 6 +- ...at_embed_tomcat_embed_websocket_9_0_58.xml | 6 +- ...ache_velocity_velocity_engine_core_2_3.xml | 6 +- ...en__org_apache_xmlbeans_xmlbeans_3_1_0.xml | 6 +- ..._org_apiguardian_apiguardian_api_1_1_0.xml | 6 +- ...Maven__org_aspectj_aspectjweaver_1_9_7.xml | 6 +- ...Maven__org_assertj_assertj_core_3_19_0.xml | 6 +- ...__org_bouncycastle_bcpkix_jdk15on_1_65.xml | 6 +- ...__org_bouncycastle_bcprov_jdk15on_1_65.xml | 6 +- ...kerframework_checker_compat_qual_2_5_2.xml | 6 +- ...s_mojo_animal_sniffer_annotations_1_17.xml | 6 +- .../Maven__org_hamcrest_hamcrest_2_2.xml | 6 +- ...idator_hibernate_validator_6_2_2_Final.xml | 6 +- .../Maven__org_ini4j_ini4j_0_5_4.xml | 6 +- ..._jacoco_org_jacoco_agent_runtime_0_8_4.xml | 6 +- .../Maven__org_jasypt_jasypt_1_9_3.xml | 13 + ...ven__org_javassist_javassist_3_25_0_GA.xml | 6 +- ...boss_logging_jboss_logging_3_4_3_Final.xml | 6 +- ..._org_junit_jupiter_junit_jupiter_5_7_2.xml | 6 +- ..._junit_jupiter_junit_jupiter_api_5_7_2.xml | 6 +- ...nit_jupiter_junit_jupiter_engine_5_7_2.xml | 6 +- ...nit_jupiter_junit_jupiter_params_5_7_2.xml | 6 +- ..._platform_junit_platform_commons_1_7_2.xml | 6 +- ...t_platform_junit_platform_engine_1_7_2.xml | 6 +- ...n__org_mapstruct_mapstruct_1_3_1_Final.xml | 6 +- .../Maven__org_mockito_mockito_core_3_9_0.xml | 6 +- ...rg_mockito_mockito_junit_jupiter_3_9_0.xml | 6 +- .../Maven__org_mybatis_mybatis_3_5_9.xml | 6 +- ...aven__org_mybatis_mybatis_spring_2_0_7.xml | 6 +- ...ybatis_spring_boot_autoconfigure_2_2_2.xml | 6 +- ...boot_mybatis_spring_boot_starter_2_2_2.xml | 6 +- .../Maven__org_objenesis_objenesis_3_2.xml | 6 +- ...Maven__org_opentest4j_opentest4j_1_2_0.xml | 6 +- .../libraries/Maven__org_ow2_asm_asm_9_1.xml | 6 +- ...aven__org_projectlombok_lombok_1_18_22.xml | 6 +- ...ven__org_quartz_scheduler_quartz_2_3_2.xml | 6 +- ...reactivestreams_reactive_streams_1_0_3.xml | 6 +- ...aven__org_skyscreamer_jsonassert_1_5_0.xml | 6 +- .../Maven__org_slf4j_jul_to_slf4j_1_7_36.xml | 6 +- .../Maven__org_slf4j_slf4j_api_1_7_36.xml | 6 +- ...pringframework_boot_spring_boot_2_5_10.xml | 6 +- ..._boot_spring_boot_autoconfigure_2_5_10.xml | 6 +- ...ework_boot_spring_boot_devtools_2_5_10.xml | 6 +- ...mework_boot_spring_boot_starter_2_5_10.xml | 6 +- ...rk_boot_spring_boot_starter_aop_2_5_10.xml | 6 +- ..._spring_boot_starter_data_redis_2_5_10.xml | 6 +- ...k_boot_spring_boot_starter_jdbc_2_5_10.xml | 6 +- ...k_boot_spring_boot_starter_json_2_5_10.xml | 6 +- ...boot_spring_boot_starter_log4j2_2_5_10.xml | 6 +- ...oot_spring_boot_starter_logging_2_5_10.xml | 6 +- ...ot_spring_boot_starter_security_2_5_10.xml | 6 +- ...k_boot_spring_boot_starter_test_2_5_10.xml | 6 +- ...boot_spring_boot_starter_tomcat_2_5_10.xml | 6 +- ..._spring_boot_starter_validation_2_5_10.xml | 6 +- ...rk_boot_spring_boot_starter_web_2_5_10.xml | 6 +- ...framework_boot_spring_boot_test_2_5_10.xml | 6 +- ..._spring_boot_test_autoconfigure_2_5_10.xml | 6 +- ...amework_data_spring_data_commons_2_5_9.xml | 6 +- ...mework_data_spring_data_keyvalue_2_5_9.xml | 6 +- ...framework_data_spring_data_redis_2_5_9.xml | 6 +- ...lugin_spring_plugin_core_2_0_0_RELEASE.xml | 6 +- ...n_spring_plugin_metadata_2_0_0_RELEASE.xml | 6 +- ..._security_spring_security_config_5_5_5.xml | 6 +- ...rk_security_spring_security_core_5_5_5.xml | 6 +- ..._security_spring_security_crypto_5_5_5.xml | 6 +- ...ork_security_spring_security_web_5_5_5.xml | 6 +- ..._org_springframework_spring_aop_5_3_16.xml | 6 +- ...rg_springframework_spring_beans_5_3_16.xml | 6 +- ..._springframework_spring_context_5_3_16.xml | 6 +- ...ramework_spring_context_support_5_3_16.xml | 6 +- ...org_springframework_spring_core_5_3_16.xml | 6 +- ...ringframework_spring_expression_5_3_16.xml | 6 +- ..._org_springframework_spring_jcl_5_3_16.xml | 6 +- ...org_springframework_spring_jdbc_5_3_16.xml | 6 +- ..._org_springframework_spring_oxm_5_3_16.xml | 6 +- ...org_springframework_spring_test_5_3_16.xml | 6 +- ...__org_springframework_spring_tx_5_3_16.xml | 6 +- ..._org_springframework_spring_web_5_3_16.xml | 6 +- ...g_springframework_spring_webmvc_5_3_16.xml | 6 +- .../Maven__org_xmlunit_xmlunit_core_2_8_4.xml | 6 +- .../Maven__org_yaml_snakeyaml_1_28.xml | 6 +- power-grid/.idea/power-grid-20230214new.iml | 5 +- power-grid/.idea/workspace.xml | 925 +++++++++++++++++- power-grid/pom.xml | 14 +- .../com/ruoyi/common/core/text/Convert.java | 2 + .../common/utils/file/FileUploadUtils.java | 13 +- .../ruoyi/common/utils/http/HttpUtils.java | 20 +- .../com/ruoyi/common/utils/poi/ExcelUtil.java | 2 +- .../com/ruoyi/common/utils/uuid/UUID.java | 4 +- .../framework/config/KaptchaTextCreator.java | 10 +- .../ruoyi/framework/security/LoginBody.java | 3 + .../framework/security/RegisterBody.java | 3 + .../web/exception/GlobalExceptionHandler.java | 12 +- .../ruoyi/project/monitor/domain/SysJob.java | 3 + .../project/monitor/domain/SysJobLog.java | 3 + .../project/monitor/domain/SysLogininfor.java | 2 + .../project/monitor/domain/SysOperLog.java | 2 + .../apicontroller/ApiTheoryController.java | 8 +- .../pro/controller/ProStudentController.java | 7 +- .../ProTheoryQuestionController.java | 31 +- .../ruoyi/project/pro/domain/OpeTaskInfo.java | 2 + .../project/pro/domain/ProActionDetail.java | 2 + .../project/pro/domain/ProActionScene.java | 2 + .../project/pro/domain/ProCheckPoint.java | 2 + .../project/pro/domain/ProClassInfo.java | 2 + .../pro/domain/ProClassStudentRelation.java | 12 +- .../project/pro/domain/ProClassTask.java | 13 +- .../ruoyi/project/pro/domain/ProCompany.java | 2 + .../ruoyi/project/pro/domain/ProCourse.java | 2 + .../project/pro/domain/ProCourseTask.java | 2 + .../project/pro/domain/ProDataModel.java | 2 + .../ruoyi/project/pro/domain/ProDevice.java | 2 + .../project/pro/domain/ProDeviceTrouble.java | 2 + .../project/pro/domain/ProExamAction.java | 3 + .../pro/domain/ProExamActionmodel.java | 3 + .../project/pro/domain/ProExamClass.java | 2 + .../project/pro/domain/ProExamSecure.java | 2 + .../pro/domain/ProExamSecuremodel.java | 2 + .../project/pro/domain/ProExamService.java | 2 + .../pro/domain/ProExamServicemodel.java | 2 + .../project/pro/domain/ProExamTheory.java | 3 + .../project/pro/domain/ProExamTheoryNew.java | 3 + .../pro/domain/ProExamTheorynewmodel.java | 3 +- .../project/pro/domain/ProExamination.java | 2 + .../pro/domain/ProExaminationmodel.java | 2 + .../ruoyi/project/pro/domain/ProScore.java | 2 + .../ruoyi/project/pro/domain/ProSecurity.java | 2 + .../pro/domain/ProSecurityProcedures.java | 2 + .../ruoyi/project/pro/domain/ProStudent.java | 2 + .../project/pro/domain/ProStudytask.java | 2 + .../project/pro/domain/ProTaskFinish.java | 2 + .../project/pro/domain/ProTheoryQuestion.java | 3 + .../pro/domain/ProTroubleProcedure.java | 2 + .../project/pro/domain/vo/ChangeCourseVo.java | 3 + .../pro/domain/vo/ChangePasswordVO.java | 3 + .../pro/domain/vo/ChangeStudentClass.java | 3 + .../project/pro/domain/vo/EditTheoryExam.java | 3 + .../project/pro/domain/vo/ExamFinish.java | 3 + .../project/pro/domain/vo/ProStudentVO.java | 2 + .../project/pro/domain/vo/ProStudyTaskVO.java | 2 + .../pro/domain/vo/StatisticsQueryVO.java | 3 + .../impl/ProTheoryQuestionServiceImpl.java | 5 +- .../java/com/ruoyi/project/pro/util/Tool.java | 23 +- .../system/controller/SysUserController.java | 22 +- .../project/system/domain/SysConfig.java | 3 + .../ruoyi/project/system/domain/SysDept.java | 3 + .../project/system/domain/SysDictData.java | 3 + .../project/system/domain/SysDictType.java | 3 + .../ruoyi/project/system/domain/SysMenu.java | 4 + .../project/system/domain/SysNotice.java | 3 + .../ruoyi/project/system/domain/SysPost.java | 3 + .../ruoyi/project/system/domain/SysRole.java | 3 + .../ruoyi/project/system/domain/SysUser.java | 2 + .../project/system/domain/SysUserRole.java | 2 + .../project/tool/gen/domain/GenTable.java | 3 + .../src/main/resources/application-druid.yml | 13 +- 275 files changed, 1880 insertions(+), 633 deletions(-) create mode 100644 power-grid/.idea/libraries/Maven__com_github_ulisesbocchio_jasypt_spring_boot_3_0_3.xml create mode 100644 power-grid/.idea/libraries/Maven__com_github_ulisesbocchio_jasypt_spring_boot_starter_3_0_3.xml delete mode 100644 power-grid/.idea/libraries/Maven__commons_io_commons_io_2_11_0.xml create mode 100644 power-grid/.idea/libraries/Maven__commons_io_commons_io_2_4.xml create mode 100644 power-grid/.idea/libraries/Maven__org_jasypt_jasypt_1_9_3.xml diff --git a/power-grid/.idea/jarRepositories.xml b/power-grid/.idea/jarRepositories.xml index c48ef6b..b32d2b1 100644 --- a/power-grid/.idea/jarRepositories.xml +++ b/power-grid/.idea/jarRepositories.xml @@ -21,5 +21,10 @@