From d901d9fca745e697ba0b79454954c7fc092fe59e Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Wed, 3 May 2023 15:54:29 +0300
Subject: [PATCH] =?UTF-8?q?trade-importer=20http://jira.mfd.msk:8088/brows?=
 =?UTF-8?q?e/CLS-276=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B2?=
 =?UTF-8?q?=20z=5Fdistr,=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.properties |  2 +-
 .../src/main/resources/logback.xml            | 38 +++++++++++++++++++
 pom.xml                                       |  1 +
 z-distr/pom.xml                               | 19 ++++++++++
 .../src/main/resources/distr/bin/kill_all.sh  |  1 +
 .../main/resources/distr/bin/launch_all.sh    |  1 +
 .../resources/distr/bin/trade-importer.sh     |  9 +++++
 7 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 clearing-parent/trade-importer/src/main/resources/logback.xml
 create mode 100644 z-distr/src/main/resources/distr/bin/trade-importer.sh

diff --git a/clearing-parent/trade-importer/src/main/resources/application.properties b/clearing-parent/trade-importer/src/main/resources/application.properties
index dc8f7ba47..e2cfdbd94 100644
--- a/clearing-parent/trade-importer/src/main/resources/application.properties
+++ b/clearing-parent/trade-importer/src/main/resources/application.properties
@@ -13,7 +13,7 @@ trade-importer.hazelcast.login=dev
 trade-importer.hazelcast.password=dev-pass
 
 trade-importer.kafka-consumer.bootstrap-servers=localhost:9092
-trade-importer.kafka-consumer.group-id=dev-group- trade-importer
+trade-importer.kafka-consumer.group-id=dev-group-trade-importer
 trade-importer.kafka-consumer.enable-auto-commit=false
 trade-importer.kafka-consumer.session-timeout-ms=30000
 trade-importer.kafka-consumer.auto-offset-reset=latest
diff --git a/clearing-parent/trade-importer/src/main/resources/logback.xml b/clearing-parent/trade-importer/src/main/resources/logback.xml
new file mode 100644
index 000000000..c49a8bbd0
--- /dev/null
+++ b/clearing-parent/trade-importer/src/main/resources/logback.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+<!--            |%X{ru.nbch.scoring.web.logging.mdc_key}-->
+			<Pattern>%date{HH:mm:ss.SSS} [%thread] %-5level %class{0}:%line - %message%n</Pattern>
+			<charset>utf-8</charset>
+		</encoder>
+	</appender>
+	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>./logs/trade-importer.log</file>
+        <encoder>
+<!--            |%X{ru.nbch.scoring.web.logging.mdc_key}-->
+            <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %class{0}:%msg%n</Pattern>
+            <charset>utf8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+            <fileNamePattern>
+                ./logs/trade-importer.%i.log
+            </fileNamePattern>
+            <minIndex>1</minIndex>
+            <maxIndex>10</maxIndex>
+        </rollingPolicy>
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <maxFileSize>500MB</maxFileSize>
+        </triggeringPolicy>
+    </appender>
+
+	<root level="warn">
+		<appender-ref ref="CONSOLE"/>
+		<appender-ref ref="FILE"/>
+	</root>
+
+    <logger name="ru.spcex" level="debug" additivity="false">
+        <appender-ref ref="FILE"/>
+        <appender-ref ref="CONSOLE"/>
+    </logger>
+</configuration>
diff --git a/pom.xml b/pom.xml
index e21bc656f..ce3a0c7c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
         <folder_root_clearing_imdg>${folder_root_clearing}/clearing-parent/imdg</folder_root_clearing_imdg>
         <folder_root_dbf-exporter>${folder_root_clearing}/clearing-parent/dbf-exporter</folder_root_dbf-exporter>
         <folder_root_dbf-importer>${folder_root_clearing}/clearing-parent/dbf-importer</folder_root_dbf-importer>
+        <folder_root_trade-importer>${folder_root_clearing}/clearing-parent/trade-importer</folder_root_trade-importer>
         <folder_root_account-service>${folder_root_clearing}/clearing-parent/account-service</folder_root_account-service>
         <folder_root_balance-service>${folder_root_clearing}/clearing-parent/balance-service</folder_root_balance-service>
         <folder_root_company-service>${folder_root_clearing}/clearing-parent/company-service</folder_root_company-service>
diff --git a/z-distr/pom.xml b/z-distr/pom.xml
index 2414ad7fb..819183670 100644
--- a/z-distr/pom.xml
+++ b/z-distr/pom.xml
@@ -191,6 +191,25 @@
                                     </fileSets>
                                 </configuration>
                             </execution>
+                            <execution>
+                                <id>copy-trade-importer-bin</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                                <configuration>
+                                    <fileSets>
+                                        <fileSet>
+                                            <sourceFile>${folder_root_trade-importer}/target/trade-importer.jar</sourceFile>
+                                            <destinationFile>${folder.clearing.distr.modules}/trade-importer/trade-importer.jar</destinationFile>
+                                        </fileSet>
+                                        <fileSet>
+                                            <sourceFile>${folder_root_trade-importer}/src/main/resources/application.properties</sourceFile>
+                                            <destinationFile>${folder.clearing.distr.modules}/trade-importer/application.properties</destinationFile>
+                                        </fileSet>
+                                    </fileSets>
+                                </configuration>
+                            </execution>
                             <execution>
                                 <id>copy-account-service-bin</id>
                                 <phase>prepare-package</phase>
diff --git a/z-distr/src/main/resources/distr/bin/kill_all.sh b/z-distr/src/main/resources/distr/bin/kill_all.sh
index 4e9010ebd..f4da3e400 100644
--- a/z-distr/src/main/resources/distr/bin/kill_all.sh
+++ b/z-distr/src/main/resources/distr/bin/kill_all.sh
@@ -7,6 +7,7 @@ kill -9 $(ps -ef | grep java | grep company-service.jar  | awk '{print $2}')
 kill -9 $(ps -ef | grep java | grep clearing-service.jar  | awk '{print $2}')
 kill -9 $(ps -ef | grep java | grep dbf-exporter.jar | awk '{print $2}')
 kill -9 $(ps -ef | grep java | grep dbf-importer.jar | awk '{print $2}')
+kill -9 $(ps -ef | grep java | grep trade-importer.jar | awk '{print $2}')
 kill -9 $(ps -ef | grep java | grep imdg.jar | awk '{print $2}')
 kill -9 $(ps -ef | grep java | grep securities-service.jar | awk '{print $2}')
 kill -9 $(ps -ef | grep java | grep utility-service.jar | awk '{print $2}')
diff --git a/z-distr/src/main/resources/distr/bin/launch_all.sh b/z-distr/src/main/resources/distr/bin/launch_all.sh
index 6e5336f8c..18e90c4b0 100644
--- a/z-distr/src/main/resources/distr/bin/launch_all.sh
+++ b/z-distr/src/main/resources/distr/bin/launch_all.sh
@@ -8,6 +8,7 @@ cd /opt/mfd/clearing/bin
 /opt/mfd/clearing/bin/clearing-service.sh
 /opt/mfd/clearing/bin/dbf-exporter.sh
 /opt/mfd/clearing/bin/dbf-importer.sh
+/opt/mfd/clearing/bin/trade-importer.sh
 /opt/mfd/clearing/bin/securities-service.sh
 /opt/mfd/clearing/bin/utility-service.sh
 /opt/mfd/clearing/bin/scheduler-service.sh
diff --git a/z-distr/src/main/resources/distr/bin/trade-importer.sh b/z-distr/src/main/resources/distr/bin/trade-importer.sh
new file mode 100644
index 000000000..3e4a60f8c
--- /dev/null
+++ b/z-distr/src/main/resources/distr/bin/trade-importer.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+CLEARING_HOME=/opt/mfd/clearing/
+cd $CLEARING_HOME/bin
+
+CMD="java -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=7100 -jar trade-importer.jar --spring.config.location=$CLEARING_HOME/settings/trade-importer/"
+
+$CMD >/dev/null 2>&1 &
+