From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改

---
 src/main/java/org/springblade/modules/FTP/FtpUtil.java |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/FTP/FtpUtil.java b/src/main/java/org/springblade/modules/FTP/FtpUtil.java
index c5c19ea..d5540d1 100644
--- a/src/main/java/org/springblade/modules/FTP/FtpUtil.java
+++ b/src/main/java/org/springblade/modules/FTP/FtpUtil.java
@@ -6,13 +6,14 @@
 import org.apache.commons.net.ftp.FTP;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPReply;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.io.*;
 import java.net.SocketException;
 import java.util.Date;
+import net.lingala.zip4j.core.ZipFile;
 
-import static org.springblade.common.constant.FtpConstant.*;
-import static org.springblade.common.constant.FtpConstant.ftpPath;
+import static org.springblade.common.config.FtpConfig.*;
 
 /**
  * ftp工具类
@@ -301,7 +302,60 @@
 		} catch (FileNotFoundException e) {
 			e.printStackTrace();
 		}
-		FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/",  "n"+response1+".json", in1);
+		FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, "/",  "n"+response1+".json", in1);
 	}
+	/**
+	 *
+	 * 解压zip 包
+	 * @author panchaoyuan
+	 * @param srcFile    Unzipped file
+	 * @param destDirPath   Unzipped destination folder
+	 * @throws RuntimeException
+	 * @throws IOException
+	 */
+	public static void unZip(MultipartFile srcFile, String destDirPath, String savePath) throws RuntimeException, IOException {
+		File file = null;
+		InputStream ins = srcFile.getInputStream();
+		String savaPaths = savePath+srcFile.getOriginalFilename();
+		file=new File(savaPaths);
+		inputStreamToFile(ins, file);
+
+		if (!file.exists()) {
+			throw new RuntimeException(file.getPath() + ",file is not found");
+		}
+		ZipFile zipFile = null;
+		try {
+			zipFile = new ZipFile(file);
+//			zipFile.setFileNameCharset("utf-8");
+			zipFile.setFileNameCharset("gbk");
+			//解压到 destDirPath
+			zipFile.extractAll(destDirPath);
+		}catch(Exception e) {
+			throw new RuntimeException("unzip error from FileUtil", e);
+		}
+	}
+
+
+	/**
+	 * 输入流转换为文件
+	 * @author panchaoyuan
+	 * @return
+	 */
+	private static void inputStreamToFile(InputStream ins, File file) {
+		try {
+			OutputStream os = new FileOutputStream(file);
+			int bytesRead = 0;
+			byte[] buffer = new byte[8192];
+			while ((bytesRead = ins.read(buffer, 0, 8192)) != -1) {
+				os.write(buffer, 0, bytesRead);
+			}
+			os.close();
+			ins.close();
+		}catch(Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+
 
 }

--
Gitblit v1.9.3