From f020153363d89c8c7735c6d3d08a173acda05f55 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 17 Jun 2024 14:53:08 +0300 Subject: [PATCH 1/2] =?UTF-8?q?meta=203.12.0.93=20=D0=BD=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/meta/meta.json | 21 +++++-------------- .../src/main/resources/meta/meta.xml | 14 ++++++------- .../backend-api/src/test/resources/meta.json | 21 +++++-------------- 3 files changed, 17 insertions(+), 39 deletions(-) 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 17439b927..ad37e5070 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.12.0.92", + "version": "3.12.0.93", "enums": { @@ -4918,7 +4918,7 @@ } , {"code": "bankName", - "type": 2,"length": 255,"name": "Наименование банка","shortname": "Наименование","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 255,"name": "Наименование компании в банке","shortname": "Наименование компании","searchable": true,"sortable": true,"visible": true } , {"code": "correspondentAccount", @@ -4996,7 +4996,7 @@ } , {"code": "bankName", - "type": 2,"length": 255,"name": "Наименование банка","shortname": "Наименование","required": true + "type": 2,"length": 255,"name": "Наименование компании в банке","shortname": "Наименование компании","required": true } , {"code": "correspondentAccount", @@ -5059,7 +5059,7 @@ } , {"code": "bankName", - "type": 2,"length": 255,"name": "Наименование банка","shortname": "Наименование" + "type": 2,"length": 255,"name": "Наименование компании в банке","shortname": "Наименование компании" } , {"code": "correspondentAccount", @@ -5887,7 +5887,7 @@ } , {"code": "debitLeg_accountId", - "type": 1,"group": "Получатель","name": "Наименование счета получателя","shortname": "Счет получателя","link": "bankAccount","linkCode": "correspondentAccount" + "type": 1,"group": "Получатель","name": "Наименование счета получателя","shortname": "Счет получателя","link": "bankAccount","linkCode": "account" } , {"code": "swiftCode", @@ -6062,17 +6062,6 @@ "name": "Выгрузка ТКР", - "fields": [] - } - , - {"method":"post", - - "destination": "LIMC", - - "group": "Обмен с Торговой системой", - - "name": "Выгрузка в Торговую систему остатков по валют (отправка lim)", - "fields": [] } ] 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 0708e9b8b..b6ada0a84 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 @@ - + @@ -1141,7 +1141,7 @@ - + @@ -1160,7 +1160,7 @@ - + @@ -1175,7 +1175,7 @@ - + @@ -1367,7 +1367,7 @@ - + @@ -1402,8 +1402,8 @@ - - + + diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index 17439b927..ad37e5070 100644 --- a/clearing-parent/backend-api/src/test/resources/meta.json +++ b/clearing-parent/backend-api/src/test/resources/meta.json @@ -1,6 +1,6 @@ { - "version": "3.12.0.92", + "version": "3.12.0.93", "enums": { @@ -4918,7 +4918,7 @@ } , {"code": "bankName", - "type": 2,"length": 255,"name": "Наименование банка","shortname": "Наименование","searchable": true,"sortable": true,"visible": true + "type": 2,"length": 255,"name": "Наименование компании в банке","shortname": "Наименование компании","searchable": true,"sortable": true,"visible": true } , {"code": "correspondentAccount", @@ -4996,7 +4996,7 @@ } , {"code": "bankName", - "type": 2,"length": 255,"name": "Наименование банка","shortname": "Наименование","required": true + "type": 2,"length": 255,"name": "Наименование компании в банке","shortname": "Наименование компании","required": true } , {"code": "correspondentAccount", @@ -5059,7 +5059,7 @@ } , {"code": "bankName", - "type": 2,"length": 255,"name": "Наименование банка","shortname": "Наименование" + "type": 2,"length": 255,"name": "Наименование компании в банке","shortname": "Наименование компании" } , {"code": "correspondentAccount", @@ -5887,7 +5887,7 @@ } , {"code": "debitLeg_accountId", - "type": 1,"group": "Получатель","name": "Наименование счета получателя","shortname": "Счет получателя","link": "bankAccount","linkCode": "correspondentAccount" + "type": 1,"group": "Получатель","name": "Наименование счета получателя","shortname": "Счет получателя","link": "bankAccount","linkCode": "account" } , {"code": "swiftCode", @@ -6062,17 +6062,6 @@ "name": "Выгрузка ТКР", - "fields": [] - } - , - {"method":"post", - - "destination": "LIMC", - - "group": "Обмен с Торговой системой", - - "name": "Выгрузка в Торговую систему остатков по валют (отправка lim)", - "fields": [] } ] From 03f9c065c7fd4a5ea83cb8f0c3bd46d546055bb6 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 18 Jun 2024 10:29:51 +0300 Subject: [PATCH 2/2] =?UTF-8?q?registry-service=20http://jira.mfd.msk:8088?= =?UTF-8?q?/browse/CLS-680=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?application.properties?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.properties | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/clearing-parent/registry-service/src/main/resources/application.properties b/clearing-parent/registry-service/src/main/resources/application.properties index 987266aeb..303cff8ab 100644 --- a/clearing-parent/registry-service/src/main/resources/application.properties +++ b/clearing-parent/registry-service/src/main/resources/application.properties @@ -1,14 +1,13 @@ # DB of Clearing -registry-service.dbClearing.url=jdbc:postgresql://10.200.200.133:5432/clearing?currentSchema=clearing_dev -#registry-service.dbClearing.url=jdbc:postgresql://10.200.200.133:5432/clearing_test?currentSchema=clearing_test -registry-service.dbClearing.driver=org.postgresql.Driver -registry-service.dbClearing.username=cls_dev -#registry-service.dbClearing.username=cls_test -registry-service.dbClearing.password=Aa111111 -registry-service.outFolder=/opt/mfd/clearing/reestr_out\ -#./reports_out_temp -# use SFTP (TODO optional): +registry-service.db-clearing.url=jdbc:postgresql://10.200.200.133:5432/clearing_uat +registry-service.db-clearing.driver=org.postgresql.Driver +registry-service.db-clearing.username=clearing +registry-service.db-clearing.password=Aa111111 + +registry-service.outFolder=/opt/mfd/clearing/reestr_out/ + +# use SFTP (not implemented): #registry-service.reports-store.local-temp-dir=./reports_out_temp #registry-service.reports-store.out-dir=reports #registry-service.reports-store.user=tester