From 7b11adfa2e4c8f0a00ba746e99097eb2253ba1b1 Mon Sep 17 00:00:00 2001 From: etreshenkov Date: Thu, 4 Aug 2022 12:27:19 +0300 Subject: [PATCH] add distr --- .../controller/DefaultController.java | 4 +-- clearing-parent/dbf-exporter/pom.xml | 4 +++ .../controller/DefaultController.java | 28 +++++++++++++++++++ clearing-parent/dbf-importer/pom.xml | 4 +++ .../controller/DefaultController.java | 28 +++++++++++++++++++ .../importer/services/DBFLoaderService.java | 2 -- 6 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/controller/DefaultController.java create mode 100644 clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/controller/DefaultController.java diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/DefaultController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/DefaultController.java index 210417b99..e24113248 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/DefaultController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/DefaultController.java @@ -18,8 +18,8 @@ public class DefaultController implements InitializingBean { @RequestMapping(method = RequestMethod.GET, path = "/anonymous/method1", produces = MediaType.TEXT_PLAIN_VALUE) @ResponseBody public String processGet() { - log.info("controller method1"); - return "use post"; + log.info("Call test method for backend-api controller"); + return "backend-api controller test method"; } @RequestMapping(method = RequestMethod.GET, path = "/users/method2", produces = MediaType.TEXT_PLAIN_VALUE) diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index 4d5903f0f..07e679fee 100644 --- a/clearing-parent/dbf-exporter/pom.xml +++ b/clearing-parent/dbf-exporter/pom.xml @@ -21,6 +21,10 @@ org.springframework.boot spring-boot-starter + + org.springframework.boot + spring-boot-starter-web + org.springframework.boot spring-boot-autoconfigure diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/controller/DefaultController.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/controller/DefaultController.java new file mode 100644 index 000000000..f9497f339 --- /dev/null +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/controller/DefaultController.java @@ -0,0 +1,28 @@ +package ru.spcex.clearing.dbf.exporter.controller; + + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +@Controller("/") +public class DefaultController implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + @RequestMapping(method = RequestMethod.GET, path = "/test", produces = MediaType.TEXT_PLAIN_VALUE) + @ResponseBody + public String processGet() { + log.info("Call test method for exporter controller"); + return "exporter controller test method"; + } + + @Override + public void afterPropertiesSet() throws Exception { + log.info("controller started"); + } +} diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml index cc1df470b..f60b0b139 100644 --- a/clearing-parent/dbf-importer/pom.xml +++ b/clearing-parent/dbf-importer/pom.xml @@ -22,6 +22,10 @@ org.springframework.boot spring-boot-starter + + org.springframework.boot + spring-boot-starter-web + org.springframework.boot spring-boot-autoconfigure diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/controller/DefaultController.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/controller/DefaultController.java new file mode 100644 index 000000000..a1af6e10e --- /dev/null +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/controller/DefaultController.java @@ -0,0 +1,28 @@ +package ru.spcex.clearing.dbf.importer.controller; + + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +@Controller("/") +public class DefaultController implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + @RequestMapping(method = RequestMethod.GET, path = "/test", produces = MediaType.TEXT_PLAIN_VALUE) + @ResponseBody + public String processGet() { + log.info("Call test method for importer controller"); + return "importer controller test method"; + } + + @Override + public void afterPropertiesSet() throws Exception { + log.info("controller started"); + } +} 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 f5c6c58f6..d965efd04 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 @@ -11,7 +11,6 @@ import java.util.Arrays; import java.util.List; @Service -//@EnableScheduling public class DBFLoaderService { private final AProperties properties; private final MessageListener messageListener; @@ -25,7 +24,6 @@ public class DBFLoaderService { this.pipeline = pipeline; } -// @Scheduled(fixedDelayString = "${dbf.execute-timeout}") public void run() { List newTaskList = messageListener.getTasks(); for (ResultContainer newTask : newTaskList) {