Merge remote-tracking branch 'origin/master'

Administrator

2021-09-18 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944

 src/main/java/org/springblade/modules/FTP/monitor.java

@@ -53,7 +53,6 @@
         // 设置编码格式

         ftp.setControlEncoding("GBK");

         // 提取绝对地址的目录以及文件名

         //ftpPath = ftpPath.replace("ftp://" + ftpHost + ":" + ftpPort + "/", "");
@@ -67,6 +66,7 @@
         //ftp.changeWorkingDirectory(new String(dir.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));

         // 检验文件是否存在
         ftp.changeWorkingDirectory(ftpPath);
         FTPFile[] files = ftp.listFiles();
         if (files.length == 0) {
            return false;
@@ -112,7 +112,7 @@
                  }
                  else {
                     //把文件下载到本地
                     FtpUtil.downloadFtpFile(ftpHost_dev, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
                     FtpUtil.downloadFtpFile(ftpHost_dev, ftpUserName, ftpPassword, ftpPort, ftpPath, MinioPath, fileName);
                     //MysqlCenlint.deletess(fileName);
                     FtpUtil.deleteFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
                     is.close();
@@ -166,7 +166,6 @@


      } catch (Exception e) {

         e.printStackTrace();

      } finally {