diff --git a/clearing-parent/account-service/pom.xml b/clearing-parent/account-service/pom.xml
index b3a66871d..04d46ef74 100644
--- a/clearing-parent/account-service/pom.xml
+++ b/clearing-parent/account-service/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
4.0.0
diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml
index 1451d8d39..62bbe0732 100644
--- a/clearing-parent/backend-api/pom.xml
+++ b/clearing-parent/backend-api/pom.xml
@@ -11,7 +11,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.json b/clearing-parent/backend-api/src/main/resources/meta/meta.json
index a23252e06..02b58a1d9 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/meta.json
+++ b/clearing-parent/backend-api/src/main/resources/meta/meta.json
@@ -1,6 +1,6 @@
{
- "version": "3.15.206.111",
+ "version": "3.15.208.113",
"enums": {
@@ -4988,66 +4988,6 @@
{"code": "intermediarySwiftCode",
"type": 2,"length": 255,"name": "Код SWIFT посредника","shortname": "SWIFT посредника","searchable": true,"sortable": true,"visible": true
}
- ,
- {"code": "name",
- "type": 2,"length": 255,"name": "Наименование владельца счета","shortname": "Владелец счета","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "address",
- "type": 2,"length": 255,"name": "Адрес владельца счета","shortname": "Адрес владельца","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "bankAddress",
- "type": 2,"length": 255,"name": "Место нахождения банка получателя средств","shortname": "Место нахождение банка","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "bankSwiftCode",
- "type": 2,"length": 12,"name": "SWIFT банка получателя средств","shortname": "SWIFT банка","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "bankAccount",
- "type": 2,"length": 35,"name": "Номер счета банка получателя средств","shortname": "Номер счёта получателя","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "bankName1",
- "type": 2,"length": 255,"name": "Наименование банка-посредника 1","shortname": "Банк посредник 1","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "bankAddress1",
- "type": 2,"length": 255,"name": "Место нахождения банка-посредника 1","shortname": "Место нахождения банка-посредника 1","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "bankAccount1",
- "type": 2,"length": 35,"name": "Номер счета банка-посредника 1","shortname": "Счет банка-посредника 1","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "bankName2",
- "type": 2,"length": 255,"name": "Наименование банка-посредника 2","shortname": "Банк посредник 2","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "bankAddress2",
- "type": 2,"length": 255,"name": "Место нахождения банка-посредника 2","shortname": "Место нахождения банка-посредника 2","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "intermediarySwiftCode2",
- "type": 2,"length": 12,"name": "SWIFT банка-посредника 2","shortname": "Счет банка-посредника 2","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "bankAccount2",
- "type": 2,"length": 35,"name": "Номер счета банка-посредника 2","shortname": "Счет банка-посредника 2","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "personalAccount",
- "type": 2,"length": 20,"name": "Лицевой счет получателя","shortname": "Счет получателя","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "budgetClassificationCode",
- "type": 2,"length": 20,"name": "КБК","shortname": "КБК","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "oktmo",
- "type": 2,"length": 20,"name": "ОКТМО получателя средств","shortname": "ОКТМО","searchable": true,"sortable": true,"visible": true
- }
]
,"actions":[
{"method":"post",
@@ -5106,66 +5046,6 @@
{"code": "intermediarySwiftCode",
"type": 2,"length": 255,"name": "Код SWIFT посредника","shortname": "SWIFT посредника","searchable": true,"sortable": true,"visible": true
}
- ,
- {"code": "name",
- "type": 2,"length": 255,"name": "Наименование владельца счета","shortname": "Владелец счета","searchable": true,"sortable": true,"visible": true,"required": true
- }
- ,
- {"code": "address",
- "type": 2,"length": 255,"name": "Адрес владельца счета","shortname": "Адрес владельца","searchable": true,"sortable": true,"visible": true,"required": true
- }
- ,
- {"code": "bankAddress",
- "type": 2,"length": 255,"name": "Место нахождения банка получателя средств","shortname": "Место нахождение банка","searchable": true,"sortable": true,"visible": true,"required": true
- }
- ,
- {"code": "bankSwiftCode",
- "type": 2,"length": 12,"name": "SWIFT банка получателя средств","shortname": "SWIFT банка","searchable": true,"sortable": true,"visible": true,"required": true
- }
- ,
- {"code": "bankAccount",
- "type": 2,"length": 35,"name": "Номер счета банка получателя средств","shortname": "Номер счёта получателя","searchable": true,"sortable": true,"visible": true,"required": true
- }
- ,
- {"code": "bankName1",
- "type": 2,"length": 255,"name": "Наименование банка-посредника 1","shortname": "Банк посредник 1","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "bankAddress1",
- "type": 2,"length": 255,"name": "Место нахождения банка-посредника 1","shortname": "Место нахождения банка-посредника 1","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "bankAccount1",
- "type": 2,"length": 35,"name": "Номер счета банка-посредника 1","shortname": "Счет банка-посредника 1","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "bankName2",
- "type": 2,"length": 255,"name": "Наименование банка-посредника 2","shortname": "Банк посредник 2","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "bankAddress2",
- "type": 2,"length": 255,"name": "Место нахождения банка-посредника 2","shortname": "Место нахождения банка-посредника 2","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "intermediarySwiftCode2",
- "type": 2,"length": 12,"name": "SWIFT банка-посредника 2","shortname": "Счет банка-посредника 2","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "bankAccount2",
- "type": 2,"length": 35,"name": "Номер счета банка-посредника 2","shortname": "Счет банка-посредника 2","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "personalAccount",
- "type": 2,"length": 20,"name": "Лицевой счет получателя","shortname": "Счет получателя","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "budgetClassificationCode",
- "type": 2,"length": 20,"name": "КБК","shortname": "КБК","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "oktmo",
- "type": 2,"length": 20,"name": "ОКТМО получателя средств","shortname": "ОКТМО","searchable": true,"sortable": true,"visible": true
- }
]
}
,
@@ -5225,66 +5105,6 @@
{"code": "intermediarySwiftCode",
"type": 2,"length": 255,"name": "Код SWIFT посредника","shortname": "SWIFT посредника","searchable": true,"sortable": true,"visible": true
}
- ,
- {"code": "name",
- "type": 2,"length": 255,"name": "Наименование владельца счета","shortname": "Владелец счета","searchable": true,"sortable": true,"visible": true,"required": true
- }
- ,
- {"code": "address",
- "type": 2,"length": 255,"name": "Адрес владельца счета","shortname": "Адрес владельца","searchable": true,"sortable": true,"visible": true,"required": true
- }
- ,
- {"code": "bankAddress",
- "type": 2,"length": 255,"name": "Место нахождения банка получателя средств","shortname": "Место нахождение банка","searchable": true,"sortable": true,"visible": true,"required": true
- }
- ,
- {"code": "bankSwiftCode",
- "type": 2,"length": 12,"name": "SWIFT банка получателя средств","shortname": "SWIFT банка","searchable": true,"sortable": true,"visible": true,"required": true
- }
- ,
- {"code": "bankAccount",
- "type": 2,"length": 35,"name": "Номер счета банка получателя средств","shortname": "Номер счёта получателя","searchable": true,"sortable": true,"visible": true,"required": true
- }
- ,
- {"code": "bankName1",
- "type": 2,"length": 255,"name": "Наименование банка-посредника 1","shortname": "Банк посредник 1","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "bankAddress1",
- "type": 2,"length": 255,"name": "Место нахождения банка-посредника 1","shortname": "Место нахождения банка-посредника 1","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "bankAccount1",
- "type": 2,"length": 35,"name": "Номер счета банка-посредника 1","shortname": "Счет банка-посредника 1","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "bankName2",
- "type": 2,"length": 255,"name": "Наименование банка-посредника 2","shortname": "Банк посредник 2","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "bankAddress2",
- "type": 2,"length": 255,"name": "Место нахождения банка-посредника 2","shortname": "Место нахождения банка-посредника 2","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "intermediarySwiftCode2",
- "type": 2,"length": 12,"name": "SWIFT банка-посредника 2","shortname": "Счет банка-посредника 2","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "bankAccount2",
- "type": 2,"length": 35,"name": "Номер счета банка-посредника 2","shortname": "Счет банка-посредника 2","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "personalAccount",
- "type": 2,"length": 20,"name": "Лицевой счет получателя","shortname": "Счет получателя","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "budgetClassificationCode",
- "type": 2,"length": 20,"name": "КБК","shortname": "КБК","searchable": true,"sortable": true,"visible": true
- }
- ,
- {"code": "oktmo",
- "type": 2,"length": 20,"name": "ОКТМО получателя средств","shortname": "ОКТМО","searchable": true,"sortable": true,"visible": true
- }
]
}
,
diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml
index 80a5fb0a3..e39442506 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml
+++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml
@@ -1,6 +1,6 @@
-
+
@@ -1159,21 +1159,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1188,21 +1173,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1217,21 +1187,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/clearing-parent/balance-service/pom.xml b/clearing-parent/balance-service/pom.xml
index 64e1a1ee2..9d63bd9f4 100644
--- a/clearing-parent/balance-service/pom.xml
+++ b/clearing-parent/balance-service/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
4.0.0
diff --git a/clearing-parent/classes/pom.xml b/clearing-parent/classes/pom.xml
index 40832cb51..6f0b3ee2d 100644
--- a/clearing-parent/classes/pom.xml
+++ b/clearing-parent/classes/pom.xml
@@ -12,7 +12,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
diff --git a/clearing-parent/cleaning-builders/pom.xml b/clearing-parent/cleaning-builders/pom.xml
index a884131d9..8984ec7eb 100644
--- a/clearing-parent/cleaning-builders/pom.xml
+++ b/clearing-parent/cleaning-builders/pom.xml
@@ -6,13 +6,13 @@
ru.spcex.clearing
clearing-parent
- SPCEX-3.15.207
+ SPCEX-3.15.208
cleaning-builders
cleaning-builders
Cleaning builders module
- SPCEX-3.15.207
+ SPCEX-3.15.208
jar
@@ -26,7 +26,7 @@
ru.spcex.clearing
classes
- SPCEX-3.15.207
+ SPCEX-3.15.208
compile
diff --git a/clearing-parent/clearing-service/pom.xml b/clearing-parent/clearing-service/pom.xml
index be499cb55..464db8ecb 100644
--- a/clearing-parent/clearing-service/pom.xml
+++ b/clearing-parent/clearing-service/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
4.0.0
diff --git a/clearing-parent/clearing-validation/pom.xml b/clearing-parent/clearing-validation/pom.xml
index c77a4e57d..3c1ecb5ba 100644
--- a/clearing-parent/clearing-validation/pom.xml
+++ b/clearing-parent/clearing-validation/pom.xml
@@ -8,12 +8,12 @@
clearing-validation
Clearing-module, dependency version of platform-utils
jar
- SPCEX-3.15.207
+ SPCEX-3.15.208
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
@@ -35,13 +35,13 @@
ru.spcex.clearing
classes
- SPCEX-3.15.207
+ SPCEX-3.15.208
compile
ru.spcex.clearing
dictionary
- SPCEX-3.15.207
+ SPCEX-3.15.208
compile
diff --git a/clearing-parent/company-service/pom.xml b/clearing-parent/company-service/pom.xml
index 648cc3165..df475d91a 100644
--- a/clearing-parent/company-service/pom.xml
+++ b/clearing-parent/company-service/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
4.0.0
diff --git a/clearing-parent/db-scripts/pom.xml b/clearing-parent/db-scripts/pom.xml
index b1080e2ca..6aaedbe49 100644
--- a/clearing-parent/db-scripts/pom.xml
+++ b/clearing-parent/db-scripts/pom.xml
@@ -7,12 +7,12 @@
db-scripts
db-scripts
db-scripts for PostgreSQL
- SPCEX-3.15.207
+ SPCEX-3.15.208
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
diff --git a/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql b/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql
index 252caa4bd..17e189a54 100644
--- a/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql
+++ b/clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql
@@ -1,7 +1,3 @@
--- DB version: 3.13
--- DATA version: 3.13.0.95
-
-
/* Dictionaries */
INSERT INTO ALLOWED_DICTIONARY(ID, CODE, NAME) values (1, 'ALWD', 'Разрешено') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
@@ -1035,4 +1031,4 @@ INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (10001, 'TRDI', 'Сде
/* Business objects */
-INSERT INTO DB_VERSION(ID, DICTIONARY_VERSION) values (1, '3.13.0.95') ON CONFLICT (ID) DO UPDATE SET DICTIONARY_VERSION = EXCLUDED.DICTIONARY_VERSION
+INSERT INTO DB_VERSION(ID, DICTIONARY_VERSION) values (1, '3.15.0.96') ON CONFLICT (ID) DO UPDATE SET DICTIONARY_VERSION = EXCLUDED.DICTIONARY_VERSION
diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml
index 7289b33ac..c21bd9a0d 100644
--- a/clearing-parent/dbf-exporter/pom.xml
+++ b/clearing-parent/dbf-exporter/pom.xml
@@ -7,12 +7,12 @@
dbf-exporter
dbf-exporter
DBF exporter for DBF files
- SPCEX-3.15.207
+ SPCEX-3.15.208
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/ResultContainer.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/ResultContainer.java
index 14f144e2f..0ead1331a 100644
--- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/ResultContainer.java
+++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/ResultContainer.java
@@ -1,11 +1,10 @@
package ru.spcex.clearing.dbf.exporter.logic.data;
-import ru.spcex.clearing.dbf.exporter.logic.data.enums.StageResult;
-import ru.spcex.clearing.dbf.exporter.logic.data.enums.Table;
-
import java.io.File;
import java.time.LocalDateTime;
import java.util.UUID;
+import ru.spcex.clearing.dbf.exporter.logic.data.enums.StageResult;
+import ru.spcex.clearing.dbf.exporter.logic.data.enums.Table;
/**
* Контейнер для передачи результата между стадиями
@@ -19,13 +18,15 @@ public class ResultContainer {
private StageResult lastStageResult;
private LocalDateTime registrationDateTime;
private String memberCode;
+ private String section;
protected ResultContainer() {}
- public static ResultContainer createNewTask(Table tableForExport) {
+ public static ResultContainer createNewTask(Table tableForExport, String section) {
ResultContainer container = new ResultContainer();
container.tableForExport = tableForExport;
container.uuid = UUID.randomUUID();
+ container.section = section;
return container;
}
@@ -92,4 +93,8 @@ public class ResultContainer {
public void setMemberCode(String memberCode) {
this.memberCode = memberCode;
}
+
+ public String getSection() {
+ return section;
+ }
}
diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplate.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplate.java
index 02164284c..7c9ec86f1 100644
--- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplate.java
+++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplate.java
@@ -1,19 +1,14 @@
package ru.spcex.clearing.dbf.exporter.logic.data.enums;
+import java.io.File;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Locale;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.integration.sftp.session.SftpFileInfo;
import ru.spcex.clearing.dbf.exporter.logic.data.ResultContainer;
-
-import java.io.File;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-
-import static ru.spcex.clearing.dbf.exporter.logic.stages.PrepareDBFFile.SECTION;
import static ru.spcex.clearing.dbf.exporter.logic.stages.PrepareDBFFile.outDir;
public enum FilenameTemplate {
@@ -66,7 +61,7 @@ public enum FilenameTemplate {
result.append(File.separator);
result.append(resultContainer.getTableForExport().getFilePrefix().toUpperCase(Locale.ROOT));
result.append('_');
- result.append(SECTION);
+ result.append(resultContainer.getSection());
return result;
}
diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFile.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFile.java
index c38ddd3f7..6c6183766 100644
--- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFile.java
+++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFile.java
@@ -26,7 +26,6 @@ import ru.spcex.clearing.dbf.exporter.logic.data.enums.Table;
*/
@Component
public class PrepareDBFFile extends Stage implements InitializingBean {
- public static final String SECTION = "S";
private final ExportDBFServiceSettings settings;
public static String outDir;
private final SFTPConfig.DbfGateway gateway;
diff --git a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/CommandService.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/CommandService.java
index d1a7c0bbe..5c851a027 100644
--- a/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/CommandService.java
+++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/CommandService.java
@@ -1,9 +1,12 @@
package ru.spcex.clearing.dbf.exporter.services;
+import java.util.Arrays;
+import java.util.Optional;
import org.apache.kafka.clients.consumer.Consumer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import ru.spcex.clearing.dbf.exporter.logic.Processor;
import ru.spcex.clearing.dbf.exporter.logic.data.ResultContainer;
@@ -17,22 +20,22 @@ import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
import ru.spcex.platform.enumeration.Task;
import ru.spcex.platform.imdg.api.ImdgProvider;
-import java.util.Arrays;
-import java.util.Optional;
-
@Service
public class CommandService extends QueueConsumer implements InitializingBean {
private final Logger log = LoggerFactory.getLogger(getClass());
private final ImdgProvider imdgProvider;
private final Processor processor;
+ private final String section;
public CommandService(Consumer kafkaQueue,
ImdgProvider imdgProvider,
- Processor processor) {
+ Processor processor,
+ @Value("${export-dbf-service.section:S}") String section) {
super(kafkaQueue);
this.imdgProvider = imdgProvider;
this.processor = processor;
+ this.section = section;
}
@Override
@@ -79,7 +82,7 @@ public class CommandService extends QueueConsumer implements InitializingBean {
if (tableForExport.isEmpty()) {
throw new IllegalStateException(String.format("Unsupported table prefix: %s", request.getNameOfTable()));
}
- ResultContainer resultContainer = ResultContainer.createNewTask(tableForExport.get());
+ ResultContainer resultContainer = ResultContainer.createNewTask(tableForExport.get(), section);
resultContainer.setGroupId(request.getSdfGroupId());
resultContainer.setSourceName(request.getFileName());
processor.process(resultContainer);
@@ -87,7 +90,7 @@ public class CommandService extends QueueConsumer implements InitializingBean {
private void processSpecial(Table table, BaseRequest systemRequest) {
SdfClearingRequest request = systemRequest.getRequestPayload();
- ResultContainer resultContainer = ResultContainer.createNewTask(table);
+ ResultContainer resultContainer = ResultContainer.createNewTask(table, section);
resultContainer.setGroupId(request.getGroupId());
resultContainer.setSourceName(null);
processor.process(resultContainer);
@@ -96,7 +99,7 @@ public class CommandService extends QueueConsumer implements InitializingBean {
private void processByLauncher(Table table, BaseRequest systemRequest) {
LauncherCommandRequest request = systemRequest.getRequestPayload();
log.info("RequestId={}, LauncherCommandRequest task={}. Table {}", systemRequest.getId(), request.getTaskName(), table);
- ResultContainer resultContainer = ResultContainer.createNewTask(table);
+ ResultContainer resultContainer = ResultContainer.createNewTask(table, section);
resultContainer.setGroupId(null);
resultContainer.setSourceName(null);
processor.process(resultContainer);
diff --git a/clearing-parent/dbf-exporter/src/main/resources/application.properties b/clearing-parent/dbf-exporter/src/main/resources/application.properties
index 1f8e20723..400680e04 100644
--- a/clearing-parent/dbf-exporter/src/main/resources/application.properties
+++ b/clearing-parent/dbf-exporter/src/main/resources/application.properties
@@ -30,3 +30,5 @@ export-dbf-service.kafka-producer.retries=0
export-dbf-service.kafka-producer.batch-size=16384
export-dbf-service.kafka-producer.linger-ms=1
export-dbf-service.kafka-producer.buffer-memory=33554432
+
+export-dbf-service.section=S
\ No newline at end of file
diff --git a/clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplateTest.java b/clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplateTest.java
index f560f5c11..9baa7e5e0 100644
--- a/clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplateTest.java
+++ b/clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplateTest.java
@@ -1,18 +1,16 @@
package ru.spcex.clearing.dbf.exporter.logic.data.enums;
-import com.jcraft.jsch.ChannelSftp.LsEntry;
-import org.junit.jupiter.api.Test;
-import org.springframework.integration.sftp.session.SftpFileInfo;
-import ru.spcex.clearing.dbf.exporter.logic.data.ResultContainer;
-import ru.spcex.clearing.dbf.exporter.logic.stages.PrepareDBFFile;
-
import java.io.File;
import java.time.LocalDateTime;
import java.util.List;
-
+import com.jcraft.jsch.ChannelSftp.LsEntry;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
import static org.mockito.Mockito.*;
+import org.springframework.integration.sftp.session.SftpFileInfo;
+import ru.spcex.clearing.dbf.exporter.logic.data.ResultContainer;
import static ru.spcex.clearing.dbf.exporter.logic.data.enums.FilenameTemplate.df_section_sameName;
+import ru.spcex.clearing.dbf.exporter.logic.stages.PrepareDBFFile;
class FilenameTemplateTest {
@@ -38,7 +36,7 @@ class FilenameTemplateTest {
SftpFileInfo sftpFileInfo = spy(new SftpFileInfo(lsEntry));
doReturn(false).when(sftpFileInfo).isDirectory();
List files = List.of(sftpFileInfo);
- ResultContainer resultContainer = ResultContainer.createNewTask(Table.S_DF02);
+ ResultContainer resultContainer = ResultContainer.createNewTask(Table.S_DF02, "S");
resultContainer.setGroupId(10L);
resultContainer.setSourceName("DF-01_S_PRC1807230915_1.dbf");
PrepareDBFFile.outDir="TEST_DIR";
diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml
index 2af88ffec..047df42cb 100644
--- a/clearing-parent/dbf-importer/pom.xml
+++ b/clearing-parent/dbf-importer/pom.xml
@@ -8,12 +8,12 @@
dbf-importer
dbf-importer
DBF loader for DBF files
- SPCEX-3.15.207
+ SPCEX-3.15.208
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
diff --git a/clearing-parent/dictionary/pom.xml b/clearing-parent/dictionary/pom.xml
index f28883261..c5d390d5a 100644
--- a/clearing-parent/dictionary/pom.xml
+++ b/clearing-parent/dictionary/pom.xml
@@ -8,12 +8,12 @@
Clearing dictionary
Clearing dictionary
jar
- SPCEX-3.15.207
+ SPCEX-3.15.208
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
diff --git a/clearing-parent/extdb-importer/pom.xml b/clearing-parent/extdb-importer/pom.xml
index 68e62a50a..c6dca876b 100644
--- a/clearing-parent/extdb-importer/pom.xml
+++ b/clearing-parent/extdb-importer/pom.xml
@@ -4,12 +4,12 @@
ru.spcex.clearing
clearing-parent
- SPCEX-3.15.207
+ SPCEX-3.15.208
extdb-importer
extdb-importer
Extdb importer module. Аналог trade-importer.
- SPCEX-3.15.207
+ SPCEX-3.15.208
jar
diff --git a/clearing-parent/gateway-api/pom.xml b/clearing-parent/gateway-api/pom.xml
index 97b74c497..f31a42c0f 100644
--- a/clearing-parent/gateway-api/pom.xml
+++ b/clearing-parent/gateway-api/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
4.0.0
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java
index 79837d744..ffac3cf62 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java
@@ -63,11 +63,11 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
private final RestTemplate restTemplate;
private final InboundServerSettings inboundServerSettings;
private final InboundExternalServerSettings inboundExternalServerSettings;
- private final GatewayApiSettings gatewayApiSettings;
private final Map> sentAssets;
private final Map outboundRequestByUuid;
protected final Imdg gatewayResultImdg;
private final static Pattern REPORT_FILE_NAME_PATTERN = Pattern.compile("(\\S*)_(\\d{15}).csv");
+ private final String clearingSystemValue;
public GatewayService(Consumer kafkaQueue,
Producer kafkaProducer,
@@ -80,7 +80,8 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
super(kafkaQueue, kafkaProducer);
this.restTemplate = restTemplate;
this.userRoleVerification = userRoleVerification;
- this.gatewayApiSettings = gatewayApiSettings;
+ this.clearingSystemValue = StringUtils.isNotEmpty(gatewayApiSettings.getClearingSystem()) ?
+ gatewayApiSettings.getClearingSystem() : "SPVB";
this.inboundServerSettings = gatewayApiSettings.getInboundServer();
this.inboundExternalServerSettings = gatewayApiSettings.getInboundExternalServer();
this.sentAssets = sentAssets;
@@ -120,6 +121,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
logUnknownProperties(userRequest);
OutboundRequest outboundFondRequest = OutboundRequestBuilder.builder()
.type(OutboundRequestType.MEMBER_ON_DEMAND.getKey())
+ .clearingSystem(clearingSystemValue)
.build();
outboundRequestByUuid.put(outboundFondRequest.getId(), outboundFondRequest);
@@ -133,6 +135,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
OutboundRequest outboundFondRequest = OutboundRequestBuilder.builder()
.section(exportedRequest.getSection())
.type(OutboundRequestType.FILL_LIMITS.getKey())
+ .clearingSystem(clearingSystemValue)
.content(content)
.build();
@@ -152,16 +155,19 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
OutboundRequest outboundFondRequest = OutboundRequestBuilder.builder()
.section(Section.FOND.getKey())
.type(OutboundRequestType.ON_DEMAND.getKey())
+ .clearingSystem(clearingSystemValue)
.build();
OutboundRequest outboundMkrRequest = OutboundRequestBuilder.builder()
.section(Section.MKR.getKey())
.type(OutboundRequestType.ON_DEMAND.getKey())
+ .clearingSystem(clearingSystemValue)
.build();
OutboundRequest outboundCurrRequest = OutboundRequestBuilder.builder()
.section(Section.CURR.getKey())
.type(OutboundRequestType.ON_DEMAND.getKey())
+ .clearingSystem(clearingSystemValue)
.build();
outboundRequestByUuid.put(outboundFondRequest.getId(), outboundFondRequest);
@@ -198,6 +204,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
OutboundRequest outboundRequest = OutboundRequestBuilder.builder()
.section(assetOperation.getAmount() != null ? Section.MKR.getKey() : Section.FOND.getKey())
.type(OutboundRequestType.ASSET_OPERATION.getKey())
+ .clearingSystem(clearingSystemValue)
.content(content).build();
gatewayBuilder.outboundRequest(outboundRequest);
@@ -231,6 +238,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
OutboundRequest outboundRequest = OutboundRequestBuilder.builder()
.section(Section.FOND.getKey())
.type(reportType.getKey())
+ .clearingSystem(clearingSystemValue)
.content(content).build();
sendRequest(outboundRequest);
@@ -243,6 +251,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
OutboundRequest outboundRequest = OutboundRequestBuilder.builder()
.type(OutboundRequestType.MEMBER_RESPONSE_TKR.getKey())
.content(content)
+ .clearingSystem(clearingSystemValue)
.build();
if (reportRequest.getRequestId() != null) {
outboundRequest.setId(reportRequest.getRequestId());
@@ -286,9 +295,6 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
}
private void sendRequest(OutboundRequest request) {
- String clearingSystem = StringUtils.isNotEmpty(gatewayApiSettings.getClearingSystem()) ?
- gatewayApiSettings.getClearingSystem() : "SPVB";
- request.setClearingSystem(clearingSystem);
if (inboundServerSettings != null &&
(inboundServerSettings.getAllowedTypes().isEmpty() ||
inboundServerSettings.getAllowedTypes().contains(request.getType()))) {
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/TkrService.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/TkrService.java
index 2aad05490..1c1936371 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/TkrService.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/TkrService.java
@@ -26,6 +26,9 @@ public class TkrService {
if (tkrRequest.getErrors() != null && !tkrRequest.getErrors().isEmpty()) {
return;
}
+ if (tkrRequest.getInfoAccount() == null || tkrRequest.getInfoAccount().isEmpty()) {
+ return;
+ }
List tkrAccountsForCheck = tkrRequest.getInfoAccount()
.stream().filter(infoAccount -> TypeOperations.CHECK.equalsByKey(infoAccount.getTypeOperationClient()))
.map(tkrAdapter::toTkrResponse)
diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/OutboundRequestBuilder.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/OutboundRequestBuilder.java
index 766a1e010..000bbb05d 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/OutboundRequestBuilder.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/OutboundRequestBuilder.java
@@ -1,15 +1,15 @@
package ru.spcex.clearing.gatewayapi.service.builders;
-import ru.spcex.clearing.gatewayapi.controller.outbound.request.OutboundRequest;
-
import java.time.Instant;
import java.util.Map;
import java.util.UUID;
+import ru.spcex.clearing.gatewayapi.controller.outbound.request.OutboundRequest;
public class OutboundRequestBuilder {
private String section;
private String requestType;
+ private String clearingSystem;
private Map content;
private OutboundRequestBuilder() {
@@ -34,11 +34,16 @@ public class OutboundRequestBuilder {
this.content = content;
return this;
}
+ public OutboundRequestBuilder clearingSystem(String val) {
+ this.clearingSystem = val;
+ return this;
+ }
public OutboundRequest build() {
OutboundRequest outboundRequest = new OutboundRequest();
outboundRequest.setId(UUID.randomUUID());
outboundRequest.setDatetime(Instant.now());
+ outboundRequest.setClearingSystem(clearingSystem);
if (section != null) {
outboundRequest.setSection(section);
}
diff --git a/clearing-parent/imdg-hist/pom.xml b/clearing-parent/imdg-hist/pom.xml
index 0872d7b5a..0b6d8d16f 100644
--- a/clearing-parent/imdg-hist/pom.xml
+++ b/clearing-parent/imdg-hist/pom.xml
@@ -5,12 +5,12 @@
4.0.0
imdg-hist
jar
- SPCEX-3.15.207
+ SPCEX-3.15.208
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
@@ -36,13 +36,13 @@
ru.spcex.clearing
classes
- SPCEX-3.15.207
+ SPCEX-3.15.208
compile
ru.spcex.clearing
dictionary
- SPCEX-3.15.207
+ SPCEX-3.15.208
compile
@@ -82,7 +82,7 @@
ru.spcex.clearing
cleaning-builders
- SPCEX-3.15.207
+ SPCEX-3.15.208
compile
diff --git a/clearing-parent/imdg/pom.xml b/clearing-parent/imdg/pom.xml
index a2fdd544a..44296fa00 100644
--- a/clearing-parent/imdg/pom.xml
+++ b/clearing-parent/imdg/pom.xml
@@ -7,12 +7,12 @@
imdg
Clearing in memory data grid
jar
- SPCEX-3.15.207
+ SPCEX-3.15.208
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
@@ -32,13 +32,13 @@
ru.spcex.clearing
classes
- SPCEX-3.15.207
+ SPCEX-3.15.208
compile
ru.spcex.clearing
dictionary
- SPCEX-3.15.207
+ SPCEX-3.15.208
compile
@@ -89,7 +89,7 @@
ru.spcex.clearing
cleaning-builders
- SPCEX-3.15.207
+ SPCEX-3.15.208
compile
diff --git a/clearing-parent/lim-exporter/pom.xml b/clearing-parent/lim-exporter/pom.xml
index 48614d05d..3551e8d66 100644
--- a/clearing-parent/lim-exporter/pom.xml
+++ b/clearing-parent/lim-exporter/pom.xml
@@ -3,13 +3,13 @@
4.0.0
lim-exporter
Lim exporter
- SPCEX-3.15.207
+ SPCEX-3.15.208
jar
ru.spcex.clearing
clearing-parent
- SPCEX-3.15.207
+ SPCEX-3.15.208
@@ -35,7 +35,7 @@
ru.spcex.clearing
classes
- SPCEX-3.15.207
+ SPCEX-3.15.208
compile
diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml
index 1537daa9f..ff49ed896 100644
--- a/clearing-parent/pom.xml
+++ b/clearing-parent/pom.xml
@@ -7,12 +7,12 @@
_parent_clearing
Clearing parent module
pom
- SPCEX-3.15.207
+ SPCEX-3.15.208
clearing
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
diff --git a/clearing-parent/registry-service/pom.xml b/clearing-parent/registry-service/pom.xml
index b387bfd1a..c1dbb66ce 100644
--- a/clearing-parent/registry-service/pom.xml
+++ b/clearing-parent/registry-service/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
4.0.0
diff --git a/clearing-parent/reports-service/pom.xml b/clearing-parent/reports-service/pom.xml
index 31dbe442a..f8e44ca85 100644
--- a/clearing-parent/reports-service/pom.xml
+++ b/clearing-parent/reports-service/pom.xml
@@ -8,12 +8,12 @@
reports-service
reports-service
Service for creating reports
- SPCEX-3.15.207
+ SPCEX-3.15.208
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
diff --git a/clearing-parent/scheduler-service/pom.xml b/clearing-parent/scheduler-service/pom.xml
index 53c2da460..7ea33c8c4 100644
--- a/clearing-parent/scheduler-service/pom.xml
+++ b/clearing-parent/scheduler-service/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
4.0.0
@@ -51,7 +51,7 @@
ru.spcex.clearing
cleaning-builders
- SPCEX-3.15.207
+ SPCEX-3.15.208
compile
diff --git a/clearing-parent/securities-service/pom.xml b/clearing-parent/securities-service/pom.xml
index 1ab940fb3..6748c528d 100644
--- a/clearing-parent/securities-service/pom.xml
+++ b/clearing-parent/securities-service/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
4.0.0
diff --git a/clearing-parent/security-util/pom.xml b/clearing-parent/security-util/pom.xml
index 41eb88517..f002e07b0 100644
--- a/clearing-parent/security-util/pom.xml
+++ b/clearing-parent/security-util/pom.xml
@@ -8,12 +8,12 @@
security-util clearing
Clearing misc util for verify user roles
jar
- SPCEX-3.15.207
+ SPCEX-3.15.208
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
@@ -35,13 +35,13 @@
ru.spcex.clearing
classes
- SPCEX-3.15.207
+ SPCEX-3.15.208
compile
ru.spcex.clearing
dictionary
- SPCEX-3.15.207
+ SPCEX-3.15.208
compile
diff --git a/clearing-parent/swt-exporter/pom.xml b/clearing-parent/swt-exporter/pom.xml
index e8a89e6b9..5e1d07fc2 100644
--- a/clearing-parent/swt-exporter/pom.xml
+++ b/clearing-parent/swt-exporter/pom.xml
@@ -3,13 +3,13 @@
4.0.0
swt-exporter
Swt exporter
- SPCEX-3.15.207
+ SPCEX-3.15.208
jar
ru.spcex.clearing
clearing-parent
- SPCEX-3.15.207
+ SPCEX-3.15.208
@@ -35,7 +35,7 @@
ru.spcex.clearing
classes
- SPCEX-3.15.207
+ SPCEX-3.15.208
compile
diff --git a/clearing-parent/swt-importer/pom.xml b/clearing-parent/swt-importer/pom.xml
index 17408cf21..756bbf85e 100644
--- a/clearing-parent/swt-importer/pom.xml
+++ b/clearing-parent/swt-importer/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
4.0.0
diff --git a/clearing-parent/test-clearing/pom.xml b/clearing-parent/test-clearing/pom.xml
index a51608b73..fcf005560 100644
--- a/clearing-parent/test-clearing/pom.xml
+++ b/clearing-parent/test-clearing/pom.xml
@@ -4,11 +4,11 @@
ru.spcex.clearing
clearing-parent
- SPCEX-3.15.207
+ SPCEX-3.15.208
test-clearing
Test-clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
ru.spcex.platform
diff --git a/clearing-parent/trade-importer/pom.xml b/clearing-parent/trade-importer/pom.xml
index 296b36fab..db9b15451 100644
--- a/clearing-parent/trade-importer/pom.xml
+++ b/clearing-parent/trade-importer/pom.xml
@@ -4,12 +4,12 @@
ru.spcex.clearing
clearing-parent
- SPCEX-3.15.207
+ SPCEX-3.15.208
trade-importer
trade-importer
Trade importer module
- SPCEX-3.15.207
+ SPCEX-3.15.208
jar
@@ -51,7 +51,7 @@
ru.spcex.clearing
classes
- SPCEX-3.15.207
+ SPCEX-3.15.208
compile
diff --git a/clearing-parent/utility-service/pom.xml b/clearing-parent/utility-service/pom.xml
index ac04ce93e..df0d0be3c 100644
--- a/clearing-parent/utility-service/pom.xml
+++ b/clearing-parent/utility-service/pom.xml
@@ -5,7 +5,7 @@
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
4.0.0
diff --git a/clearing-parent/xml-exporter/pom.xml b/clearing-parent/xml-exporter/pom.xml
index 118d724c7..07c543adc 100644
--- a/clearing-parent/xml-exporter/pom.xml
+++ b/clearing-parent/xml-exporter/pom.xml
@@ -7,12 +7,12 @@
xml-exporter
xml-exporter
XML exporter for XML files
- SPCEX-3.15.207
+ SPCEX-3.15.208
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
diff --git a/clearing-parent/xml-importer/pom.xml b/clearing-parent/xml-importer/pom.xml
index 2ac984b15..a7ddc5d45 100644
--- a/clearing-parent/xml-importer/pom.xml
+++ b/clearing-parent/xml-importer/pom.xml
@@ -8,12 +8,12 @@
xml-importer
xml-importer
XML loader for XML files
- SPCEX-3.15.207
+ SPCEX-3.15.208
clearing-parent
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
diff --git a/platform-parent/pom.xml b/platform-parent/pom.xml
index d41a69959..4cf6297a8 100644
--- a/platform-parent/pom.xml
+++ b/platform-parent/pom.xml
@@ -14,7 +14,7 @@
ru.spcex.clearing
clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
diff --git a/pom.xml b/pom.xml
index 2ad22450c..589dae9d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
__parent_ROOT
Clearing main parent
pom
- SPCEX-3.15.207
+ SPCEX-3.15.208
clearing-parent
@@ -24,7 +24,7 @@
17
Maven
- SPCEX-3.15.207
+ SPCEX-3.15.208
2.6.3
diff --git a/z-distr/pom.xml b/z-distr/pom.xml
index e6234289d..d75750764 100644
--- a/z-distr/pom.xml
+++ b/z-distr/pom.xml
@@ -5,7 +5,7 @@
clearing
ru.spcex.clearing
- SPCEX-3.15.207
+ SPCEX-3.15.208
4.0.0