diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java index f52510eb6..7f485a6f0 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java @@ -39,7 +39,7 @@ public class MoneyMarketSecurityService extends QueueConsumer implements Initial MoneyMarketSecurity mms = new MoneyMarketSecurity(); mms.setStartDate(req.getStartDate()); mms.setEndDate(req.getEndDate()); - mms.setNominalValue(BigDecimal.valueOf(req.getNominalValue())); + mms.setNominalValue(req.getNominalValue() != null ? BigDecimal.valueOf(req.getNominalValue()) : null); mms.setNominalCurrency(req.getNominalCurrencyId()); mms.setInstrumentType(req.getInstrumentType()); mms.setFullName(req.getFullName()); diff --git a/pom.xml b/pom.xml index 430ffad39..a2946836b 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,7 @@ ${folder_root_clearing_temp} ${folder_root_clearing}/clearing-parent/backend-api + ${folder_root_clearing}/clearing-parent/securities-service ${folder_root_clearing}/clearing-parent/imdg ${folder_root_clearing}/clearing-parent/dbf-exporter ${folder_root_clearing}/clearing-parent/dbf-importer @@ -58,6 +59,11 @@ backend-api ${global.project.version} + + ru.spcex.clearing + securities-service + ${global.project.version} + ru.spcex.clearing imdg diff --git a/z-distr/pom.xml b/z-distr/pom.xml index dc9f8327c..39d76ae35 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -23,6 +23,10 @@ ru.spcex.clearing backend-api + + ru.spcex.clearing + securities-service + ru.spcex.clearing imdg @@ -110,6 +114,25 @@ + + copy-securities-service-bin + prepare-package + + copy + + + + + ${folder_root_clearing_securities-service}/target/securities-service.jar + ${folder.clearing.distr.modules}/securities-service/securities-service.jar + + + ${folder_root_clearing_securities-service}/src/main/resources/application.properties + ${folder.clearing.distr.modules}/securities-service/application.properties + + + + copy-imdg-bin prepare-package diff --git a/z-distr/src/main/resources/distr/bin/securities-service.sh b/z-distr/src/main/resources/distr/bin/securities-service.sh new file mode 100644 index 000000000..45f7ed358 --- /dev/null +++ b/z-distr/src/main/resources/distr/bin/securities-service.sh @@ -0,0 +1,3 @@ +#!/bin/sh +docker build -t securities-service:1.0.0 ../modules/securities-service/ +docker run -p 8050:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs securities-service:1.0.0 & \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/modules/securities-service/Dockerfile b/z-distr/src/main/resources/distr/modules/securities-service/Dockerfile new file mode 100644 index 000000000..ad4b79646 --- /dev/null +++ b/z-distr/src/main/resources/distr/modules/securities-service/Dockerfile @@ -0,0 +1,6 @@ +FROM debian:stable-20220125-jdk17 + +ADD securities-service.jar /opt/clearing/bin/securities-service.jar +ADD application.properties /opt/clearing/bin/application.properties +USER root +ENTRYPOINT java -jar /opt/clearing/bin/securities-service.jar --spring.config.location=/opt/clearing/bin/ \ No newline at end of file