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 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_10.xml b/power-grid/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_10.xml
index 54fdff9..d91a292 100644
--- a/power-grid/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_10.xml
+++ b/power-grid/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_10.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_10.xml b/power-grid/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_10.xml
index b180b64..4542293 100644
--- a/power-grid/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_10.xml
+++ b/power-grid/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_10.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__cn_hutool_hutool_all_5_8_4.xml b/power-grid/.idea/libraries/Maven__cn_hutool_hutool_all_5_8_4.xml
index 3e939a5..cf2b984 100644
--- a/power-grid/.idea/libraries/Maven__cn_hutool_hutool_all_5_8_4.xml
+++ b/power-grid/.idea/libraries/Maven__cn_hutool_hutool_all_5_8_4.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_alibaba_druid_1_2_8.xml b/power-grid/.idea/libraries/Maven__com_alibaba_druid_1_2_8.xml
index 426aab2..e7cb45a 100644
--- a/power-grid/.idea/libraries/Maven__com_alibaba_druid_1_2_8.xml
+++ b/power-grid/.idea/libraries/Maven__com_alibaba_druid_1_2_8.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_2_8.xml b/power-grid/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_2_8.xml
index 353000a..e6a49df 100644
--- a/power-grid/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_2_8.xml
+++ b/power-grid/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_2_8.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_alibaba_fastjson_1_2_79.xml b/power-grid/.idea/libraries/Maven__com_alibaba_fastjson_1_2_79.xml
index bd39d1b..0193bf3 100644
--- a/power-grid/.idea/libraries/Maven__com_alibaba_fastjson_1_2_79.xml
+++ b/power-grid/.idea/libraries/Maven__com_alibaba_fastjson_1_2_79.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml b/power-grid/.idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml
index 1fcdbc7..45a2651 100644
--- a/power-grid/.idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml
+++ b/power-grid/.idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_aliyun_credentials_java_0_2_4.xml b/power-grid/.idea/libraries/Maven__com_aliyun_credentials_java_0_2_4.xml
index d5382be..dd6eb49 100644
--- a/power-grid/.idea/libraries/Maven__com_aliyun_credentials_java_0_2_4.xml
+++ b/power-grid/.idea/libraries/Maven__com_aliyun_credentials_java_0_2_4.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_aliyun_dysmsapi20170525_2_0_9.xml b/power-grid/.idea/libraries/Maven__com_aliyun_dysmsapi20170525_2_0_9.xml
index e7ae54f..117a547 100644
--- a/power-grid/.idea/libraries/Maven__com_aliyun_dysmsapi20170525_2_0_9.xml
+++ b/power-grid/.idea/libraries/Maven__com_aliyun_dysmsapi20170525_2_0_9.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_aliyun_endpoint_util_0_0_6.xml b/power-grid/.idea/libraries/Maven__com_aliyun_endpoint_util_0_0_6.xml
index 4d8efb8..bd52806 100644
--- a/power-grid/.idea/libraries/Maven__com_aliyun_endpoint_util_0_0_6.xml
+++ b/power-grid/.idea/libraries/Maven__com_aliyun_endpoint_util_0_0_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_aliyun_openapiutil_0_1_14.xml b/power-grid/.idea/libraries/Maven__com_aliyun_openapiutil_0_1_14.xml
index 8f12813..423bc16 100644
--- a/power-grid/.idea/libraries/Maven__com_aliyun_openapiutil_0_1_14.xml
+++ b/power-grid/.idea/libraries/Maven__com_aliyun_openapiutil_0_1_14.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_aliyun_tea_1_1_14.xml b/power-grid/.idea/libraries/Maven__com_aliyun_tea_1_1_14.xml
index 6c73fa3..fe4df55 100644
--- a/power-grid/.idea/libraries/Maven__com_aliyun_tea_1_1_14.xml
+++ b/power-grid/.idea/libraries/Maven__com_aliyun_tea_1_1_14.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_aliyun_tea_openapi_0_2_2.xml b/power-grid/.idea/libraries/Maven__com_aliyun_tea_openapi_0_2_2.xml
index eac67f2..e3622d5 100644
--- a/power-grid/.idea/libraries/Maven__com_aliyun_tea_openapi_0_2_2.xml
+++ b/power-grid/.idea/libraries/Maven__com_aliyun_tea_openapi_0_2_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_aliyun_tea_util_0_2_13.xml b/power-grid/.idea/libraries/Maven__com_aliyun_tea_util_0_2_13.xml
index d555ec8..0409b80 100644
--- a/power-grid/.idea/libraries/Maven__com_aliyun_tea_util_0_2_13.xml
+++ b/power-grid/.idea/libraries/Maven__com_aliyun_tea_util_0_2_13.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml b/power-grid/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml
index ef20871..0f099c7 100644
--- a/power-grid/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml
+++ b/power-grid/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_12_6.xml b/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_12_6.xml
index 8956ba1..e3a8ad2 100644
--- a/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_12_6.xml
+++ b/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_12_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_12_6.xml b/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_12_6.xml
index 178d1f6..b708f39 100644
--- a/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_12_6.xml
+++ b/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_12_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_12_6.xml b/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_12_6.xml
index 24be619..3cd345f 100644
--- a/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_12_6.xml
+++ b/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_12_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_12_6.xml b/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_12_6.xml
index 8dc70dd..f330fb6 100644
--- a/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_12_6.xml
+++ b/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_12_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_12_6.xml b/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_12_6.xml
index d609a19..350ff55 100644
--- a/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_12_6.xml
+++ b/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_12_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_12_6.xml b/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_12_6.xml
index e4d795c..bc013f1 100644
--- a/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_12_6.xml
+++ b/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_12_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_12_6.xml b/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_12_6.xml
index a91981f..217e31f 100644
--- a/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_12_6.xml
+++ b/power-grid/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_12_6.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_2.xml b/power-grid/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_2.xml
index b28a620..f1976d4 100644
--- a/power-grid/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_2.xml
+++ b/power-grid/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_github_oshi_oshi_core_6_1_2.xml b/power-grid/.idea/libraries/Maven__com_github_oshi_oshi_core_6_1_2.xml
index c37ded8..69c868f 100644
--- a/power-grid/.idea/libraries/Maven__com_github_oshi_oshi_core_6_1_2.xml
+++ b/power-grid/.idea/libraries/Maven__com_github_oshi_oshi_core_6_1_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_3_0.xml b/power-grid/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_3_0.xml
index 17715e2..5a4265d 100644
--- a/power-grid/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_3_0.xml
+++ b/power-grid/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_3_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_4_1.xml b/power-grid/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_4_1.xml
index 227e0ca..ae1c663 100644
--- a/power-grid/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_4_1.xml
+++ b/power-grid/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_4_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_4_1.xml b/power-grid/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_4_1.xml
index d29ef80..283ed71 100644
--- a/power-grid/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_4_1.xml
+++ b/power-grid/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_4_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml b/power-grid/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml
index fca63ef..0052321 100644
--- a/power-grid/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml
+++ b/power-grid/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_github_ulisesbocchio_jasypt_spring_boot_3_0_3.xml b/power-grid/.idea/libraries/Maven__com_github_ulisesbocchio_jasypt_spring_boot_3_0_3.xml
new file mode 100644
index 0000000..f978117
--- /dev/null
+++ b/power-grid/.idea/libraries/Maven__com_github_ulisesbocchio_jasypt_spring_boot_3_0_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_github_ulisesbocchio_jasypt_spring_boot_starter_3_0_3.xml b/power-grid/.idea/libraries/Maven__com_github_ulisesbocchio_jasypt_spring_boot_starter_3_0_3.xml
new file mode 100644
index 0000000..9021460
--- /dev/null
+++ b/power-grid/.idea/libraries/Maven__com_github_ulisesbocchio_jasypt_spring_boot_starter_3_0_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml b/power-grid/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml
index d934add..b06dd90 100644
--- a/power-grid/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml
+++ b/power-grid/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_annotations_3_0_3.xml b/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_annotations_3_0_3.xml
index de7c3d5..02e9907 100644
--- a/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_annotations_3_0_3.xml
+++ b/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_annotations_3_0_3.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_core_3_0_3.xml b/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_core_3_0_3.xml
index 78d0a12..1ae357e 100644
--- a/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_core_3_0_3.xml
+++ b/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_core_3_0_3.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_3_0_3.xml b/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_3_0_3.xml
index 907d0f3..ac04b04 100644
--- a/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_3_0_3.xml
+++ b/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_3_0_3.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_autoconfigure_3_0_3.xml b/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_autoconfigure_3_0_3.xml
index f832bee..75458dc 100644
--- a/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_autoconfigure_3_0_3.xml
+++ b/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_autoconfigure_3_0_3.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_starter_3_0_3.xml b/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_starter_3_0_3.xml
index b628290..1f3c881 100644
--- a/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_starter_3_0_3.xml
+++ b/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_boot_starter_3_0_3.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_ui_3_0_3.xml b/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_ui_3_0_3.xml
index ce0324e..250c480 100644
--- a/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_ui_3_0_3.xml
+++ b/power-grid/.idea/libraries/Maven__com_github_xiaoymin_knife4j_spring_ui_3_0_3.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml b/power-grid/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml
index 4b15a87..f397dfc 100644
--- a/power-grid/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml
+++ b/power-grid/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_google_code_gson_gson_2_8_9.xml b/power-grid/.idea/libraries/Maven__com_google_code_gson_gson_2_8_9.xml
index 675aaba..a617407 100644
--- a/power-grid/.idea/libraries/Maven__com_google_code_gson_gson_2_8_9.xml
+++ b/power-grid/.idea/libraries/Maven__com_google_code_gson_gson_2_8_9.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_2_0.xml b/power-grid/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_2_0.xml
index d1165f5..73b05ff 100644
--- a/power-grid/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_2_0.xml
+++ b/power-grid/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_2_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml b/power-grid/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml
index 9b3e6a2..4fddf48 100644
--- a/power-grid/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml
+++ b/power-grid/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_google_guava_guava_27_0_1_android.xml b/power-grid/.idea/libraries/Maven__com_google_guava_guava_27_0_1_android.xml
index 320288c..278df1d 100644
--- a/power-grid/.idea/libraries/Maven__com_google_guava_guava_27_0_1_android.xml
+++ b/power-grid/.idea/libraries/Maven__com_google_guava_guava_27_0_1_android.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml b/power-grid/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml
index 6f46886..75e9795 100644
--- a/power-grid/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml
+++ b/power-grid/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_1.xml b/power-grid/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_1.xml
index a1bd287..3acb930 100644
--- a/power-grid/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_1.xml
+++ b/power-grid/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_5_0.xml b/power-grid/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_5_0.xml
index 100070c..3a4eb07 100644
--- a/power-grid/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_5_0.xml
+++ b/power-grid/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_5_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml b/power-grid/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml
index 552a275..e6bb7ce 100644
--- a/power-grid/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml
+++ b/power-grid/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_15.xml b/power-grid/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_15.xml
index 1919602..1fd8fcf 100644
--- a/power-grid/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_15.xml
+++ b/power-grid/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_15.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_qiniu_qiniu_java_sdk_7_10_4.xml b/power-grid/.idea/libraries/Maven__com_qiniu_qiniu_java_sdk_7_10_4.xml
index 376dc04..d2e7365 100644
--- a/power-grid/.idea/libraries/Maven__com_qiniu_qiniu_java_sdk_7_10_4.xml
+++ b/power-grid/.idea/libraries/Maven__com_qiniu_qiniu_java_sdk_7_10_4.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_14_9.xml b/power-grid/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_14_9.xml
index 344efec..c6f6ff1 100644
--- a/power-grid/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_14_9.xml
+++ b/power-grid/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_14_9.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_squareup_okio_okio_1_17_2.xml b/power-grid/.idea/libraries/Maven__com_squareup_okio_okio_1_17_2.xml
index 6bcf034..3566d9d 100644
--- a/power-grid/.idea/libraries/Maven__com_squareup_okio_okio_1_17_2.xml
+++ b/power-grid/.idea/libraries/Maven__com_squareup_okio_okio_1_17_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_3_0.xml b/power-grid/.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_3_0.xml
index 7f49276..c79af3f 100644
--- a/power-grid/.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_3_0.xml
+++ b/power-grid/.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_3_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_3_0.xml b/power-grid/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_3_0.xml
index 7433910..03686ea 100644
--- a/power-grid/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_3_0.xml
+++ b/power-grid/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_3_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/power-grid/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
index 3c405e2..5246203 100644
--- a/power-grid/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
+++ b/power-grid/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml b/power-grid/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml
index 8a73887..b38cdc1 100644
--- a/power-grid/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml
+++ b/power-grid/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml b/power-grid/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml
index 868c1cb..934b8a9 100644
--- a/power-grid/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml
+++ b/power-grid/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__commons_codec_commons_codec_1_15.xml b/power-grid/.idea/libraries/Maven__commons_codec_commons_codec_1_15.xml
index c4d7672..1579546 100644
--- a/power-grid/.idea/libraries/Maven__commons_codec_commons_codec_1_15.xml
+++ b/power-grid/.idea/libraries/Maven__commons_codec_commons_codec_1_15.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/power-grid/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
index fee5524..b93fe0e 100644
--- a/power-grid/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
+++ b/power-grid/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml b/power-grid/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml
index 692aace..0a601cb 100644
--- a/power-grid/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml
+++ b/power-grid/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__commons_io_commons_io_2_11_0.xml b/power-grid/.idea/libraries/Maven__commons_io_commons_io_2_11_0.xml
deleted file mode 100644
index 8f67a1e..0000000
--- a/power-grid/.idea/libraries/Maven__commons_io_commons_io_2_11_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/power-grid/.idea/libraries/Maven__commons_io_commons_io_2_4.xml
new file mode 100644
index 0000000..5577770
--- /dev/null
+++ b/power-grid/.idea/libraries/Maven__commons_io_commons_io_2_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__eu_bitwalker_UserAgentUtils_1_21.xml b/power-grid/.idea/libraries/Maven__eu_bitwalker_UserAgentUtils_1_21.xml
index 49a79f5..a50c059 100644
--- a/power-grid/.idea/libraries/Maven__eu_bitwalker_UserAgentUtils_1_21.xml
+++ b/power-grid/.idea/libraries/Maven__eu_bitwalker_UserAgentUtils_1_21.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_83.xml b/power-grid/.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_83.xml
index b3164a9..047ef36 100644
--- a/power-grid/.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_83.xml
+++ b/power-grid/.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_83.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_9_1.xml b/power-grid/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_9_1.xml
index e8345c8..55f8cdc 100644
--- a/power-grid/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_9_1.xml
+++ b/power-grid/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_9_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_lettuce_lettuce_core_6_1_6_RELEASE.xml b/power-grid/.idea/libraries/Maven__io_lettuce_lettuce_core_6_1_6_RELEASE.xml
index 18c7dca..1083e39 100644
--- a/power-grid/.idea/libraries/Maven__io_lettuce_lettuce_core_6_1_6_RELEASE.xml
+++ b/power-grid/.idea/libraries/Maven__io_lettuce_lettuce_core_6_1_6_RELEASE.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_netty_netty_buffer_4_1_74_Final.xml b/power-grid/.idea/libraries/Maven__io_netty_netty_buffer_4_1_74_Final.xml
index 5d37049..6fb3b17 100644
--- a/power-grid/.idea/libraries/Maven__io_netty_netty_buffer_4_1_74_Final.xml
+++ b/power-grid/.idea/libraries/Maven__io_netty_netty_buffer_4_1_74_Final.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_netty_netty_codec_4_1_74_Final.xml b/power-grid/.idea/libraries/Maven__io_netty_netty_codec_4_1_74_Final.xml
index 405470b..d43c6c7 100644
--- a/power-grid/.idea/libraries/Maven__io_netty_netty_codec_4_1_74_Final.xml
+++ b/power-grid/.idea/libraries/Maven__io_netty_netty_codec_4_1_74_Final.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_netty_netty_common_4_1_74_Final.xml b/power-grid/.idea/libraries/Maven__io_netty_netty_common_4_1_74_Final.xml
index 93eb104..0d41294 100644
--- a/power-grid/.idea/libraries/Maven__io_netty_netty_common_4_1_74_Final.xml
+++ b/power-grid/.idea/libraries/Maven__io_netty_netty_common_4_1_74_Final.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_netty_netty_handler_4_1_74_Final.xml b/power-grid/.idea/libraries/Maven__io_netty_netty_handler_4_1_74_Final.xml
index 20e0661..d638872 100644
--- a/power-grid/.idea/libraries/Maven__io_netty_netty_handler_4_1_74_Final.xml
+++ b/power-grid/.idea/libraries/Maven__io_netty_netty_handler_4_1_74_Final.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_netty_netty_resolver_4_1_74_Final.xml b/power-grid/.idea/libraries/Maven__io_netty_netty_resolver_4_1_74_Final.xml
index 60078da..e2c282f 100644
--- a/power-grid/.idea/libraries/Maven__io_netty_netty_resolver_4_1_74_Final.xml
+++ b/power-grid/.idea/libraries/Maven__io_netty_netty_resolver_4_1_74_Final.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_netty_netty_tcnative_classes_2_0_48_Final.xml b/power-grid/.idea/libraries/Maven__io_netty_netty_tcnative_classes_2_0_48_Final.xml
index ee65d77..394d8ef 100644
--- a/power-grid/.idea/libraries/Maven__io_netty_netty_tcnative_classes_2_0_48_Final.xml
+++ b/power-grid/.idea/libraries/Maven__io_netty_netty_tcnative_classes_2_0_48_Final.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_netty_netty_transport_4_1_74_Final.xml b/power-grid/.idea/libraries/Maven__io_netty_netty_transport_4_1_74_Final.xml
index e146ae1..c36eab3 100644
--- a/power-grid/.idea/libraries/Maven__io_netty_netty_transport_4_1_74_Final.xml
+++ b/power-grid/.idea/libraries/Maven__io_netty_netty_transport_4_1_74_Final.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_projectreactor_reactor_core_3_4_15.xml b/power-grid/.idea/libraries/Maven__io_projectreactor_reactor_core_3_4_15.xml
index 752fd7d..23cc5d2 100644
--- a/power-grid/.idea/libraries/Maven__io_projectreactor_reactor_core_3_4_15.xml
+++ b/power-grid/.idea/libraries/Maven__io_projectreactor_reactor_core_3_4_15.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_springfox_springfox_bean_validators_3_0_0.xml b/power-grid/.idea/libraries/Maven__io_springfox_springfox_bean_validators_3_0_0.xml
index e2e92c3..46b509b 100644
--- a/power-grid/.idea/libraries/Maven__io_springfox_springfox_bean_validators_3_0_0.xml
+++ b/power-grid/.idea/libraries/Maven__io_springfox_springfox_bean_validators_3_0_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_springfox_springfox_boot_starter_3_0_0.xml b/power-grid/.idea/libraries/Maven__io_springfox_springfox_boot_starter_3_0_0.xml
index 471c1f3..dadb7df 100644
--- a/power-grid/.idea/libraries/Maven__io_springfox_springfox_boot_starter_3_0_0.xml
+++ b/power-grid/.idea/libraries/Maven__io_springfox_springfox_boot_starter_3_0_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_springfox_springfox_core_3_0_0.xml b/power-grid/.idea/libraries/Maven__io_springfox_springfox_core_3_0_0.xml
index bfb5b8c..c9f6b48 100644
--- a/power-grid/.idea/libraries/Maven__io_springfox_springfox_core_3_0_0.xml
+++ b/power-grid/.idea/libraries/Maven__io_springfox_springfox_core_3_0_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_springfox_springfox_data_rest_3_0_0.xml b/power-grid/.idea/libraries/Maven__io_springfox_springfox_data_rest_3_0_0.xml
index f65c647..2d6b40b 100644
--- a/power-grid/.idea/libraries/Maven__io_springfox_springfox_data_rest_3_0_0.xml
+++ b/power-grid/.idea/libraries/Maven__io_springfox_springfox_data_rest_3_0_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_springfox_springfox_oas_3_0_0.xml b/power-grid/.idea/libraries/Maven__io_springfox_springfox_oas_3_0_0.xml
index c7e47b7..a20290b 100644
--- a/power-grid/.idea/libraries/Maven__io_springfox_springfox_oas_3_0_0.xml
+++ b/power-grid/.idea/libraries/Maven__io_springfox_springfox_oas_3_0_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_springfox_springfox_schema_3_0_0.xml b/power-grid/.idea/libraries/Maven__io_springfox_springfox_schema_3_0_0.xml
index 557837c..8449cc8 100644
--- a/power-grid/.idea/libraries/Maven__io_springfox_springfox_schema_3_0_0.xml
+++ b/power-grid/.idea/libraries/Maven__io_springfox_springfox_schema_3_0_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_springfox_springfox_spi_3_0_0.xml b/power-grid/.idea/libraries/Maven__io_springfox_springfox_spi_3_0_0.xml
index 1dbec23..60e8382 100644
--- a/power-grid/.idea/libraries/Maven__io_springfox_springfox_spi_3_0_0.xml
+++ b/power-grid/.idea/libraries/Maven__io_springfox_springfox_spi_3_0_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_springfox_springfox_spring_web_3_0_0.xml b/power-grid/.idea/libraries/Maven__io_springfox_springfox_spring_web_3_0_0.xml
index bf84f55..c52345e 100644
--- a/power-grid/.idea/libraries/Maven__io_springfox_springfox_spring_web_3_0_0.xml
+++ b/power-grid/.idea/libraries/Maven__io_springfox_springfox_spring_web_3_0_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_springfox_springfox_spring_webflux_3_0_0.xml b/power-grid/.idea/libraries/Maven__io_springfox_springfox_spring_webflux_3_0_0.xml
index 24e6b20..e9ad97d 100644
--- a/power-grid/.idea/libraries/Maven__io_springfox_springfox_spring_webflux_3_0_0.xml
+++ b/power-grid/.idea/libraries/Maven__io_springfox_springfox_spring_webflux_3_0_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_springfox_springfox_spring_webmvc_3_0_0.xml b/power-grid/.idea/libraries/Maven__io_springfox_springfox_spring_webmvc_3_0_0.xml
index e8d5b1c..71f1ae8 100644
--- a/power-grid/.idea/libraries/Maven__io_springfox_springfox_spring_webmvc_3_0_0.xml
+++ b/power-grid/.idea/libraries/Maven__io_springfox_springfox_spring_webmvc_3_0_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_springfox_springfox_swagger2_3_0_0.xml b/power-grid/.idea/libraries/Maven__io_springfox_springfox_swagger2_3_0_0.xml
index c7c3037..a484c5b 100644
--- a/power-grid/.idea/libraries/Maven__io_springfox_springfox_swagger2_3_0_0.xml
+++ b/power-grid/.idea/libraries/Maven__io_springfox_springfox_swagger2_3_0_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_springfox_springfox_swagger_common_3_0_0.xml b/power-grid/.idea/libraries/Maven__io_springfox_springfox_swagger_common_3_0_0.xml
index 9a70666..e840fa2 100644
--- a/power-grid/.idea/libraries/Maven__io_springfox_springfox_swagger_common_3_0_0.xml
+++ b/power-grid/.idea/libraries/Maven__io_springfox_springfox_swagger_common_3_0_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_2.xml b/power-grid/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_2.xml
index 0c70706..96a85da 100644
--- a/power-grid/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_2.xml
+++ b/power-grid/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_swagger_core_v3_swagger_models_2_1_2.xml b/power-grid/.idea/libraries/Maven__io_swagger_core_v3_swagger_models_2_1_2.xml
index 29731aa..f788f80 100644
--- a/power-grid/.idea/libraries/Maven__io_swagger_core_v3_swagger_models_2_1_2.xml
+++ b/power-grid/.idea/libraries/Maven__io_swagger_core_v3_swagger_models_2_1_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_22.xml b/power-grid/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_22.xml
index 0e30919..2d15940 100644
--- a/power-grid/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_22.xml
+++ b/power-grid/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_22.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_swagger_swagger_core_1_5_22.xml b/power-grid/.idea/libraries/Maven__io_swagger_swagger_core_1_5_22.xml
index 8618cd8..0241cd3 100644
--- a/power-grid/.idea/libraries/Maven__io_swagger_swagger_core_1_5_22.xml
+++ b/power-grid/.idea/libraries/Maven__io_swagger_swagger_core_1_5_22.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__io_swagger_swagger_models_1_5_22.xml b/power-grid/.idea/libraries/Maven__io_swagger_swagger_models_1_5_22.xml
index 8daf59b..c5b35f7 100644
--- a/power-grid/.idea/libraries/Maven__io_swagger_swagger_models_1_5_22.xml
+++ b/power-grid/.idea/libraries/Maven__io_swagger_swagger_models_1_5_22.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml b/power-grid/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml
index 34326c7..d20505d 100644
--- a/power-grid/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml
+++ b/power-grid/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml b/power-grid/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
index ee74645..7caed99 100644
--- a/power-grid/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
+++ b/power-grid/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml b/power-grid/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml
index b909d65..6b94c18 100644
--- a/power-grid/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml
+++ b/power-grid/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml b/power-grid/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml
index e51cdf7..5f1e886 100644
--- a/power-grid/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml
+++ b/power-grid/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml b/power-grid/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml
index 71105de..e9d13ba 100644
--- a/power-grid/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml
+++ b/power-grid/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml b/power-grid/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml
index 17dd26f..99e4787 100644
--- a/power-grid/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml
+++ b/power-grid/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml b/power-grid/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml
index 83b9b33..305d5fe 100644
--- a/power-grid/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml
+++ b/power-grid/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml b/power-grid/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml
index 82f6c98..e19db13 100644
--- a/power-grid/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml
+++ b/power-grid/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_28.xml b/power-grid/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_28.xml
index 946a087..2ce936e 100644
--- a/power-grid/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_28.xml
+++ b/power-grid/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_28.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_22.xml b/power-grid/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_22.xml
index 7fb6955..0fb4c5b 100644
--- a/power-grid/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_22.xml
+++ b/power-grid/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_22.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_22.xml b/power-grid/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_22.xml
index 30d9a56..38d4ba0 100644
--- a/power-grid/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_22.xml
+++ b/power-grid/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_22.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__net_java_dev_jna_jna_5_10_0.xml b/power-grid/.idea/libraries/Maven__net_java_dev_jna_jna_5_10_0.xml
index b7c9a91..48d056b 100644
--- a/power-grid/.idea/libraries/Maven__net_java_dev_jna_jna_5_10_0.xml
+++ b/power-grid/.idea/libraries/Maven__net_java_dev_jna_jna_5_10_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__net_java_dev_jna_jna_platform_5_10_0.xml b/power-grid/.idea/libraries/Maven__net_java_dev_jna_jna_platform_5_10_0.xml
index 7915242..cd24f61 100644
--- a/power-grid/.idea/libraries/Maven__net_java_dev_jna_jna_platform_5_10_0.xml
+++ b/power-grid/.idea/libraries/Maven__net_java_dev_jna_jna_platform_5_10_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_8.xml b/power-grid/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_8.xml
index d5726e8..889dd37 100644
--- a/power-grid/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_8.xml
+++ b/power-grid/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_8.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__net_minidev_json_smart_2_4_8.xml b/power-grid/.idea/libraries/Maven__net_minidev_json_smart_2_4_8.xml
index f38bd22..cf56f08 100644
--- a/power-grid/.idea/libraries/Maven__net_minidev_json_smart_2_4_8.xml
+++ b/power-grid/.idea/libraries/Maven__net_minidev_json_smart_2_4_8.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml b/power-grid/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml
index 2bf9ca6..daaf593 100644
--- a/power-grid/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml
+++ b/power-grid/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml b/power-grid/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml
index eab1d13..21cb9fd 100644
--- a/power-grid/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml
+++ b/power-grid/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_12_0.xml b/power-grid/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_12_0.xml
index b447b0b..e3a63de 100644
--- a/power-grid/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_12_0.xml
+++ b/power-grid/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_12_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml b/power-grid/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml
index 7e0fff5..f28e6aa 100644
--- a/power-grid/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml
+++ b/power-grid/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_9_0.xml b/power-grid/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_9_0.xml
index 342612b..51d1b3b 100644
--- a/power-grid/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_9_0.xml
+++ b/power-grid/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_9_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_1.xml b/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_1.xml
index 318892d..15730c1 100644
--- a/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_1.xml
+++ b/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_17_1.xml b/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_17_1.xml
index 33b4dcc..2b26c3d 100644
--- a/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_17_1.xml
+++ b/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_17_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_17_1.xml b/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_17_1.xml
index 8f56b9b..f74f192 100644
--- a/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_17_1.xml
+++ b/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_17_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_17_1.xml b/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_17_1.xml
index 84272ef..7424535 100644
--- a/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_17_1.xml
+++ b/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_17_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_1.xml b/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_1.xml
index cf704fd..87c3cf1 100644
--- a/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_1.xml
+++ b/power-grid/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml b/power-grid/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml
index 7bcb59d..6437838 100644
--- a/power-grid/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml
+++ b/power-grid/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml b/power-grid/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml
index 909a953..1cd6322 100644
--- a/power-grid/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml
+++ b/power-grid/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml b/power-grid/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml
index 7e0d158..0691430 100644
--- a/power-grid/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml
+++ b/power-grid/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_58.xml b/power-grid/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_58.xml
index cc504a3..65bd55b 100644
--- a/power-grid/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_58.xml
+++ b/power-grid/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_58.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_58.xml b/power-grid/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_58.xml
index 8fdc623..eeff180 100644
--- a/power-grid/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_58.xml
+++ b/power-grid/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_58.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_58.xml b/power-grid/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_58.xml
index 3ee41af..69f79b8 100644
--- a/power-grid/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_58.xml
+++ b/power-grid/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_58.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_3.xml b/power-grid/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_3.xml
index dd7e4d2..e9659c7 100644
--- a/power-grid/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_3.xml
+++ b/power-grid/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_3.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml b/power-grid/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml
index bfe6dd6..3da0ea5 100644
--- a/power-grid/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml
+++ b/power-grid/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/power-grid/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
index 841926b..b07b289 100644
--- a/power-grid/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
+++ b/power-grid/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_7.xml b/power-grid/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_7.xml
index 3d00e75..5f6fb35 100644
--- a/power-grid/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_7.xml
+++ b/power-grid/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_7.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_assertj_assertj_core_3_19_0.xml b/power-grid/.idea/libraries/Maven__org_assertj_assertj_core_3_19_0.xml
index c54f3e9..2e60664 100644
--- a/power-grid/.idea/libraries/Maven__org_assertj_assertj_core_3_19_0.xml
+++ b/power-grid/.idea/libraries/Maven__org_assertj_assertj_core_3_19_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_65.xml b/power-grid/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_65.xml
index 58968d1..78d39d7 100644
--- a/power-grid/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_65.xml
+++ b/power-grid/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_65.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_65.xml b/power-grid/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_65.xml
index 4a390f7..0f435db 100644
--- a/power-grid/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_65.xml
+++ b/power-grid/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_65.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_checkerframework_checker_compat_qual_2_5_2.xml b/power-grid/.idea/libraries/Maven__org_checkerframework_checker_compat_qual_2_5_2.xml
index 35afe1a..3849230 100644
--- a/power-grid/.idea/libraries/Maven__org_checkerframework_checker_compat_qual_2_5_2.xml
+++ b/power-grid/.idea/libraries/Maven__org_checkerframework_checker_compat_qual_2_5_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_codehaus_mojo_animal_sniffer_annotations_1_17.xml b/power-grid/.idea/libraries/Maven__org_codehaus_mojo_animal_sniffer_annotations_1_17.xml
index 67023de..3a3530d 100644
--- a/power-grid/.idea/libraries/Maven__org_codehaus_mojo_animal_sniffer_annotations_1_17.xml
+++ b/power-grid/.idea/libraries/Maven__org_codehaus_mojo_animal_sniffer_annotations_1_17.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml b/power-grid/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml
index 6d6fa93..d8f2307 100644
--- a/power-grid/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml
+++ b/power-grid/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_2_2_Final.xml b/power-grid/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_2_2_Final.xml
index d36856f..a9fed57 100644
--- a/power-grid/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_2_2_Final.xml
+++ b/power-grid/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_2_2_Final.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_ini4j_ini4j_0_5_4.xml b/power-grid/.idea/libraries/Maven__org_ini4j_ini4j_0_5_4.xml
index ed62fc8..1a4c3de 100644
--- a/power-grid/.idea/libraries/Maven__org_ini4j_ini4j_0_5_4.xml
+++ b/power-grid/.idea/libraries/Maven__org_ini4j_ini4j_0_5_4.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_4.xml b/power-grid/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_4.xml
index fa997f4..5c80f84 100644
--- a/power-grid/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_4.xml
+++ b/power-grid/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_4.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_jasypt_jasypt_1_9_3.xml b/power-grid/.idea/libraries/Maven__org_jasypt_jasypt_1_9_3.xml
new file mode 100644
index 0000000..599b0c6
--- /dev/null
+++ b/power-grid/.idea/libraries/Maven__org_jasypt_jasypt_1_9_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_javassist_javassist_3_25_0_GA.xml b/power-grid/.idea/libraries/Maven__org_javassist_javassist_3_25_0_GA.xml
index da9daa5..3f46af7 100644
--- a/power-grid/.idea/libraries/Maven__org_javassist_javassist_3_25_0_GA.xml
+++ b/power-grid/.idea/libraries/Maven__org_javassist_javassist_3_25_0_GA.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_3_Final.xml b/power-grid/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_3_Final.xml
index bce4c40..df6b67b 100644
--- a/power-grid/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_3_Final.xml
+++ b/power-grid/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_3_Final.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_2.xml b/power-grid/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_2.xml
index fc76008..66bcdaa 100644
--- a/power-grid/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_2.xml
+++ b/power-grid/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_2.xml b/power-grid/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_2.xml
index 115e8e4..6060bc0 100644
--- a/power-grid/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_2.xml
+++ b/power-grid/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_2.xml b/power-grid/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_2.xml
index 7469985..359412e 100644
--- a/power-grid/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_2.xml
+++ b/power-grid/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_2.xml b/power-grid/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_2.xml
index 1d68f9d..93fa735 100644
--- a/power-grid/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_2.xml
+++ b/power-grid/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_2.xml b/power-grid/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_2.xml
index e060b5c..17ecc56 100644
--- a/power-grid/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_2.xml
+++ b/power-grid/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_2.xml b/power-grid/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_2.xml
index cf89f2b..32ad0b1 100644
--- a/power-grid/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_2.xml
+++ b/power-grid/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_mapstruct_mapstruct_1_3_1_Final.xml b/power-grid/.idea/libraries/Maven__org_mapstruct_mapstruct_1_3_1_Final.xml
index c0d1155..892f595 100644
--- a/power-grid/.idea/libraries/Maven__org_mapstruct_mapstruct_1_3_1_Final.xml
+++ b/power-grid/.idea/libraries/Maven__org_mapstruct_mapstruct_1_3_1_Final.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_mockito_mockito_core_3_9_0.xml b/power-grid/.idea/libraries/Maven__org_mockito_mockito_core_3_9_0.xml
index 3fc1d0e..fb184c6 100644
--- a/power-grid/.idea/libraries/Maven__org_mockito_mockito_core_3_9_0.xml
+++ b/power-grid/.idea/libraries/Maven__org_mockito_mockito_core_3_9_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_9_0.xml b/power-grid/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_9_0.xml
index 63ae320..5dc1a5b 100644
--- a/power-grid/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_9_0.xml
+++ b/power-grid/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_9_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_mybatis_mybatis_3_5_9.xml b/power-grid/.idea/libraries/Maven__org_mybatis_mybatis_3_5_9.xml
index 2eb5343..6197882 100644
--- a/power-grid/.idea/libraries/Maven__org_mybatis_mybatis_3_5_9.xml
+++ b/power-grid/.idea/libraries/Maven__org_mybatis_mybatis_3_5_9.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_7.xml b/power-grid/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_7.xml
index 6512e2a..9a937b4 100644
--- a/power-grid/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_7.xml
+++ b/power-grid/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_7.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_2_2.xml b/power-grid/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_2_2.xml
index e1c7831..d5f9673 100644
--- a/power-grid/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_2_2.xml
+++ b/power-grid/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_2_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_2_2.xml b/power-grid/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_2_2.xml
index cc5d633..da3d0b1 100644
--- a/power-grid/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_2_2.xml
+++ b/power-grid/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_2_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml b/power-grid/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml
index a43e5e0..38cc7dd 100644
--- a/power-grid/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml
+++ b/power-grid/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/power-grid/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
index 5fb927e..e43c22e 100644
--- a/power-grid/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
+++ b/power-grid/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml b/power-grid/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml
index bb69b4f..0dd1f4f 100644
--- a/power-grid/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml
+++ b/power-grid/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_projectlombok_lombok_1_18_22.xml b/power-grid/.idea/libraries/Maven__org_projectlombok_lombok_1_18_22.xml
index 63b11b9..a36d7df 100644
--- a/power-grid/.idea/libraries/Maven__org_projectlombok_lombok_1_18_22.xml
+++ b/power-grid/.idea/libraries/Maven__org_projectlombok_lombok_1_18_22.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_2.xml b/power-grid/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_2.xml
index b526c28..60c39a9 100644
--- a/power-grid/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_2.xml
+++ b/power-grid/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_2.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml b/power-grid/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml
index 80052dc..c6016a3 100644
--- a/power-grid/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml
+++ b/power-grid/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/power-grid/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
index 374e4f0..9b78e42 100644
--- a/power-grid/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
+++ b/power-grid/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml b/power-grid/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml
index a580511..bb4927c 100644
--- a/power-grid/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml
+++ b/power-grid/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml b/power-grid/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml
index b5bab88..9377f53 100644
--- a/power-grid/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml
+++ b/power-grid/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_5_10.xml b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_5_10.xml
index 99a0359..69a4aa2 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_5_10.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_5_10.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_5_10.xml b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_5_10.xml
index cfa675b..3de2e2a 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_5_10.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_5_10.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_5_10.xml b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_5_10.xml
index 274095a..9a704ff 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_5_10.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_5_10.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_5_10.xml b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_5_10.xml
index 2618392..e7f80b8 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_5_10.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_5_10.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_5_10.xml b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_5_10.xml
index c3d3798..f88e657 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_5_10.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_5_10.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_5_10.xml b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_5_10.xml
index b29201b..ed51beb 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_5_10.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_5_10.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_5_10.xml b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_5_10.xml
index fdfee25..78435da 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_5_10.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_5_10.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_5_10.xml b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_5_10.xml
index d6fa948..2e5863c 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_5_10.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_5_10.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_5_10.xml b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_5_10.xml
index 1866c8f..ad62f95 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_5_10.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_5_10.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_5_10.xml b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_5_10.xml
index e9881ec..11b7ff0 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_5_10.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_5_10.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_5_10.xml b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_5_10.xml
index 71bac97..9418843 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_5_10.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_5_10.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_5_10.xml b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_5_10.xml
index 467cf6f..da49e14 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_5_10.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_5_10.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_5_10.xml b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_5_10.xml
index 118f8c7..394a400 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_5_10.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_5_10.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_5_10.xml b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_5_10.xml
index 51a15ae..ee16c79 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_5_10.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_5_10.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_5_10.xml b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_5_10.xml
index b29354a..759b59f 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_5_10.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_5_10.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_5_10.xml b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_5_10.xml
index 42157e1..7c45916 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_5_10.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_5_10.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_5_10.xml b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_5_10.xml
index a5d8d29..515843b 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_5_10.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_5_10.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_5_9.xml b/power-grid/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_5_9.xml
index 69fb265..8f44025 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_5_9.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_5_9.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_5_9.xml b/power-grid/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_5_9.xml
index fb4f44b..596f806 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_5_9.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_5_9.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_5_9.xml b/power-grid/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_5_9.xml
index 22216ca..4a1e287 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_5_9.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_5_9.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_2_0_0_RELEASE.xml b/power-grid/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_2_0_0_RELEASE.xml
index 4464ee3..b79d594 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_2_0_0_RELEASE.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_2_0_0_RELEASE.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_2_0_0_RELEASE.xml b/power-grid/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_2_0_0_RELEASE.xml
index aa75038..1e7ba1d 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_2_0_0_RELEASE.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_2_0_0_RELEASE.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_5_5.xml b/power-grid/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_5_5.xml
index fea95c0..b8189e8 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_5_5.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_5_5.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_5_5.xml b/power-grid/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_5_5.xml
index acfdb12..a9812eb 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_5_5.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_5_5.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_5_5.xml b/power-grid/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_5_5.xml
index 73a40a9..fb21809 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_5_5.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_5_5.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_5_5.xml b/power-grid/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_5_5.xml
index d51d64f..4083082 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_5_5.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_5_5.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_spring_aop_5_3_16.xml b/power-grid/.idea/libraries/Maven__org_springframework_spring_aop_5_3_16.xml
index 70c3cd3..4d097e5 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_spring_aop_5_3_16.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_spring_aop_5_3_16.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_spring_beans_5_3_16.xml b/power-grid/.idea/libraries/Maven__org_springframework_spring_beans_5_3_16.xml
index 70b1920..1382a48 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_spring_beans_5_3_16.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_spring_beans_5_3_16.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_spring_context_5_3_16.xml b/power-grid/.idea/libraries/Maven__org_springframework_spring_context_5_3_16.xml
index f5f6b45..df80639 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_spring_context_5_3_16.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_spring_context_5_3_16.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_16.xml b/power-grid/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_16.xml
index d907902..5653db0 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_16.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_16.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_spring_core_5_3_16.xml b/power-grid/.idea/libraries/Maven__org_springframework_spring_core_5_3_16.xml
index 3540d0f..6505692 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_spring_core_5_3_16.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_spring_core_5_3_16.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_spring_expression_5_3_16.xml b/power-grid/.idea/libraries/Maven__org_springframework_spring_expression_5_3_16.xml
index b2413a9..6b9d847 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_spring_expression_5_3_16.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_spring_expression_5_3_16.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_16.xml b/power-grid/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_16.xml
index 2a7e166..d6af047 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_16.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_16.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_16.xml b/power-grid/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_16.xml
index 47c8009..bec12a9 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_16.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_16.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_spring_oxm_5_3_16.xml b/power-grid/.idea/libraries/Maven__org_springframework_spring_oxm_5_3_16.xml
index a76fa54..569758a 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_spring_oxm_5_3_16.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_spring_oxm_5_3_16.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_spring_test_5_3_16.xml b/power-grid/.idea/libraries/Maven__org_springframework_spring_test_5_3_16.xml
index 997cfda..23e4409 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_spring_test_5_3_16.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_spring_test_5_3_16.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_spring_tx_5_3_16.xml b/power-grid/.idea/libraries/Maven__org_springframework_spring_tx_5_3_16.xml
index 7b0ac72..0199ffb 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_spring_tx_5_3_16.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_spring_tx_5_3_16.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_spring_web_5_3_16.xml b/power-grid/.idea/libraries/Maven__org_springframework_spring_web_5_3_16.xml
index 70c9953..249c911 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_spring_web_5_3_16.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_spring_web_5_3_16.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_16.xml b/power-grid/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_16.xml
index 0c662ed..1a5c489 100644
--- a/power-grid/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_16.xml
+++ b/power-grid/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_16.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_4.xml b/power-grid/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_4.xml
index 8fa5113..c630277 100644
--- a/power-grid/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_4.xml
+++ b/power-grid/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_4.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/libraries/Maven__org_yaml_snakeyaml_1_28.xml b/power-grid/.idea/libraries/Maven__org_yaml_snakeyaml_1_28.xml
index c91fa08..b07440c 100644
--- a/power-grid/.idea/libraries/Maven__org_yaml_snakeyaml_1_28.xml
+++ b/power-grid/.idea/libraries/Maven__org_yaml_snakeyaml_1_28.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/power-grid/.idea/power-grid-20230214new.iml b/power-grid/.idea/power-grid-20230214new.iml
index d6087f7..f3926d8 100644
--- a/power-grid/.idea/power-grid-20230214new.iml
+++ b/power-grid/.idea/power-grid-20230214new.iml
@@ -125,7 +125,7 @@
-
+
@@ -215,5 +215,8 @@
+
+
+
\ No newline at end of file
diff --git a/power-grid/.idea/workspace.xml b/power-grid/.idea/workspace.xml
index a4d6761..cf3eac6 100644
--- a/power-grid/.idea/workspace.xml
+++ b/power-grid/.idea/workspace.xml
@@ -4,7 +4,909 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -61,6 +963,14 @@
+
+
+
+
+
+
+
+
@@ -418,6 +1330,17 @@
+
+
+
diff --git a/power-grid/pom.xml b/power-grid/pom.xml
index 1356091..3f7c85d 100644
--- a/power-grid/pom.xml
+++ b/power-grid/pom.xml
@@ -79,7 +79,7 @@
-
+
org.springframework.boot
spring-boot-devtools
@@ -299,6 +299,18 @@
hutool-all
5.8.4
+
+
+ commons-io
+ commons-io
+ 2.4
+
+
+
+ com.github.ulisesbocchio
+ jasypt-spring-boot-starter
+ 3.0.3
+
diff --git a/power-grid/src/main/java/com/ruoyi/common/core/text/Convert.java b/power-grid/src/main/java/com/ruoyi/common/core/text/Convert.java
index 1fb7461..f616d1d 100644
--- a/power-grid/src/main/java/com/ruoyi/common/core/text/Convert.java
+++ b/power-grid/src/main/java/com/ruoyi/common/core/text/Convert.java
@@ -5,6 +5,7 @@ import java.math.BigInteger;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.text.NumberFormat;
+import java.util.Locale;
import java.util.Set;
import com.ruoyi.common.utils.StringUtils;
import org.apache.commons.lang3.ArrayUtils;
@@ -559,6 +560,7 @@ public class Convert
return defaultValue;
}
valueStr = valueStr.trim().toLowerCase();
+ Locale.setDefault(Locale.ENGLISH);
switch (valueStr)
{
case "true":
diff --git a/power-grid/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/power-grid/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index e8e0edf..17cfd9f 100644
--- a/power-grid/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/power-grid/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -93,7 +93,7 @@ public class FileUploadUtils {
* @return
*/
private static String qiniuUpload(MultipartFile file) {
-
+ InputStream inputStream=null;
//构造一个带指定 Region 对象的配置类
Configuration cfg = new Configuration(Region.region2());
cfg.resumableUploadAPIVersion = Configuration.ResumableUploadAPIVersion.V2;// 指定分片上传版本
@@ -107,7 +107,8 @@ public class FileUploadUtils {
//默认不指定key的情况下,以文件内容的hash值作为文件名
String key = null;
try {
- InputStream inputStream = file.getInputStream();
+ //InputStream inputStream = file.getInputStream(); 以下为修改后
+ inputStream=file.getInputStream();
Auth auth = Auth.create(accessKey, secretKey);
String upToken = auth.uploadToken(bucket);
@@ -129,6 +130,14 @@ public class FileUploadUtils {
}
} catch (IOException e) {
e.printStackTrace();
+ }finally {
+ if (inputStream!=null) {
+ try {
+ inputStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
}
return null;
}
diff --git a/power-grid/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/power-grid/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
index f85c82c..bcd10c2 100644
--- a/power-grid/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
+++ b/power-grid/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
@@ -66,6 +66,7 @@ public class HttpUtils
{
StringBuilder result = new StringBuilder();
BufferedReader in = null;
+ InputStream connectionInputStream=null;
try
{
String urlNameString = StringUtils.isNotBlank(param) ? url + "?" + param : url;
@@ -76,7 +77,8 @@ public class HttpUtils
connection.setRequestProperty("connection", "Keep-Alive");
connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
connection.connect();
- in = new BufferedReader(new InputStreamReader(connection.getInputStream(), contentType));
+ connectionInputStream= connection.getInputStream();
+ in = new BufferedReader(new InputStreamReader(connectionInputStream, contentType));
String line;
while ((line = in.readLine()) != null)
{
@@ -102,6 +104,13 @@ public class HttpUtils
}
finally
{
+ if (connectionInputStream!=null) {
+ try {
+ connectionInputStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
try
{
if (in != null)
@@ -193,6 +202,7 @@ public class HttpUtils
{
StringBuilder result = new StringBuilder();
String urlNameString = url + "?" + param;
+ InputStream is=null;
try
{
log.info("sendSSLPost - {}", urlNameString);
@@ -211,7 +221,7 @@ public class HttpUtils
conn.setSSLSocketFactory(sc.getSocketFactory());
conn.setHostnameVerifier(new TrustAnyHostnameVerifier());
conn.connect();
- InputStream is = conn.getInputStream();
+ is = conn.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
String ret = "";
while ((ret = br.readLine()) != null)
@@ -240,6 +250,12 @@ public class HttpUtils
catch (Exception e)
{
log.error("调用HttpsUtil.sendSSLPost Exception, url=" + url + ",param=" + param, e);
+ }finally {
+ try {
+ is.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
}
return result.toString();
}
diff --git a/power-grid/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/power-grid/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 8f5e6d3..28a43f9 100644
--- a/power-grid/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/power-grid/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -1061,7 +1061,7 @@ public class ExcelUtil
/**
* 创建统计行
*/
- public void addStatisticsRow()
+ public synchronized void addStatisticsRow()
{
if (statistics.size() > 0)
{
diff --git a/power-grid/src/main/java/com/ruoyi/common/utils/uuid/UUID.java b/power-grid/src/main/java/com/ruoyi/common/utils/uuid/UUID.java
index 062d633..dca0b4b 100644
--- a/power-grid/src/main/java/com/ruoyi/common/utils/uuid/UUID.java
+++ b/power-grid/src/main/java/com/ruoyi/common/utils/uuid/UUID.java
@@ -93,8 +93,8 @@ public final class UUID implements java.io.Serializable, Comparable
*/
public static UUID randomUUID(boolean isSecure)
{
- final Random ng = isSecure ? Holder.numberGenerator : getRandom();
-
+ //final Random ng = isSecure ? Holder.numberGenerator : getRandom();
+ final SecureRandom ng = isSecure ? Holder.numberGenerator : getSecureRandom();
byte[] randomBytes = new byte[16];
ng.nextBytes(randomBytes);
randomBytes[6] &= 0x0f; /* clear version */
diff --git a/power-grid/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java b/power-grid/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java
index 3e74580..cef004a 100644
--- a/power-grid/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java
+++ b/power-grid/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java
@@ -1,6 +1,7 @@
package com.ruoyi.framework.config;
-import java.util.Random;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
import com.google.code.kaptcha.text.impl.DefaultTextCreator;
/**
@@ -16,7 +17,12 @@ public class KaptchaTextCreator extends DefaultTextCreator
public String getText()
{
Integer result = 0;
- Random random = new Random();
+ SecureRandom random = null;
+ try {
+ random = SecureRandom.getInstance("SHA1PRNG");
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ }
int x = random.nextInt(10);
int y = random.nextInt(10);
StringBuilder suChinese = new StringBuilder();
diff --git a/power-grid/src/main/java/com/ruoyi/framework/security/LoginBody.java b/power-grid/src/main/java/com/ruoyi/framework/security/LoginBody.java
index ddfac39..9568558 100644
--- a/power-grid/src/main/java/com/ruoyi/framework/security/LoginBody.java
+++ b/power-grid/src/main/java/com/ruoyi/framework/security/LoginBody.java
@@ -1,10 +1,13 @@
package com.ruoyi.framework.security;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
/**
* 用户登录对象
*
* @author ruoyi
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class LoginBody
{
/**
diff --git a/power-grid/src/main/java/com/ruoyi/framework/security/RegisterBody.java b/power-grid/src/main/java/com/ruoyi/framework/security/RegisterBody.java
index 42be381..d7e6457 100644
--- a/power-grid/src/main/java/com/ruoyi/framework/security/RegisterBody.java
+++ b/power-grid/src/main/java/com/ruoyi/framework/security/RegisterBody.java
@@ -1,10 +1,13 @@
package com.ruoyi.framework.security;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
/**
* 用户注册对象
*
* @author ruoyi
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class RegisterBody extends LoginBody
{
diff --git a/power-grid/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/power-grid/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
index 545684e..72a170e 100644
--- a/power-grid/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
+++ b/power-grid/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
@@ -45,7 +45,8 @@ public class GlobalExceptionHandler
{
String requestURI = request.getRequestURI();
log.error("请求地址'{}',不支持'{}'请求", requestURI, e.getMethod());
- return AjaxResult.error(e.getMessage());
+ //return AjaxResult.error(e.getMessage());
+ return AjaxResult.error("请求地址不支持该请求!");
}
/**
@@ -56,7 +57,8 @@ public class GlobalExceptionHandler
{
log.error(e.getMessage(), e);
Integer code = e.getCode();
- return StringUtils.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage());
+ // return StringUtils.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage());
+ return StringUtils.isNotNull(code) ? AjaxResult.error(code, "服务器错误") : AjaxResult.error("服务器错误");
}
/**
@@ -67,7 +69,8 @@ public class GlobalExceptionHandler
{
String requestURI = request.getRequestURI();
log.error("请求地址'{}',发生未知异常.", requestURI, e);
- return AjaxResult.error(e.getMessage());
+ //return AjaxResult.error(e.getMessage());
+ return AjaxResult.error("请求地址发生未知异常!");
}
/**
@@ -78,7 +81,8 @@ public class GlobalExceptionHandler
{
String requestURI = request.getRequestURI();
log.error("请求地址'{}',发生系统异常.", requestURI, e);
- return AjaxResult.error(e.getMessage());
+ //return AjaxResult.error(e.getMessage());
+ return AjaxResult.error("请求地址发生系统异常!");
}
/**
diff --git a/power-grid/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java b/power-grid/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java
index 25e77f2..abf6afc 100644
--- a/power-grid/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java
+++ b/power-grid/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java
@@ -3,6 +3,8 @@ package com.ruoyi.project.monitor.domain;
import java.util.Date;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -18,6 +20,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
*
* @author ruoyi
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class SysJob extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/monitor/domain/SysJobLog.java b/power-grid/src/main/java/com/ruoyi/project/monitor/domain/SysJobLog.java
index c7a3cd2..5149b01 100644
--- a/power-grid/src/main/java/com/ruoyi/project/monitor/domain/SysJobLog.java
+++ b/power-grid/src/main/java/com/ruoyi/project/monitor/domain/SysJobLog.java
@@ -1,6 +1,8 @@
package com.ruoyi.project.monitor.domain;
import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -11,6 +13,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
*
* @author ruoyi
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class SysJobLog extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java b/power-grid/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
index 147a0a5..577e015 100644
--- a/power-grid/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
+++ b/power-grid/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
@@ -2,6 +2,7 @@ package com.ruoyi.project.monitor.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
import com.ruoyi.framework.web.domain.BaseEntity;
@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
*
* @author ruoyi
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class SysLogininfor extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java b/power-grid/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java
index f17723d..00b4876 100644
--- a/power-grid/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java
+++ b/power-grid/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java
@@ -2,6 +2,7 @@ package com.ruoyi.project.monitor.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
import com.ruoyi.framework.web.domain.BaseEntity;
@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
*
* @author ruoyi
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class SysOperLog extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/apicontroller/ApiTheoryController.java b/power-grid/src/main/java/com/ruoyi/project/pro/apicontroller/ApiTheoryController.java
index 37bd830..7930057 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/apicontroller/ApiTheoryController.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/apicontroller/ApiTheoryController.java
@@ -157,7 +157,6 @@ public class ApiTheoryController extends BaseController {
}
byte[] buffer = new byte[fis.available()];
fis.read(buffer);
- fis.close();
// 清空response
response.reset();
toClient = new BufferedOutputStream(response.getOutputStream());
@@ -175,6 +174,13 @@ public class ApiTheoryController extends BaseController {
} catch (Exception e) {
logger.error("下载rar压缩包过程发生异常:", e);
} finally {
+ if (fis!=null){
+ try {
+ fis.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
if (toClient != null) {
try {
toClient.close();
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/controller/ProStudentController.java b/power-grid/src/main/java/com/ruoyi/project/pro/controller/ProStudentController.java
index ec38afd..56b0997 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/controller/ProStudentController.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/controller/ProStudentController.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.controller;
+import java.io.InputStream;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@@ -129,7 +130,11 @@ public class ProStudentController extends BaseController
@PostMapping(value = "/excelImport")
public AjaxResult excelImport(MultipartFile file, boolean updateSupport) throws Exception {
ExcelUtil util = new ExcelUtil(ProStudent.class);
- List userList = util.importExcel(file.getInputStream());
+ //List userList = util.importExcel(file.getInputStream()); 以下为修改后:
+ InputStream fileinputstream=null;
+ fileinputstream=file.getInputStream();
+ List userList = util.importExcel(fileinputstream);
+ fileinputstream.close();
String operName = getUsername();
String message = proStudentService.importUser(userList, updateSupport, operName,true,true);
return AjaxResult.success(message);
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/controller/ProTheoryQuestionController.java b/power-grid/src/main/java/com/ruoyi/project/pro/controller/ProTheoryQuestionController.java
index 7a726f6..db14cdd 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/controller/ProTheoryQuestionController.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/controller/ProTheoryQuestionController.java
@@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.List;
/**
@@ -103,12 +105,31 @@ public class ProTheoryQuestionController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('pro:question:add')")
@PostMapping("/excelImport")
- public AjaxResult excelImport(MultipartFile file, boolean updateSupport) throws Exception {
+ public AjaxResult excelImport(MultipartFile file, boolean updateSupport) {
ExcelUtil util = new ExcelUtil<>(ProTheoryQuestion.class);
- List list = util.importExcel(file.getInputStream());
- String operName = getUsername();
- String message = proTheoryQuestionService.excelImport(list, updateSupport, operName);
- return AjaxResult.success(message);
+ //List list = util.importExcel(file.getInputStream()); 以下为修改后的
+ InputStream fileInputStream = null;
+ try {
+ fileInputStream=file.getInputStream();
+ List list = util.importExcel(fileInputStream);
+ String operName = getUsername();
+ String message = proTheoryQuestionService.excelImport(list, updateSupport, operName);
+ return AjaxResult.success(message);
+ } catch (IOException e) {
+ e.printStackTrace();
+ return AjaxResult.error("失败!");
+ } catch (Exception e) {
+ e.printStackTrace();
+ return AjaxResult.error("失败!");
+ } finally {
+ if (fileInputStream!=null){
+ try {
+ fileInputStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
}
/**
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/OpeTaskInfo.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/OpeTaskInfo.java
index 86668ed..a1ea03d 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/OpeTaskInfo.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/OpeTaskInfo.java
@@ -1,10 +1,12 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
import javax.validation.constraints.NotNull;
+@JsonIgnoreProperties(ignoreUnknown = true)
public class OpeTaskInfo {
/**主键*/
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProActionDetail.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProActionDetail.java
index d247572..917a449 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProActionDetail.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProActionDetail.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-04-11
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProActionDetail extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProActionScene.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProActionScene.java
index 146b50e..7b485ca 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProActionScene.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProActionScene.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -13,6 +14,7 @@ import java.util.List;
* @author ruoyi
* @date 2023-02-14
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProActionScene extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProCheckPoint.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProCheckPoint.java
index 8d1741c..8ea2d7f 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProCheckPoint.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProCheckPoint.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-04-01
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProCheckPoint extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProClassInfo.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProClassInfo.java
index 47fc9df..98f5165 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProClassInfo.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProClassInfo.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-02-14
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProClassInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProClassStudentRelation.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProClassStudentRelation.java
index d71055f..4dc83d5 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProClassStudentRelation.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProClassStudentRelation.java
@@ -1,24 +1,31 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
+import javax.xml.bind.annotation.XmlAttribute;
+
/**
* 【请填写功能名称】对象 pro_class_student_relation
*
* @author ruoyi
* @date 2023-04-10
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProClassStudentRelation extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
+ @JsonIgnore
private Long id;
/** $column.columnComment */
+
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private Long stuId;
@@ -35,11 +42,12 @@ public class ProClassStudentRelation extends BaseEntity
{
return id;
}
+
public void setStuId(Long stuId)
{
this.stuId = stuId;
}
-
+ @XmlAttribute
public Long getStuId()
{
return stuId;
@@ -48,7 +56,7 @@ public class ProClassStudentRelation extends BaseEntity
{
this.classId = classId;
}
-
+ @XmlAttribute
public Long getClassId()
{
return classId;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProClassTask.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProClassTask.java
index c8df79a..6662378 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProClassTask.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProClassTask.java
@@ -3,22 +3,28 @@ package com.ruoyi.project.pro.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
+import javax.xml.bind.annotation.XmlAttribute;
+
/**
* 班级学习任务对象 pro_classcourse
*
* @author ruoyi
* @date 2023-04-11
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProClassTask extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
+ @JsonIgnore
private Long id;
/** 班级id */
@@ -55,11 +61,12 @@ public class ProClassTask extends BaseEntity
this.classId = classId;
}
+ @XmlAttribute
public Long getClassId()
{
return classId;
}
-
+ @XmlAttribute
public Long getTaskId() {
return taskId;
}
@@ -72,7 +79,7 @@ public class ProClassTask extends BaseEntity
{
this.beginTime = beginTime;
}
-
+ @XmlAttribute
public String getBeginTime()
{
return beginTime;
@@ -82,6 +89,7 @@ public class ProClassTask extends BaseEntity
this.endTime = endTime;
}
+ @XmlAttribute
public String getEndTime()
{
return endTime;
@@ -91,6 +99,7 @@ public class ProClassTask extends BaseEntity
this.finishStatus = finishStatus;
}
+ @XmlAttribute
public Integer getFinishStatus()
{
return finishStatus;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProCompany.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProCompany.java
index c785494..933a521 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProCompany.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProCompany.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-02-14
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProCompany extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProCourse.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProCourse.java
index d9a3f7a..812b757 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProCourse.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProCourse.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.sun.org.apache.xpath.internal.operations.Bool;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -12,6 +13,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-04-11
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProCourse extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProCourseTask.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProCourseTask.java
index 92b5e89..2ffcba7 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProCourseTask.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProCourseTask.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-04-11
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProCourseTask extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProDataModel.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProDataModel.java
index 0a0d29a..1b3cc99 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProDataModel.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProDataModel.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-03-06
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProDataModel extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProDevice.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProDevice.java
index 56831d3..926df71 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProDevice.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProDevice.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-02-14
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProDevice extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProDeviceTrouble.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProDeviceTrouble.java
index 76434f6..7a7f604 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProDeviceTrouble.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProDeviceTrouble.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -13,6 +14,7 @@ import java.util.List;
* @author ruoyi
* @date 2023-03-06
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProDeviceTrouble extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamAction.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamAction.java
index a4a31a5..fa5a179 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamAction.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamAction.java
@@ -1,6 +1,8 @@
package com.ruoyi.project.pro.domain;
import java.math.BigDecimal;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -12,6 +14,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-02-14
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProExamAction extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamActionmodel.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamActionmodel.java
index 7ff3b24..003b048 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamActionmodel.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamActionmodel.java
@@ -1,6 +1,8 @@
package com.ruoyi.project.pro.domain;
import java.math.BigDecimal;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -12,6 +14,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-04-02
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProExamActionmodel extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamClass.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamClass.java
index 05b58d6..ee38e64 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamClass.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamClass.java
@@ -5,6 +5,7 @@ import java.util.Date;
import java.util.TimeZone;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -16,6 +17,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-02-14
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProExamClass extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamSecure.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamSecure.java
index 8061e07..756bad3 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamSecure.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamSecure.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-03-29
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProExamSecure extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamSecuremodel.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamSecuremodel.java
index 22f2eeb..fc72fd1 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamSecuremodel.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamSecuremodel.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-04-02
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProExamSecuremodel extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamService.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamService.java
index ea40916..2682d1d 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamService.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamService.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -14,6 +15,7 @@ import java.util.List;
* @author ruoyi
* @date 2023-03-06
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProExamService extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamServicemodel.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamServicemodel.java
index 5be5e68..1c35d69 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamServicemodel.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamServicemodel.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-04-02
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProExamServicemodel extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamTheory.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamTheory.java
index e58ce7d..489d15e 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamTheory.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamTheory.java
@@ -1,6 +1,8 @@
package com.ruoyi.project.pro.domain;
import java.math.BigDecimal;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -12,6 +14,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-02-14
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProExamTheory extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamTheoryNew.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamTheoryNew.java
index d410231..b7fec37 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamTheoryNew.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamTheoryNew.java
@@ -1,6 +1,8 @@
package com.ruoyi.project.pro.domain;
import java.math.BigDecimal;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -12,6 +14,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-03-21
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProExamTheoryNew extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamTheorynewmodel.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamTheorynewmodel.java
index 1969c5a..ffcae80 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamTheorynewmodel.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamTheorynewmodel.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -9,10 +10,10 @@ import java.math.BigDecimal;
/**
* 模版试卷对象 pro_exam_theorynewmodel
- *
* @author ruoyi
* @date 2023-04-02
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProExamTheorynewmodel extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamination.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamination.java
index 5dc9bf6..a86330e 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamination.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExamination.java
@@ -5,6 +5,7 @@ import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import io.swagger.models.auth.In;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -17,6 +18,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-02-14
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProExamination extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExaminationmodel.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExaminationmodel.java
index bbe1b47..206193f 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExaminationmodel.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProExaminationmodel.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -14,6 +15,7 @@ import java.util.List;
* @author ruoyi
* @date 2023-04-02
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProExaminationmodel extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProScore.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProScore.java
index d0278ea..cbf5230 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProScore.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProScore.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-02-14
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProScore extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProSecurity.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProSecurity.java
index 035f723..b93a9ce 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProSecurity.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProSecurity.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -13,6 +14,7 @@ import java.util.List;
* @author ruoyi
* @date 2023-03-29
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProSecurity extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProSecurityProcedures.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProSecurityProcedures.java
index 4b90d34..b7c3aac 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProSecurityProcedures.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProSecurityProcedures.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-03-29
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProSecurityProcedures extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProStudent.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProStudent.java
index fb57fae..0d47774 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProStudent.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProStudent.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.ruoyi.project.pro.domain.vo.ProStudentVO;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -12,6 +13,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-02-14
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProStudent extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProStudytask.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProStudytask.java
index cedda8d..6e3b67f 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProStudytask.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProStudytask.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.ruoyi.project.pro.domain.vo.ProStudyTaskVO;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -12,6 +13,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-04-11
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProStudytask extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProTaskFinish.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProTaskFinish.java
index f7aa67d..91c0ff0 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProTaskFinish.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProTaskFinish.java
@@ -2,6 +2,7 @@ package com.ruoyi.project.pro.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -13,6 +14,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-04-12
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProTaskFinish extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProTheoryQuestion.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProTheoryQuestion.java
index f50240f..4748699 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProTheoryQuestion.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProTheoryQuestion.java
@@ -1,6 +1,8 @@
package com.ruoyi.project.pro.domain;
import java.math.BigDecimal;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -12,6 +14,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-02-14
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProTheoryQuestion extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProTroubleProcedure.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProTroubleProcedure.java
index e7136ad..d5ae42f 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProTroubleProcedure.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/ProTroubleProcedure.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -11,6 +12,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-03-06
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProTroubleProcedure extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ChangeCourseVo.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ChangeCourseVo.java
index b59e29e..71d34fc 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ChangeCourseVo.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ChangeCourseVo.java
@@ -1,10 +1,13 @@
package com.ruoyi.project.pro.domain.vo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
/**
* @author hudongdong
* @title ChangeCourseVo
* @date 2023/4/17下午3:59
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ChangeCourseVo {
private Long taskId;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ChangePasswordVO.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ChangePasswordVO.java
index b4c8d0c..95b82a1 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ChangePasswordVO.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ChangePasswordVO.java
@@ -1,10 +1,13 @@
package com.ruoyi.project.pro.domain.vo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
/**
* @author hudongdong
* @title ChangePasswordVO
* @date 2023/5/11下午2:07
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ChangePasswordVO {
private Long userId;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ChangeStudentClass.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ChangeStudentClass.java
index bbedb0c..e6fa703 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ChangeStudentClass.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ChangeStudentClass.java
@@ -1,5 +1,7 @@
package com.ruoyi.project.pro.domain.vo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
import java.util.Arrays;
/**
@@ -7,6 +9,7 @@ import java.util.Arrays;
* @title ChangeStudentClass
* @date 2023/4/10下午4:13
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ChangeStudentClass {
private Long classId;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/EditTheoryExam.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/EditTheoryExam.java
index 19694b2..a123215 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/EditTheoryExam.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/EditTheoryExam.java
@@ -1,10 +1,13 @@
package com.ruoyi.project.pro.domain.vo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
/**
* @author hudongdong
* @title EditTheoryExam
* @date 2023/4/2上午12:14
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class EditTheoryExam {
private Long examId;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ExamFinish.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ExamFinish.java
index 0782a16..16ff2d4 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ExamFinish.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ExamFinish.java
@@ -1,10 +1,13 @@
package com.ruoyi.project.pro.domain.vo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
/**
* @author hudongdong
* @title ExamFinish
* @date 2023/3/24下午4:47
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ExamFinish {
Long userId;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ProStudentVO.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ProStudentVO.java
index 97a4eca..0d2493a 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ProStudentVO.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ProStudentVO.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain.vo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -11,6 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* @author ruoyi
* @date 2023-02-14
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProStudentVO extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ProStudyTaskVO.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ProStudyTaskVO.java
index 2799ac1..ab31fb8 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ProStudyTaskVO.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/ProStudyTaskVO.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.pro.domain.vo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -11,6 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* @author ruoyi
* @date 2023-04-11
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class ProStudyTaskVO extends BaseEntity
{
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/StatisticsQueryVO.java b/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/StatisticsQueryVO.java
index 4a2c257..9e75d8f 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/StatisticsQueryVO.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/domain/vo/StatisticsQueryVO.java
@@ -1,10 +1,13 @@
package com.ruoyi.project.pro.domain.vo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
/**
* @author hudongdong
* @title StatisticsQueryVO
* @date 2023/4/25上午9:17
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class StatisticsQueryVO {
private String examName;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/service/impl/ProTheoryQuestionServiceImpl.java b/power-grid/src/main/java/com/ruoyi/project/pro/service/impl/ProTheoryQuestionServiceImpl.java
index 3243715..074586f 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/service/impl/ProTheoryQuestionServiceImpl.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/service/impl/ProTheoryQuestionServiceImpl.java
@@ -134,7 +134,10 @@ public class ProTheoryQuestionServiceImpl implements IProTheoryQuestionService {
successNum++;
successMsg.append("
" + successNum + "、试题 " + question.getQuestion() + " 导入成功");
} else if (isUpdateSupport) {
- question.setId(q.getId());
+ if (q.getId()!=null){
+ question.setId(q.getId());}else {
+ question.setId(-1L);
+ }
question.setUpdateBy(operName);
this.updateProTheoryQuestion(question);
successNum++;
diff --git a/power-grid/src/main/java/com/ruoyi/project/pro/util/Tool.java b/power-grid/src/main/java/com/ruoyi/project/pro/util/Tool.java
index c9da57c..f330870 100644
--- a/power-grid/src/main/java/com/ruoyi/project/pro/util/Tool.java
+++ b/power-grid/src/main/java/com/ruoyi/project/pro/util/Tool.java
@@ -17,22 +17,37 @@ public class Tool {
/** 文件字节流 */
public static byte[] getBytes(String filePath) {
byte[] buffer = null;
+ FileInputStream fis = null;
+ ByteArrayOutputStream bos=null;
try {
File file = new File(filePath);
- FileInputStream fis = new FileInputStream(file);
- ByteArrayOutputStream bos = new ByteArrayOutputStream(1000);
+ fis = new FileInputStream(file);
+ bos = new ByteArrayOutputStream(1000);
byte[] b = new byte[1000];
int n;
while ((n = fis.read(b)) != -1) {
bos.write(b, 0, n);
}
- fis.close();
- bos.close();
buffer = bos.toByteArray();
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
+ }finally {
+ if (fis!=null){
+ try {
+ fis.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ if (bos!=null){
+ try {
+ bos.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
}
return buffer;
}
diff --git a/power-grid/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/power-grid/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index a982d9a..aa31174 100644
--- a/power-grid/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/power-grid/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -1,5 +1,7 @@
package com.ruoyi.project.system.controller;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
@@ -74,10 +76,26 @@ public class SysUserController extends BaseController
@Log(title = "用户管理", businessType = BusinessType.IMPORT)
@PreAuthorize("@ss.hasPermi('system:user:import')")
@PostMapping("/importData")
- public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+ public AjaxResult importData(MultipartFile file, boolean updateSupport)
{
+ InputStream fileinputstream=null;
ExcelUtil util = new ExcelUtil(SysUser.class);
- List userList = util.importExcel(file.getInputStream());
+ List userList = null;
+ try {
+ fileinputstream=file.getInputStream();
+ userList = util.importExcel(fileinputstream);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }finally {
+ if (fileinputstream!=null){
+ try {
+ fileinputstream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
String operName = getUsername();
String message = userService.importUser(userList, updateSupport, operName);
return AjaxResult.success(message);
diff --git a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysConfig.java b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysConfig.java
index f9b290b..a854031 100644
--- a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysConfig.java
+++ b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysConfig.java
@@ -2,6 +2,8 @@ package com.ruoyi.project.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -13,6 +15,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
*
* @author ruoyi
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class SysConfig extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysDept.java b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysDept.java
index 9073439..bd7865e 100644
--- a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysDept.java
+++ b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysDept.java
@@ -5,6 +5,8 @@ import java.util.List;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.web.domain.BaseEntity;
@@ -14,6 +16,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
*
* @author ruoyi
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class SysDept extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysDictData.java b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysDictData.java
index d149653..65075c9 100644
--- a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysDictData.java
+++ b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysDictData.java
@@ -2,6 +2,8 @@ package com.ruoyi.project.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.constant.UserConstants;
@@ -14,6 +16,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
*
* @author ruoyi
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class SysDictData extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysDictType.java b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysDictType.java
index 7887e66..274955d 100644
--- a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysDictType.java
+++ b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysDictType.java
@@ -2,6 +2,8 @@ package com.ruoyi.project.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -13,6 +15,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
*
* @author ruoyi
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class SysDictType extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysMenu.java b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysMenu.java
index 9592387..56d61d3 100644
--- a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysMenu.java
+++ b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysMenu.java
@@ -5,6 +5,9 @@ import java.util.List;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.web.domain.BaseEntity;
@@ -14,6 +17,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
*
* @author ruoyi
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class SysMenu extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysNotice.java b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysNotice.java
index 8b315a0..3858778 100644
--- a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysNotice.java
+++ b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysNotice.java
@@ -2,6 +2,8 @@ package com.ruoyi.project.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.xss.Xss;
@@ -12,6 +14,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
*
* @author ruoyi
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class SysNotice extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysPost.java b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysPost.java
index c41a995..bdb386d 100644
--- a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysPost.java
+++ b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysPost.java
@@ -2,6 +2,8 @@ package com.ruoyi.project.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -13,6 +15,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
*
* @author ruoyi
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class SysPost extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysRole.java b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysRole.java
index 3ecb512..8b0c587 100644
--- a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysRole.java
+++ b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysRole.java
@@ -2,6 +2,8 @@ package com.ruoyi.project.system.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -13,6 +15,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
*
* @author ruoyi
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class SysRole extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysUser.java
index 2243595..b8bbd64 100644
--- a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysUser.java
+++ b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysUser.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.system.domain;
import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ruoyi.common.xss.Xss;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -22,6 +23,7 @@ import java.util.List;
*
* @author ruoyi
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class SysUser extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysUserRole.java b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysUserRole.java
index 3be4829..0a63939 100644
--- a/power-grid/src/main/java/com/ruoyi/project/system/domain/SysUserRole.java
+++ b/power-grid/src/main/java/com/ruoyi/project/system/domain/SysUserRole.java
@@ -1,5 +1,6 @@
package com.ruoyi.project.system.domain;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -8,6 +9,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
*
* @author ruoyi
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class SysUserRole
{
/** 用户ID */
diff --git a/power-grid/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java b/power-grid/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java
index e8aab88..b06f10a 100644
--- a/power-grid/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java
+++ b/power-grid/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java
@@ -3,6 +3,8 @@ package com.ruoyi.project.tool.gen.domain;
import java.util.List;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.ArrayUtils;
import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.utils.StringUtils;
@@ -13,6 +15,7 @@ import com.ruoyi.framework.web.domain.BaseEntity;
*
* @author ruoyi
*/
+@JsonIgnoreProperties(ignoreUnknown = true)
public class GenTable extends BaseEntity
{
private static final long serialVersionUID = 1L;
diff --git a/power-grid/src/main/resources/application-druid.yml b/power-grid/src/main/resources/application-druid.yml
index 2e3b692..4a78452 100644
--- a/power-grid/src/main/resources/application-druid.yml
+++ b/power-grid/src/main/resources/application-druid.yml
@@ -1,3 +1,8 @@
+jasypt:
+ encryptor:
+ algorithm: PBEWithMD5AndDES
+ iv-generator-classname: org.jasypt.iv.NoIvGenerator
+ password: tzcc
# 数据源配置
spring:
datasource:
@@ -8,8 +13,10 @@ spring:
master:
#url: jdbc:mysql://47.99.240.224:3306/power_grid?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://localhost:3306/power-grid-new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123
+ #username: root
+ #password: 123
+ username: ENC(tUMk/Zrm0WwnvlYOijgMAg==)
+ password: ENC(ZUwlFp053Ta08/vOZzi6EA==)
#password: xs1s123456
# 从库数据源
slave:
@@ -46,7 +53,7 @@ spring:
url-pattern: /druid/*
# 控制台管理用户名和密码
login-username: ruoyi
- login-password: 123456
+ login-password: ENC(CTFACSl8cADogCA3FHkEOQ==)
filter:
stat:
enabled: true