From 4e7907983a99e695f2acba4dec8bd73b7dbe6b2b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 29 六月 2023 14:41:33 +0800
Subject: [PATCH] optimize
---
java110-core/src/main/java/com/java110/core/client/FtpUploadTemplate.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/client/FtpUploadTemplate.java b/java110-core/src/main/java/com/java110/core/client/FtpUploadTemplate.java
index 55dc57b..6df6f82 100755
--- a/java110-core/src/main/java/com/java110/core/client/FtpUploadTemplate.java
+++ b/java110-core/src/main/java/com/java110/core/client/FtpUploadTemplate.java
@@ -79,9 +79,6 @@
} else if (imageBase64.contains("data:application/octet-stream;base64,")) {
imageBase64 = imageBase64.replace("data:application/octet-stream;base64,", "");
fileName += ".jpg";
- } else if (imageBase64.contains(".mp4") || imageBase64.contains(".MP4") || imageBase64.contains(".AVI") || imageBase64.contains(".avi")
- || imageBase64.contains(".WMV") || imageBase64.contains(".wmv")) {
- fileName += ".mp4";
} else {
fileName += ".jpg";
}
@@ -175,7 +172,7 @@
String ftpPath = "/";
if(fileName.contains("/")){
- ftpPath = fileName.substring(0,fileName.lastIndexOf("/"));
+ ftpPath = fileName.substring(0,fileName.lastIndexOf("/")+1);
}
try {
@@ -191,6 +188,7 @@
mkDir(ftpClient, ftpPath);// 鍒涘缓鐩綍
// 璁剧疆涓婁紶鐩綍 must
ftpClient.changeWorkingDirectory(ftpPath);
+
if (FTPReply.isPositiveCompletion(ftpClient.sendCommand("OPTS UTF8", "ON"))) {// 寮�鍚湇鍔″櫒瀵筓TF-8鐨勬敮鎸侊紝濡傛灉鏈嶅姟鍣ㄦ敮鎸佸氨鐢║TF-8缂栫爜锛屽惁鍒欏氨浣跨敤鏈湴缂栫爜锛圙BK锛�.
LOCAL_CHARSET = "UTF-8";
}
@@ -203,7 +201,7 @@
System.out.println("this file exist ftp");
ftpClient.deleteFile(fs[0].getName());
}
- boolean saveFlag = ftpClient.storeFile(fileName, inputStream);
+ boolean saveFlag = ftpClient.storeFile("/"+fileName, inputStream);
if (!saveFlag) {
throw new IllegalArgumentException("瀛樺偍鏂囦欢澶辫触");
}
@@ -421,7 +419,7 @@
ftpClient.disconnect();
}
String f = new String(
- (fileName).getBytes("GBK"),
+ ("/"+fileName).getBytes("GBK"),
FTP.DEFAULT_CONTROL_ENCODING);
is = ftpClient.retrieveFileStream(f);// 鑾峰彇杩滅▼ftp涓婃寚瀹氭枃浠剁殑InputStream
if (null == is) {
@@ -432,11 +430,11 @@
logger.error("ftp閫氳繃鏂囦欢鍚嶇О鑾峰彇杩滅▼鏂囦欢娴�", e);
} finally {
try {
- //closeConnect(ftpClient);
+ closeConnect(ftpClient);
} catch (Exception e) {
e.printStackTrace();
}
}
- return null;
+ return is;
}
}
--
Gitblit v1.8.0