From e18d8c96647cf8d06fc07b985e1526081e3cced8 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 26 Dec 2022 15:21:48 +0300 Subject: [PATCH] =?UTF-8?q?reports-service=20=D0=B4=D0=BE=D0=B1=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D1=83=20ReportModuleOut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../element/ReportsServiceSettings.java | 34 ++++++++----------- .../src/main/resources/application.properties | 1 + 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/element/ReportsServiceSettings.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/element/ReportsServiceSettings.java index 7cb550e10..a79eaa702 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/element/ReportsServiceSettings.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/config/element/ReportsServiceSettings.java @@ -3,18 +3,19 @@ package ru.spcex.clearing.reports.config.element; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Component; -//import ru.spcex.clearing.platform.messaging.config.element.KafkaConsumerSettings; -//import ru.spcex.clearing.platform.messaging.config.element.KafkaProducerSettings; import ru.spcex.platform.imdg.iml.hazelcast.config.HazelcastClientParams; +/** + * Параметр запуска: XMLReportBuilder + * --spring.config.location=E:/MFD_GIT_REPO/clearing/clearing-parent/reports-service/src/main/resources + * + */ @Component @PropertySource("file:${spring.config.location}/application.properties") -//todo for test @PropertySource("classpath:application.properties") @ConfigurationProperties("reports-service") public class ReportsServiceSettings { private HazelcastClientParams hazelcast; -// private KafkaConsumerSettings kafkaConsumer; -// private KafkaProducerSettings kafkaProducer; + private String reportModuleOut; public HazelcastClientParams getHazelcast() { return hazelcast; @@ -24,19 +25,12 @@ public class ReportsServiceSettings { this.hazelcast = hazelcast; } -// public KafkaConsumerSettings getKafkaConsumer() { -// return kafkaConsumer; -// } -// -// public void setKafkaConsumer(KafkaConsumerSettings kafkaConsumer) { -// this.kafkaConsumer = kafkaConsumer; -// } -// -// public KafkaProducerSettings getKafkaProducer() { -// return kafkaProducer; -// } -// -// public void setKafkaProducer(KafkaProducerSettings kafkaProducer) { -// this.kafkaProducer = kafkaProducer; -// } + + public String getReportModuleOut() { + return reportModuleOut; + } + + public void setReportModuleOut(String reportModuleOut) { + this.reportModuleOut = reportModuleOut; + } } diff --git a/clearing-parent/reports-service/src/main/resources/application.properties b/clearing-parent/reports-service/src/main/resources/application.properties index 514eaa82e..6c2158643 100644 --- a/clearing-parent/reports-service/src/main/resources/application.properties +++ b/clearing-parent/reports-service/src/main/resources/application.properties @@ -5,3 +5,4 @@ spring.main.web-application-type=servlet reports-service.hazelcast.cluster-members=127.0.0.1:5701 reports-service.hazelcast.login=dev reports-service.hazelcast.password=dev-pass +reports-service.ReportModuleOut=./report_out