From a722c869073a9d7e0e7df2906cd172a57123ccd4 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Fri, 26 May 2023 16:16:08 +0300 Subject: [PATCH 1/3] SDF01 processing --- .../java/ru/spcex/clearing/service/executors/Sdf01Executor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java index 046f5a9e7..1fd894fa6 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java @@ -137,7 +137,7 @@ public class Sdf01Executor extends AbstractExecutor { SDf02 sdf02New = createSuccessSdf02(sdf01, generationIdForGroup); //fixme тоже мб убрать sdf02Imdg.insert(sdf02New); stmt.setOutSDfId(sdf02New.getId()); - statementImdg.update(stmt); + statementImdg.insert(stmt); Optional err = validateActiveness(company, account); if (err.isEmpty()) { From 8e9f6143e48e3491cd8a42c04e94ccbe173a7d3a Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 26 May 2023 16:32:28 +0300 Subject: [PATCH 2/3] swt-exporter http://jira.mfd.msk:8088/browse/CLS-317 z-distr --- z-distr/src/main/resources/distr/bin/launch_all.sh | 1 + 1 file changed, 1 insertion(+) 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 08b924be8..539b8a7ae 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/lim-exporter.sh +/opt/mfd/clearing/bin/swt-exporter.sh /opt/mfd/clearing/bin/dbf-importer.sh /opt/mfd/clearing/bin/trade-importer.sh /opt/mfd/clearing/bin/securities-service.sh From 878ec0fcbb6e034f4fd3381334d43f004959e9cf Mon Sep 17 00:00:00 2001 From: aalehin Date: Fri, 26 May 2023 16:33:19 +0300 Subject: [PATCH 3/3] sh update --- z-distr/src/main/resources/distr/bin/kill_all.sh | 1 + z-distr/src/main/resources/distr/bin/launch_all.sh | 1 + z-distr/src/main/resources/distr/bin/registry-service.sh | 9 +++++++++ 3 files changed, 11 insertions(+) create mode 100644 z-distr/src/main/resources/distr/bin/registry-service.sh 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 05a6100e4..cf91cdbe9 100644 --- a/z-distr/src/main/resources/distr/bin/kill_all.sh +++ b/z-distr/src/main/resources/distr/bin/kill_all.sh @@ -15,5 +15,6 @@ 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}') kill -9 $(ps -ef | grep java | grep scheduler-service.jar | awk '{print $2}') kill -9 $(ps -ef | grep java | grep reports-service.jar | awk '{print $2}') +kill -9 $(ps -ef | grep java | grep registry-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 539b8a7ae..1cad17024 100644 --- a/z-distr/src/main/resources/distr/bin/launch_all.sh +++ b/z-distr/src/main/resources/distr/bin/launch_all.sh @@ -15,3 +15,4 @@ cd /opt/mfd/clearing/bin /opt/mfd/clearing/bin/utility-service.sh /opt/mfd/clearing/bin/scheduler-service.sh /opt/mfd/clearing/bin/reports-service.sh +/opt/mfd/clearing/bin/registry-service.sh diff --git a/z-distr/src/main/resources/distr/bin/registry-service.sh b/z-distr/src/main/resources/distr/bin/registry-service.sh new file mode 100644 index 000000000..f488016e0 --- /dev/null +++ b/z-distr/src/main/resources/distr/bin/registry-service.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=7880 -jar registry-service.jar --spring.config.location=$CLEARING_HOME/settings/registry-service/" + +$CMD >/dev/null 2>&1 & +