From 62d277337f838bbc47c82b08f118e58c35f6a0a1 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 28 二月 2020 21:39:31 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
java110-core/src/main/java/com/java110/core/client/FtpUploadTemplate.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 0507a16..e1a881d 100644
--- a/java110-core/src/main/java/com/java110/core/client/FtpUploadTemplate.java
+++ b/java110-core/src/main/java/com/java110/core/client/FtpUploadTemplate.java
@@ -24,7 +24,7 @@
* private static String userPassword ="MXUsssMjhssE+*=a3C4\\0";//瀵嗙爜
*/
private static String ftpPath = "uploadFiles"; // 鏂囦欢涓婁紶鐩綍
- private FTPClient ftpClient = null;
+
private static String LOCAL_CHARSET = "GBK";
private static String SERVER_CHARSET = "ISO-8859-1";
private final static String localpath = "F:/";//涓嬭浇鍒癋鐩樹笅
@@ -41,6 +41,7 @@
public String upload(String imageBase64, String server, int port,
String userName, String userPassword, String ftpPath) {
String fileName = "";
+ FTPClient ftpClient = null;
try {
ftpClient = new FTPClient();
// request.setCharacterEncoding("utf-8");
@@ -66,7 +67,10 @@
} else if (imageBase64.contains("data:image/webp;base64,")) {
imageBase64 = imageBase64.replace("data:image/webp;base64,", "");
fileName += ".jpg";
- } else {
+ } else if(imageBase64.contains("data:application/octet-stream;base64,")){
+ imageBase64 = imageBase64.replace("data:application/octet-stream;base64,", "");
+ fileName += ".jpg";
+ }else {
fileName += ".jpg";
}
FTPFile[] fs = ftpClient.listFiles(fileName);
@@ -106,6 +110,7 @@
public String upload(MultipartFile uploadFile, String server, int port,
String userName, String userPassword, String ftpPath) {
String fileName = "";
+ FTPClient ftpClient = null;
try {
// request.setCharacterEncoding("utf-8");
ftpClient = new FTPClient();
@@ -153,7 +158,9 @@
*/
public byte[] downFileByte(String remotePath, String fileName, String server, int port, String userName, String userPassword) {
byte[] return_arraybyte = null;
+ FTPClient ftpClient = null;
try {
+ ftpClient = new FTPClient();
ftpClient.connect(server, port);
ftpClient.login(userName, userPassword);
ftpClient.enterLocalPassiveMode();
--
Gitblit v1.8.0