From 62cd133e894d8cc8d527d5e94a4310794e03f763 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 14 Nov 2023 14:12:20 +0800
Subject: [PATCH] 试用期校验去除
---
src/main/java/org/springblade/modules/FTP/FtpUtil.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/FtpUtil.java b/src/main/java/org/springblade/modules/FTP/FtpUtil.java
index 303fe4f..fd4e1de 100644
--- a/src/main/java/org/springblade/modules/FTP/FtpUtil.java
+++ b/src/main/java/org/springblade/modules/FTP/FtpUtil.java
@@ -98,7 +98,6 @@
//OutputStream os = new FileOutputStream(localFile);
//ftpClient.retrieveFile(fileName, os); os.close();
-
// 第二种方式下载：将输入流转成字节，再生成文件，这种方式方便将字节数组直接返回给前台jsp页面
byte[] input2byte = input2byte(retrieveFileStream);
byte2File(input2byte, localPath, fileName);
@@ -144,13 +143,14 @@
return result;
}
// 切换到上传目录
- if (!ftpClient.changeWorkingDirectory(basePath + filePath)) {
+ if (!ftpClient.changeWorkingDirectory(basePath +"/"+ filePath)) {
// 如果目录不存在创建目录
String[] dirs = filePath.split("/");
- String tempPath = basePath;
+ String tempPath = "";
for (String dir : dirs) {
- if (null == dir || "".equals(dir))
+ if (null == dir || "".equals(dir)) {
continue;
+ }
tempPath += "/" + dir;
if (!ftpClient.changeWorkingDirectory(tempPath)) {
if (!ftpClient.makeDirectory(tempPath)) {
@@ -166,8 +166,10 @@
LOCAL_CHARSET = "UTF-8";
}
ftpClient.setControlEncoding(LOCAL_CHARSET);
- ftpClient.enterLocalPassiveMode();// 设置被动模式
- ftpClient.setFileType(FTP.BINARY_FILE_TYPE);// 设置传输的模式
+ // 设置被动模式
+ ftpClient.enterLocalPassiveMode();
+ // 设置传输的模式
+ ftpClient.setFileType(FTP.BINARY_FILE_TYPE);
// 上传文件
filename = new String(filename.getBytes(LOCAL_CHARSET), SERVER_CHARSET);
if (!ftpClient.storeFile(filename, input)) {
@@ -301,7 +303,7 @@
} catch (FileNotFoundException e) {
e.printStackTrace();
}
- FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", "q"+response1+".json", in1);
+ FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpBasePath, ftpFilePath, "q"+response1+".json", in1);
MysqlCenlint.deletess("q"+response1+".json");
}
@@ -319,7 +321,7 @@
} catch (FileNotFoundException e) {
e.printStackTrace();
}
- FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", "w"+response1+".json", in1);
+ FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpBasePath, "/", "w"+response1+".json", in1);
MysqlCenlint.deletess("w"+response1+".json");
}
--
Gitblit v1.9.3