treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
ialbert 2023-05-26 16:51:17 +03:00
commit ac39aa5856
4 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf01Executor.java
View file

@ -137,7 +137,7 @@ public class Sdf01Executor extends AbstractExecutor<SDf01> {
SDf02 sdf02New = createSuccessSdf02(sdf01, generationIdForGroup); //fixme тоже мб убрать SDf02 sdf02New = createSuccessSdf02(sdf01, generationIdForGroup); //fixme тоже мб убрать
sdf02Imdg.insert(sdf02New); sdf02Imdg.insert(sdf02New);
stmt.setOutSDfId(sdf02New.getId()); stmt.setOutSDfId(sdf02New.getId());
statementImdg.update(stmt); statementImdg.insert(stmt);
Optional<EnumMessage> err = validateActiveness(company, account); Optional<EnumMessage> err = validateActiveness(company, account);
if (err.isEmpty()) { if (err.isEmpty()) {

1
z-distr/src/main/resources/distr/bin/kill_all.sh
View file

@ -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 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 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 reports-service.jar | awk '{print $2}')
kill -9 $(ps -ef | grep java | grep registry-service.jar | awk '{print $2}')

2
z-distr/src/main/resources/distr/bin/launch_all.sh
View file

@ -8,9 +8,11 @@ cd /opt/mfd/clearing/bin
/opt/mfd/clearing/bin/clearing-service.sh /opt/mfd/clearing/bin/clearing-service.sh
/opt/mfd/clearing/bin/dbf-exporter.sh /opt/mfd/clearing/bin/dbf-exporter.sh
/opt/mfd/clearing/bin/lim-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/dbf-importer.sh
/opt/mfd/clearing/bin/trade-importer.sh /opt/mfd/clearing/bin/trade-importer.sh
/opt/mfd/clearing/bin/securities-service.sh /opt/mfd/clearing/bin/securities-service.sh
/opt/mfd/clearing/bin/utility-service.sh /opt/mfd/clearing/bin/utility-service.sh
/opt/mfd/clearing/bin/scheduler-service.sh /opt/mfd/clearing/bin/scheduler-service.sh
/opt/mfd/clearing/bin/reports-service.sh /opt/mfd/clearing/bin/reports-service.sh
/opt/mfd/clearing/bin/registry-service.sh

9
z-distr/src/main/resources/distr/bin/registry-service.sh Normal file
View file

@ -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 &