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

http://jira.mfd.msk:8088/browse/CLS-16

Browse source
This commit is contained in:
ialbert 2022-08-16 17:37:06 +03:00
parent 1dce58b76c
commit 0a9af63689
5 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java
View file

@ -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());

6
pom.xml
View file

@ -31,6 +31,7 @@
<!--suppress UnresolvedMavenProperty -->
<folder_root_clearing>${folder_root_clearing_temp}</folder_root_clearing>
<folder_root_clearing_backend-api>${folder_root_clearing}/clearing-parent/backend-api</folder_root_clearing_backend-api>
<folder_root_clearing_securities-service>${folder_root_clearing}/clearing-parent/securities-service</folder_root_clearing_securities-service>
<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>
@ -58,6 +59,11 @@
<artifactId>backend-api</artifactId>
<version>${global.project.version}</version>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>securities-service</artifactId>
<version>${global.project.version}</version>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>imdg</artifactId>

23
z-distr/pom.xml
View file

@ -23,6 +23,10 @@
<groupId>ru.spcex.clearing</groupId>
<artifactId>backend-api</artifactId>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>securities-service</artifactId>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>imdg</artifactId>
@ -110,6 +114,25 @@
</fileSets>
</configuration>
</execution>
<execution>
<id>copy-securities-service-bin</id>
<phase>prepare-package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<fileSets>
<fileSet>
<sourceFile>${folder_root_clearing_securities-service}/target/securities-service.jar</sourceFile>
<destinationFile>${folder.clearing.distr.modules}/securities-service/securities-service.jar</destinationFile>
</fileSet>
<fileSet>
<sourceFile>${folder_root_clearing_securities-service}/src/main/resources/application.properties</sourceFile>
<destinationFile>${folder.clearing.distr.modules}/securities-service/application.properties</destinationFile>
</fileSet>
</fileSets>
</configuration>
</execution>
<execution>
<id>copy-imdg-bin</id>
<phase>prepare-package</phase>

3
z-distr/src/main/resources/distr/bin/securities-service.sh Normal file
View file

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

6
z-distr/src/main/resources/distr/modules/securities-service/Dockerfile Normal file
View file

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