From 2ff71f7cecda4e5fa020c1e7d4d0e02ee4ab6a84 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Thu, 20 Jun 2024 19:13:21 +0300 Subject: [PATCH] =?UTF-8?q?dbf-importer=20dbf-exporter=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20/=20=D0=B2=20=D0=BD?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B0=D1=85=20sftp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clearing/dbf/exporter/logic/stages/PrepareDBFFile.java | 2 ++ .../dbf-exporter/src/main/resources/application.properties | 6 +++--- .../spcex/clearing/dbf/importer/services/FileChecker.java | 2 ++ .../dbf-importer/src/main/resources/application.properties | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) 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 0a04e133e..c38ddd3f7 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 @@ -47,6 +47,8 @@ public class PrepareDBFFile extends Stage implements InitializingBean { List files = new ArrayList<>(); log.trace("Get files from SFTP paths: {}", settings.getStore().getOutPayValDir().values()); for (String path : settings.getStore().getOutPayValDir().values()) { + if (!path.endsWith("/")) // без "/" на конце папки пишет ошибку: Caused by: com.jcraft.jsch.SftpException: No such file + path += "/"; files.addAll(gateway.listFiles(path)); } log.info("There are {} files on the sFTP server in the search directories.", files.size()); diff --git a/clearing-parent/dbf-exporter/src/main/resources/application.properties b/clearing-parent/dbf-exporter/src/main/resources/application.properties index 0bdbdcaa5..1f8e20723 100644 --- a/clearing-parent/dbf-exporter/src/main/resources/application.properties +++ b/clearing-parent/dbf-exporter/src/main/resources/application.properties @@ -7,10 +7,10 @@ export-dbf-service.hazelcast.password=dev-pass export-dbf-service.common.encoding=cp866 export-dbf-service.common.threads-count=10 -export-dbf-service.store.local-temp-dir=D:\\docs and T3\\clearing\\dbf\\ +export-dbf-service.store.local-temp-dir=D:\\docs and T3\\clearing\\dbf # код валюты должен быть в верхнем регистре, например для рублей - "RUB" (*.RUB=export/rub/).RUB=export/rub/ -export-dbf-service.store.out-pay-val-dir.RUB=export/rub/ -export-dbf-service.store.out-pay-val-dir.EUR=export/eur/ +export-dbf-service.store.out-pay-val-dir.RUB=export/rub +export-dbf-service.store.out-pay-val-dir.EUR=export/eur export-dbf-service.store.user:tester export-dbf-service.store.password=password export-dbf-service.store.server-ip=10.230.238.53 diff --git a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/FileChecker.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/FileChecker.java index 778b5b04e..47ab54498 100644 --- a/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/FileChecker.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/FileChecker.java @@ -78,6 +78,8 @@ public class FileChecker { List files = new ArrayList<>(); log.trace("Load from SFTP paths: {}", settings.getStore().getSftpIn().getSftpSrcPayValDir().values()); for (String path : settings.getStore().getSftpIn().getSftpSrcPayValDir().values()) { + if (!path.endsWith("/")) // без "/" на конце папки пишет ошибку: Caused by: com.jcraft.jsch.SftpException: No such file + path += "/"; files.addAll(gateway.listFiles(path)); } if (files.size() > 0) log.info("Loaded from SFTP files count={}", files.size()); diff --git a/clearing-parent/dbf-importer/src/main/resources/application.properties b/clearing-parent/dbf-importer/src/main/resources/application.properties index 7957a0c9e..d077d0320 100644 --- a/clearing-parent/dbf-importer/src/main/resources/application.properties +++ b/clearing-parent/dbf-importer/src/main/resources/application.properties @@ -14,8 +14,8 @@ import-dbf-service.common.insert-batch-size=100 import-dbf-service.common.threads-count=10 #sftpSrcDir -import-dbf-service.store.sftp-in.sftp-src-pay-val-dir.rub=clearing_importer_sftp/rub/ -import-dbf-service.store.sftp-in.sftp-src-pay-val-dir.eur=clearing_importer_sftp/eur/ +import-dbf-service.store.sftp-in.sftp-src-pay-val-dir.rub=clearing_importer_sftp/rub +import-dbf-service.store.sftp-in.sftp-src-pay-val-dir.eur=clearing_importer_sftp/eur import-dbf-service.store.sftp-in.sftp-src-dir=clearing_importer_sftp import-dbf-service.store.sftp-in.user=user import-dbf-service.store.sftp-in.password=*********