From b8b95430c6d7866366c7dc42bafdbc727aca7341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B0=D0=BA=D0=B8=D0=BC=D1=83=D0=BB=D0=BB=D0=B8?= =?UTF-8?q?=D0=BD=20=D0=90=D1=80=D1=82=D1=91=D0=BC?= Date: Tue, 20 Aug 2024 10:28:41 +0300 Subject: [PATCH] WEBBPM-SUPPORT-8471: add liquibase --- .../java/esia/service/impl/ScheduledLoadDataService.java | 7 ++++++- .../db.changelog/v_1.0/2024-19-09--01-init-db.xml | 2 +- frontend/src/resources/app-config.json | 2 +- frontend/src/resources/app.version | 2 +- pom.xml | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/esia/service/impl/ScheduledLoadDataService.java b/backend/src/main/java/esia/service/impl/ScheduledLoadDataService.java index adc8d478..48ad8bfb 100644 --- a/backend/src/main/java/esia/service/impl/ScheduledLoadDataService.java +++ b/backend/src/main/java/esia/service/impl/ScheduledLoadDataService.java @@ -1,5 +1,8 @@ package esia.service.impl; +import java.util.List; + +import esia.model.OrganizationModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -18,12 +21,14 @@ public class ScheduledLoadDataService { private Boolean isEnableCron; @Scheduled(cron = "${data.load.cron}") - public void loadData(String code) { + public List loadDataEveryPeriod(String code) { if (isEnableCron) { log.info("Loading data from database"); //TODO: задание получает справочник и сохраняет его в СУБД. Сделать после добавление таблиц в бд + } else { log.debug("Data was not loaded"); + } } diff --git a/backend/src/main/resources/db.changelog/v_1.0/2024-19-09--01-init-db.xml b/backend/src/main/resources/db.changelog/v_1.0/2024-19-09--01-init-db.xml index 9bc907e5..66fbb613 100644 --- a/backend/src/main/resources/db.changelog/v_1.0/2024-19-09--01-init-db.xml +++ b/backend/src/main/resources/db.changelog/v_1.0/2024-19-09--01-init-db.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd"> - create table + \ No newline at end of file diff --git a/frontend/src/resources/app-config.json b/frontend/src/resources/app-config.json index 2ccb6a6a..442b79c2 100644 --- a/frontend/src/resources/app-config.json +++ b/frontend/src/resources/app-config.json @@ -4,7 +4,7 @@ "filter_cleanup_interval_hours": 720, "filter_cleanup_check_period_minutes": 30, "auth_method": "form", - "enable.version.in.url": "%enable.version.in.url%", + "enable.version.in.url": "false", "guard.confirm_exit": false, "message_service_error_timeout": "", "message_service_warning_timeout": "", diff --git a/frontend/src/resources/app.version b/frontend/src/resources/app.version index 8b9b8b3d..5deada82 100644 --- a/frontend/src/resources/app.version +++ b/frontend/src/resources/app.version @@ -1 +1 @@ -%project.version% \ No newline at end of file +1.0.0-SNAPSHOT \ No newline at end of file diff --git a/pom.xml b/pom.xml index d7ac97c1..1a111f45 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ UTF-8 false 2.9.2 - 3.177.0 + 3.178.0-SNAPSHOT 72000 6.15.0