Merge remote-tracking branch 'origin/master'

liyj

2024-09-10 abb0d631ffed8b67b0a78205ba127b46a4cb546b

 dyh-service/dyh-sys/src/main/java/cn/huge/module/file/utils/FtpUtils.java

@@ -7,6 +7,7 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPClientConfig;
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.FTPReply;
import org.springframework.stereotype.Component;

@@ -120,7 +121,8 @@
            ftpClient.connect(FtpFileConfig.getHostname(), FtpFileConfig.getPort());
            if (FTPReply.isPositiveCompletion(ftpClient.getReplyCode())) {
                log.info("连接ftp成功！");
                ftpClient.login(FtpFileConfig.getUsername(), FtpFileConfig.getPassword());
                boolean login = ftpClient.login(FtpFileConfig.getUsername(), FtpFileConfig.getPassword());
                log.info("登录ftp成功:{}",login);
                if (FTPReply.isPositiveCompletion(ftpClient.getReplyCode())) {
                    // 设置以二进制方式传输
                    ftpClient.setFileType(FTPClient.BINARY_FILE_TYPE);
@@ -130,6 +132,7 @@
                    ftpClient.setFileTransferMode(FTPClient.STREAM_TRANSFER_MODE);
                    // 设置缓冲区大小
                    ftpClient.setBufferSize(1024);

                    log.info("登录ftp成功！");
                    flag = true;
                } else {
@@ -198,7 +201,9 @@
        try {
            fileName = new String(fileName.getBytes("UTF-8"), "iso-8859-1");
            log.info("上传文件名为：" + fileName);
            ftpClient.storeFile(fileName, fileInputStream);
            boolean b = ftpClient.storeFile(fileName, fileInputStream);
            String status = ftpClient.getStatus();
            log.info("上传状态：{},{}" ,b, status);
            int reply = ftpClient.getReplyCode();
            if (FTPReply.isPositiveCompletion(reply)) {
                flag = true;