From 72de7e595a0eb0f0ca55a80761ba28c2b7c00b27 Mon Sep 17 00:00:00 2001 From: etreshenkov Date: Thu, 4 Aug 2022 12:03:56 +0300 Subject: [PATCH] add distr --- clearing-parent/dbf-exporter/pom.xml | 10 ++++++++++ .../dbf/exporter/config/DBFExportConfig.java | 4 +++- .../dbf/exporter/logic/stages/ExportFromDB.java | 2 +- .../exporter/logic/stages/PrepareDBFFiles.java | 2 +- .../dbf/exporter/properties/AProperties.java | 5 +---- ...export.properties => application.properties} | 0 .../dbf-exporter/src/main/resources/logback.xml | 2 +- .../dbf/importer/config/DBFLoaderConfig.java | 4 +++- .../dbf/importer/logic/stages/ImportToDB.java | 2 +- .../dbf/importer/properties/AProperties.java | 5 +---- .../dbf/importer/services/DBFLoaderService.java | 6 ++---- .../importer/services/FileMessageListener.java | 17 +---------------- ...loader.properties => application.properties} | 0 .../dbf-importer/src/main/resources/logback.xml | 2 +- z-distr/pom.xml | 8 ++++++++ .../distr/modules/dbf-exporter/Dockerfile | 3 ++- .../distr/modules/dbf-importer/Dockerfile | 3 ++- 17 files changed, 38 insertions(+), 37 deletions(-) rename clearing-parent/dbf-exporter/src/main/resources/{dbf_export.properties => application.properties} (100%) rename clearing-parent/dbf-importer/src/main/resources/{dbf_loader.properties => application.properties} (100%) diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index f60d3c4cb..4d5903f0f 100644 --- a/clearing-parent/dbf-exporter/pom.xml +++ b/clearing-parent/dbf-exporter/pom.xml @@ -49,6 +49,16 @@ + + + src/main/resources + + application.properties + + false + + + org.springframework.boot diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/config/DBFExportConfig.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/config/DBFExportConfig.java index 2877a307d..8343b0c20 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/config/DBFExportConfig.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/config/DBFExportConfig.java @@ -2,6 +2,7 @@ package ru.spcex.clearing.dbf.exporter.config; import com.mchange.v2.c3p0.ComboPooledDataSource; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -18,12 +19,13 @@ import java.util.LinkedList; import java.util.List; @Configuration +@EnableConfigurationProperties @ComponentScan(basePackages = {"ru.spcex.clearing.dbf.exporter"}) public class DBFExportConfig { private final AProperties properties; private final ApplicationContext context; - public DBFExportConfig(@Qualifier("dbfExportProperties") AProperties properties, ApplicationContext context) { + public DBFExportConfig(@Qualifier("dbfExporterProperties") AProperties properties, ApplicationContext context) { this.properties = properties; this.context = context; } diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/ExportFromDB.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/ExportFromDB.java index 6592a34f6..07142a7b8 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/ExportFromDB.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/ExportFromDB.java @@ -38,7 +38,7 @@ public class ExportFromDB extends Stage implements InitializingBean { private Charset dbfCharset; - public ExportFromDB(@Qualifier("dbfExportProperties") AProperties properties, + public ExportFromDB(@Qualifier("dbfExporterProperties") AProperties properties, @Qualifier("dbfJdbcTemplate") JdbcTemplate dbfJdbcTemplate) { this.properties = properties; this.dbfJdbcTemplate = dbfJdbcTemplate; diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFiles.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFiles.java index ab2ba336e..99195cff4 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFiles.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFiles.java @@ -23,7 +23,7 @@ public class PrepareDBFFiles extends Stage implements InitializingBean { private final AProperties properties; private String outDirWithDateTime; - public PrepareDBFFiles(@Qualifier("dbfExportProperties") AProperties properties) { + public PrepareDBFFiles(@Qualifier("dbfExporterProperties") AProperties properties) { this.properties = properties; } diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/properties/AProperties.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/properties/AProperties.java index 7bdf2a673..c2260f04e 100644 --- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/properties/AProperties.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/properties/AProperties.java @@ -1,12 +1,9 @@ package ru.spcex.clearing.dbf.exporter.properties; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Component; -@Component("dbfExportProperties") -@PropertySource(value = {"classpath:dbf_export.properties"}) -@PropertySource(value = {"file:dbf_export.properties"}, ignoreResourceNotFound = true) +@Component("dbfExporterProperties") public class AProperties { @Value("${db.jdbc-url}") diff --git a/clearing-parent/dbf-exporter/src/main/resources/dbf_export.properties b/clearing-parent/dbf-exporter/src/main/resources/application.properties similarity index 100% rename from clearing-parent/dbf-exporter/src/main/resources/dbf_export.properties rename to clearing-parent/dbf-exporter/src/main/resources/application.properties diff --git a/clearing-parent/dbf-exporter/src/main/resources/logback.xml b/clearing-parent/dbf-exporter/src/main/resources/logback.xml index 3836401d5..f69e3db9a 100644 --- a/clearing-parent/dbf-exporter/src/main/resources/logback.xml +++ b/clearing-parent/dbf-exporter/src/main/resources/logback.xml @@ -8,7 +8,7 @@ - ./logs//dbf_export.log + ./logs/dbf_exporter.log UTF-8 %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/config/DBFLoaderConfig.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/config/DBFLoaderConfig.java index 628a9f367..b7b91eecb 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/config/DBFLoaderConfig.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/config/DBFLoaderConfig.java @@ -2,6 +2,7 @@ package ru.spcex.clearing.dbf.importer.config; import com.mchange.v2.c3p0.ComboPooledDataSource; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -18,12 +19,13 @@ import java.util.LinkedList; import java.util.List; @Configuration +@EnableConfigurationProperties @ComponentScan(basePackages = {"ru.spcex.clearing.dbf.importer"}) public class DBFLoaderConfig { private final AProperties properties; private final ApplicationContext context; - public DBFLoaderConfig(@Qualifier("dbfLoaderProperties") AProperties properties, ApplicationContext context) { + public DBFLoaderConfig(@Qualifier("dbfImporterProperties") AProperties properties, ApplicationContext context) { this.properties = properties; this.context = context; } diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/stages/ImportToDB.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/stages/ImportToDB.java index 1f6fd8260..b40b3ae0e 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/stages/ImportToDB.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/stages/ImportToDB.java @@ -31,7 +31,7 @@ public class ImportToDB extends Stage { private final AProperties properties; private final JdbcTemplate dbfJdbcTemplate; - public ImportToDB(@Qualifier("dbfLoaderProperties") AProperties properties, + public ImportToDB(@Qualifier("dbfImporterProperties") AProperties properties, @Qualifier("dbfJdbcTemplate") JdbcTemplate dbfJdbcTemplate) { this.properties = properties; this.dbfJdbcTemplate = dbfJdbcTemplate; diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/properties/AProperties.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/properties/AProperties.java index adb7670aa..824d1ecba 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/properties/AProperties.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/properties/AProperties.java @@ -1,12 +1,9 @@ package ru.spcex.clearing.dbf.importer.properties; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Component; -@Component("dbfLoaderProperties") -@PropertySource(value = {"classpath:dbf_loader.properties"}) -@PropertySource(value = {"file:dbf_loader.properties"}, ignoreResourceNotFound = true) +@Component("dbfImporterProperties") public class AProperties { @Value("${db.jdbc-url}") diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/DBFLoaderService.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/DBFLoaderService.java index efa42461a..f5c6c58f6 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/DBFLoaderService.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/DBFLoaderService.java @@ -1,8 +1,6 @@ package ru.spcex.clearing.dbf.importer.services; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import ru.spcex.clearing.dbf.importer.logic.data.ResultContainer; import ru.spcex.clearing.dbf.importer.logic.data.enums.StageResult; @@ -13,7 +11,7 @@ import java.util.Arrays; import java.util.List; @Service -@EnableScheduling +//@EnableScheduling public class DBFLoaderService { private final AProperties properties; private final MessageListener messageListener; @@ -27,7 +25,7 @@ public class DBFLoaderService { this.pipeline = pipeline; } - @Scheduled(fixedDelayString = "${dbf.execute-timeout}") +// @Scheduled(fixedDelayString = "${dbf.execute-timeout}") public void run() { List newTaskList = messageListener.getTasks(); for (ResultContainer newTask : newTaskList) { diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/FileMessageListener.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/FileMessageListener.java index dff851486..308c17201 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/FileMessageListener.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/FileMessageListener.java @@ -2,11 +2,7 @@ package ru.spcex.clearing.dbf.importer.services; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import ru.spcex.clearing.dbf.importer.exceptions.ConfigException; import ru.spcex.clearing.dbf.importer.logic.data.enums.Table; import ru.spcex.clearing.dbf.importer.properties.AProperties; @@ -19,8 +15,7 @@ import java.util.LinkedList; import java.util.List; @Service("fileMessageListener") -@EnableScheduling -public class FileMessageListener extends MessageListener implements InitializingBean { +public class FileMessageListener extends MessageListener { private final Logger log = LoggerFactory.getLogger(getClass()); private final AProperties properties; @@ -29,7 +24,6 @@ public class FileMessageListener extends MessageListener implements Initializing } @Override - @Scheduled(fixedDelayString = "${dbf.check-source-timeout}") public void checkMessage() { String srcDir = properties.getSrcDir(); List dbfFiles = lsDBF(srcDir); @@ -75,13 +69,4 @@ public class FileMessageListener extends MessageListener implements Initializing return resultFiles; } - - @Override - public void afterPropertiesSet() { - String dbfSourceDirPath = properties.getSrcDir(); - File dbfSourceDir = new File(dbfSourceDirPath); - - if (!dbfSourceDir.exists()) throw new ConfigException(String.format("DBF directory (%s) doesn't exist", dbfSourceDirPath)); - if (!dbfSourceDir.isDirectory()) throw new ConfigException(String.format("DBF path (%s) isn't directory", dbfSourceDirPath)); - } } diff --git a/clearing-parent/dbf-importer/src/main/resources/dbf_loader.properties b/clearing-parent/dbf-importer/src/main/resources/application.properties similarity index 100% rename from clearing-parent/dbf-importer/src/main/resources/dbf_loader.properties rename to clearing-parent/dbf-importer/src/main/resources/application.properties diff --git a/clearing-parent/dbf-importer/src/main/resources/logback.xml b/clearing-parent/dbf-importer/src/main/resources/logback.xml index 346a824bb..902144168 100644 --- a/clearing-parent/dbf-importer/src/main/resources/logback.xml +++ b/clearing-parent/dbf-importer/src/main/resources/logback.xml @@ -8,7 +8,7 @@ - ./logs//dbf_loader.log + ./logs/dbf_importer.log UTF-8 %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n diff --git a/z-distr/pom.xml b/z-distr/pom.xml index 6e7e480cc..5e1924958 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -119,6 +119,10 @@ ${folder_root_dbf-exporter}/target/dbf-exporter.jar ${folder.clearing.distr.modules}/dbf-exporter/dbf-exporter.jar + + ${folder_root_dbf-exporter}/src/main/resources/application.properties + ${folder.clearing.distr.modules}/dbf-exporter/application.properties + @@ -134,6 +138,10 @@ ${folder_root_dbf-importer}/target/dbf-importer.jar ${folder.clearing.distr.modules}/dbf-importer/dbf-importer.jar + + ${folder_root_dbf-importer}/src/main/resources/application.properties + ${folder.clearing.distr.modules}/dbf-importer/application.properties + diff --git a/z-distr/src/main/resources/distr/modules/dbf-exporter/Dockerfile b/z-distr/src/main/resources/distr/modules/dbf-exporter/Dockerfile index 676abb75f..807d556df 100644 --- a/z-distr/src/main/resources/distr/modules/dbf-exporter/Dockerfile +++ b/z-distr/src/main/resources/distr/modules/dbf-exporter/Dockerfile @@ -1,5 +1,6 @@ FROM debian:stable-20220125-jdk17 ADD dbf-exporter.jar /opt/clearing/bin/dbf-exporter.jar +ADD application.properties /opt/clearing/bin/application.properties USER root -ENTRYPOINT java -jar /opt/clearing/bin/dbf-exporter.jar +ENTRYPOINT java -jar /opt/clearing/bin/dbf-exporter.jar --spring.config.location=/opt/clearing/bin/ diff --git a/z-distr/src/main/resources/distr/modules/dbf-importer/Dockerfile b/z-distr/src/main/resources/distr/modules/dbf-importer/Dockerfile index 1cdf3eac8..943ab4d69 100644 --- a/z-distr/src/main/resources/distr/modules/dbf-importer/Dockerfile +++ b/z-distr/src/main/resources/distr/modules/dbf-importer/Dockerfile @@ -1,5 +1,6 @@ FROM debian:stable-20220125-jdk17 ADD dbf-importer.jar /opt/clearing/bin/dbf-importer.jar +ADD application.properties /opt/clearing/bin/application.properties USER root -ENTRYPOINT java -jar /opt/clearing/bin/dbf-importer.jar +ENTRYPOINT java -jar /opt/clearing/bin/dbf-importer.jar --spring.config.location=/opt/clearing/bin/