From 92ed53e44fb2da1f91b8fb9932af8ff433febe83 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 06 七月 2022 18:47:09 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/client/FtpUploadTemplate.java | 36 ++++++++++++------------------------
1 files changed, 12 insertions(+), 24 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
old mode 100644
new mode 100755
index f54d2cc..ba1a4a6
--- a/java110-core/src/main/java/com/java110/core/client/FtpUploadTemplate.java
+++ b/java110-core/src/main/java/com/java110/core/client/FtpUploadTemplate.java
@@ -7,7 +7,7 @@
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.FTPReply;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
@@ -16,6 +16,7 @@
@Component
public class FtpUploadTemplate {
+
private static Logger logger = LoggerFactory.getLogger(FtpUploadTemplate.class);
/*
@@ -24,17 +25,21 @@
* private static String userPassword ="MXUsssMjhssE+*=a3C4\\0";//瀵嗙爜
*/
private static String ftpPath = "uploadFiles"; // 鏂囦欢涓婁紶鐩綍
-
private static String LOCAL_CHARSET = "GBK";
private static String SERVER_CHARSET = "ISO-8859-1";
private final static String localpath = "F:/";//涓嬭浇鍒癋鐩樹笅
private final static String fileSeparator = System.getProperty("file.separator");
-
private final static String DEFAULT_IMG_SUFFIX = ".jpg";
-
private final static String IMAGE_DEFAULT_PATH = "img/";
- private final static String VIDEO_PATH = "video/";
+
+ public final static String FTP_DOMAIN = "FTP_DOMAIN";
+ public final static String FTP_SERVER = "FTP_SERVER";
+ public final static String FTP_PORT = "FTP_PORT";
+ public final static String FTP_USERNAME = "FTP_USERNAME";
+ public final static String FTP_USERPASSWORD = "FTP_USERPASSWORD";
+ public final static String FTP_PATH = "FTP_PATH";
+
/*
*鍥剧墖涓婁紶宸ュ叿鏂规硶
@@ -54,12 +59,7 @@
ftpClient.login(userName, userPassword);
ftpClient.enterLocalPassiveMode();
ftpClient.setFileType(FTP.BINARY_FILE_TYPE);
- if (imageBase64.contains("mp4") || imageBase64.contains("MP4") || imageBase64.contains("AVI") || imageBase64.contains("avi")
- || imageBase64.contains("WMV") || imageBase64.contains("wmv")) {
- ftpPath = ftpPath + VIDEO_PATH + DateUtil.getNowII() + "/";
- } else {
- ftpPath = ftpPath + IMAGE_DEFAULT_PATH + DateUtil.getNowII() + "/";
- }
+ ftpPath = ftpPath + IMAGE_DEFAULT_PATH + DateUtil.getNowII() + "/";
mkDir(ftpClient, ftpPath);// 鍒涘缓鐩綍
// 璁剧疆涓婁紶鐩綍 must
ftpClient.changeWorkingDirectory(ftpPath);
@@ -67,7 +67,6 @@
LOCAL_CHARSET = "UTF-8";
}
fileName = UUID.randomUUID().toString();
-
if (imageBase64.contains("data:image/png;base64,")) {
imageBase64 = imageBase64.replace("data:image/png;base64,", "");
fileName += ".png";
@@ -93,12 +92,9 @@
System.out.println("this file exist ftp");
ftpClient.deleteFile(fs[0].getName());
}
-
-
byte[] context = Base64Convert.base64ToByte(imageBase64);
is = new ByteArrayInputStream(context);
boolean saveFlag = ftpClient.storeFile(fileName, is);
-
if (!saveFlag) {
throw new IllegalArgumentException("瀛樺偍鏂囦欢澶辫触");
}
@@ -116,14 +112,8 @@
logger.error("鍏抽棴ftpClient 澶辫触", e);
}
}
- if (imageBase64.contains("mp4") || imageBase64.contains("MP4") || imageBase64.contains("AVI") || imageBase64.contains("avi")
- || imageBase64.contains("WMV") || imageBase64.contains("wmv")) {
- return VIDEO_PATH + DateUtil.getNowII() + "/" + fileName;
- } else {
- return IMAGE_DEFAULT_PATH + DateUtil.getNowII() + "/" + fileName;
- }
+ return IMAGE_DEFAULT_PATH + DateUtil.getNowII() + "/" + fileName;
}
-
/*
*鏂囦欢涓婁紶宸ュ叿鏂规硶
@@ -232,7 +222,6 @@
FtpUploadTemplate ftpUploadTemplate = new FtpUploadTemplate();
String img = ftpUploadTemplate.download("/hc/img/20200518/", "ed05abae-2eca-40ff-81a8-b586ff2e6a36.jpg",
"118.89.243.11", 617, "hcdemo", "45j74jpWTf7bNhnC");
-
System.out.printf("img=" + img);
}
@@ -360,5 +349,4 @@
return false;
}
}
-
}
--
Gitblit v1.8.0