treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1177 commits 104 branches 25 tags 1.1 GiB
Commit graph

320 commits

Author SHA1 Message Date
AKurakin
3172be7554 . 2023-05-16 14:54:24 +03:00
AKurakin
11c1e705f0 Merge branch 'aalehin' into dev 
# Conflicts:
#	clearing-parent/backend-api/src/main/resources/meta/meta.xml
#	clearing-parent/backend-api/src/test/resources/meta.json
#	clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/ContractRegisterServiceTest.java
#	platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java
#	platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/LiabilitiesRegisterNewRequest.java
 2023-05-16 14:43:53 +03:00
ialbert
5ba662b11a Merge branch 'dev' into CLS-277-execution-deposit 2023-05-16 13:42:44 +03:00
ialbert
a7e2929cdb http://jira.mfd.msk:8088/browse/CLS-290 2023-05-16 13:41:36 +03:00
AKurakin
3fdc6b1dbc backend-api http://jira.mfd.msk:8088/browse/CLS-309 2023-05-15 19:53:47 +03:00
AKurakin
0dd8b6840c backend-api http://jira.mfd.msk:8088/browse/CLS-306 2023-05-15 12:07:30 +03:00
ialbert
6c23cbca36 http://jira.mfd.msk:8088/browse/CLS-290 добавил Spring KafkaTemplate 2023-05-15 12:04:05 +03:00
AKurakin
f05e93e14e platform-messaging поправил возврат текста ошибки валидаций в очередь "request-info-update" 2023-05-12 18:38:01 +03:00
etreschenkov
0147b88ba8 http://jira.mfd.msk:8088/browse/CLS-302 2023-05-12 17:45:49 +03:00
AKurakin
f74937ab8e backend-api поправил тесты 2023-05-12 15:49:18 +03:00
AKurakin
97da625d64 backend-api http://jira.mfd.msk:8088/browse/CLS-257 http://jira.mfd.msk:8088/browse/CLS-256 сверка с метой. 2023-05-12 15:25:03 +03:00
AKurakin
44b8455ea6 company-service изменил ожидаемую очередь, изменил валидацию для обновления заблокированной компании. 2023-05-12 14:38:24 +03:00
psemenkov
008a3dbf36 Merge remote-tracking branch 'origin/dev' into dev 2023-05-12 12:42:16 +03:00
AKurakin
e13968a148 backend-api мелкий рефакторинг 4 2023-05-12 12:21:47 +03:00
psemenkov
d5c929f2a4 http://jira.mfd.msk:8088/browse/CLS-262 
Добавил .sh, сделал алгоритмы выгрузки и тесты.
 2023-05-12 11:34:54 +03:00
AKurakin
4968bce3a5 backend-api мелкий рефакторинг 3 2023-05-12 10:53:23 +03:00
AKurakin
7a858cf422 Merge branch 'meta_4' into dev 2023-05-11 17:33:11 +03:00
aalehin
680d572385 fix up with meta based classes 2023-05-11 14:37:17 +03:00
AKurakin
457f051588 http://jira.mfd.msk:8088/browse/CLS-293 meta 4: правка кода, чтобы компилировалось. 2023-05-11 14:31:24 +03:00
AKurakin
c752efceec http://jira.mfd.msk:8088/browse/CLS-293 meta 4: доделал классы (не компилируется) 2023-05-11 14:20:11 +03:00
aalehin
59bfa7124e Merge branch 'meta_4' of http://git.mfd.msk/mfd/clearing into aalehin 
 Conflicts:
	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/AdmittedLiabilitiesRegister.java
	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/CoveredLiabilitiesRegister.java
	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoBalanceRegister.java
	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoPaymentInstructionRegister.java
	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ExcludeLiabilitiesRegister.java
	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ExecutionRegister.java
	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/LiabilitiesRegister.java
	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyBalanceRegister.java
	clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyPaymentInstructionRegister.java
	platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java
	platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyPaymentInstructionRegisterNewRequest.java
 2023-05-11 13:58:44 +03:00
psemenkov
39167a2e8e Merge remote-tracking branch 'origin/CLS-262' into dev 2023-05-11 13:51:13 +03:00
psemenkov
b214aa8415 Merge remote-tracking branch 'origin/dev' into CLS-262 2023-05-11 13:50:12 +03:00
ialbert
837485e96e Merge branch 'dev' into CLS-277-execution-deposit 
# Conflicts:
#	platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/service/QueueConsumer.java
 2023-05-11 12:23:28 +03:00
ialbert
3931d453da http://jira.mfd.msk:8088/browse/CLS-290 Добавил CORRELATION_ID header в сообщения кафки, для использования Spring ReplyingKafkaTemplate 2023-05-11 12:18:48 +03:00
AKurakin
c427338121 http://jira.mfd.msk:8088/browse/CLS-293 meta 4: добавил регистры 2023-05-10 19:52:08 +03:00
AKurakin
61ed69c676 http://jira.mfd.msk:8088/browse/CLS-293 meta 4: добавил новые словари 2023-05-10 19:21:30 +03:00
AKurakin
d9fa17b0c7 http://jira.mfd.msk:8088/browse/CLS-293 meta 4: зачистка удаляемых объектов 2023-05-10 18:48:16 +03:00
aalehin
c6f0abfea3 http://jira.mfd.msk:8088/browse/CLS-280 
---
registry service done
 2023-05-10 18:13:44 +03:00
akulikov
833e7b670d http://jira.mfd.msk:8088/browse/CLS-271 2023-05-10 15:48:54 +03:00
AKurakin
f001e551af Merge branch 'CLS-284' into dev 2023-05-10 12:19:22 +03:00
AKurakin
a37fea5061 company-service http://jira.mfd.msk:8088/browse/CLS-284 доделал кроме странной логики валидации 2023-05-05 20:17:35 +03:00
akulikov
65c235c01c http://jira.mfd.msk:8088/browse/CLS-265 auto request for TCR new 2023-05-05 18:28:32 +03:00
psemenkov
c5b80bd3c9 http://jira.mfd.msk:8088/browse/CLS-276 
Добавил поле в запрос.
 2023-05-05 15:21:22 +03:00
psemenkov
05285cb12a Merge remote-tracking branch 'origin/dev' into CLS-262 
# Conflicts:
#	clearing-parent/pom.xml
 2023-05-05 14:39:57 +03:00
psemenkov
e1b9076cd1 http://jira.mfd.msk:8088/browse/CLS-262 
Добавил sFTP сервис.
 2023-05-05 14:39:11 +03:00
AKurakin
cdd6a0996f QueueConsumer улучшил логирование ошибок. IMDGMessageResolver добавил надёжности при ошибках форматирования ошибок. 2023-05-05 11:57:49 +03:00
akulikov
9d1a378447 http://jira.mfd.msk:8088/browse/CLS-271 TradingClearingRegistryService 2023-05-05 10:45:01 +03:00
akulikov
71203b08e7 http://jira.mfd.msk:8088/browse/CLS-271 fix statuses 2023-05-05 09:58:01 +03:00
AKurakin
864bbcf125 company-service http://jira.mfd.msk:8088/browse/CLS-272 исправил использование BiDirectionQueueExchanger 2023-05-04 16:29:52 +03:00
AKurakin
f1a803aacf merge ветку http://jira.mfd.msk:8088/browse/CLS-272 2023-05-04 16:17:21 +03:00
ialbert
c8d45cc872 Merge branch 'dev' into CLS-277-execution-deposit 2023-05-04 13:30:49 +03:00
ialbert
be93eb1ded http://jira.mfd.msk:8088/browse/CLS-278 2023-05-04 12:37:47 +03:00
akulikov
b60f046a8c Merge branch 'dev' into cls-271 
# Conflicts:
#	platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java
 2023-05-04 12:03:41 +03:00
AKurakin
29b47b8b96 QueueConsumer защита от переполнения спамом логов 2023-05-03 19:02:00 +03:00
ialbert
246dc403af http://jira.mfd.msk:8088/browse/CLS-277 2023-05-03 18:23:36 +03:00
akulikov
2ad812d603 Merge branch 'cls-265' into dev 
# Conflicts:
#	platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java
 2023-05-03 17:55:45 +03:00
akulikov
93d707961c TradingClearingRegistryService in progress 2023-05-03 17:47:19 +03:00
ialbert
ed47b5291b http://jira.mfd.msk:8088/browse/CLS-277 2023-05-03 17:29:23 +03:00
akulikov
d2a48a22cf Merge branch 'cls-265' into cls-271 
# Conflicts:
#	platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java
 2023-05-03 15:10:20 +03:00