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

http://jira.mfd.msk:8088/browse/CLS-790 sftp folder path trailing slash bug fixed

Browse source
This commit is contained in:
Ivan Nikolaev-Axenov 2024-11-21 12:58:50 +03:00
parent 939c545365
commit e3099abb42
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/config/SFTPConfig.java
View file

@ -100,8 +100,13 @@ public class SFTPConfig {
@ServiceActivator(inputChannel = "listSftpChannelSdf") @ServiceActivator(inputChannel = "listSftpChannelSdf")
public MessageHandler handlerListSdf(@Qualifier("sftpSessionFactorySdf") SessionFactory<ChannelSftp.LsEntry> sessionFactory, public MessageHandler handlerListSdf(@Qualifier("sftpSessionFactorySdf") SessionFactory<ChannelSftp.LsEntry> sessionFactory,
ImportXMLServiceSettings settings) { ImportXMLServiceSettings settings) {
String localDirLocation = settings.getStore().getSrcDir();
if (!List.of("/", "\\").contains(localDirLocation.substring(localDirLocation.length() - 1))) {
localDirLocation += File.separator;
}
SftpOutboundGateway sftpOutboundGateway = new SftpOutboundGateway(sessionFactory, MGET.getCommand(), null); SftpOutboundGateway sftpOutboundGateway = new SftpOutboundGateway(sessionFactory, MGET.getCommand(), null);
sftpOutboundGateway.setLocalDirectory(new File(settings.getStore().getSrcDir())); sftpOutboundGateway.setLocalDirectory(new File(localDirLocation));
sftpOutboundGateway.setAutoCreateLocalDirectory(true); sftpOutboundGateway.setAutoCreateLocalDirectory(true);
sftpOutboundGateway.setOption(AbstractRemoteFileOutboundGateway.Option.DELETE); sftpOutboundGateway.setOption(AbstractRemoteFileOutboundGateway.Option.DELETE);
return sftpOutboundGateway; return sftpOutboundGateway;
@ -112,8 +117,13 @@ public class SFTPConfig {
@ServiceActivator(inputChannel = "listSftpChannelLks") @ServiceActivator(inputChannel = "listSftpChannelLks")
public MessageHandler handlerListLks(@Qualifier("sftpSessionFactoryLks") SessionFactory<ChannelSftp.LsEntry> sessionFactory, public MessageHandler handlerListLks(@Qualifier("sftpSessionFactoryLks") SessionFactory<ChannelSftp.LsEntry> sessionFactory,
ImportXMLServiceSettings settings) { ImportXMLServiceSettings settings) {
String localDirLocation = settings.getStore().getSrcDir();
if (!List.of("/", "\\").contains(localDirLocation.substring(localDirLocation.length() - 1))) {
localDirLocation += File.separator;
}
SftpOutboundGateway sftpOutboundGateway = new SftpOutboundGateway(sessionFactory, MGET.getCommand(), null); SftpOutboundGateway sftpOutboundGateway = new SftpOutboundGateway(sessionFactory, MGET.getCommand(), null);
sftpOutboundGateway.setLocalDirectory(new File(settings.getStoreLks().getSrcDir())); sftpOutboundGateway.setLocalDirectory(new File(localDirLocation));
sftpOutboundGateway.setAutoCreateLocalDirectory(true); sftpOutboundGateway.setAutoCreateLocalDirectory(true);
sftpOutboundGateway.setOption(AbstractRemoteFileOutboundGateway.Option.DELETE); sftpOutboundGateway.setOption(AbstractRemoteFileOutboundGateway.Option.DELETE);
return sftpOutboundGateway; return sftpOutboundGateway;