From b6b0cb226fcf184525ee7b36af3a09471e9c0057 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 25 三月 2024 11:29:33 +0800
Subject: [PATCH] 修改数据统计的查询条件
---
src/main/java/com/lf/server/helper/Zip4jHelper.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/lf/server/helper/Zip4jHelper.java b/src/main/java/com/lf/server/helper/Zip4jHelper.java
index 57a6ebb..5440578 100644
--- a/src/main/java/com/lf/server/helper/Zip4jHelper.java
+++ b/src/main/java/com/lf/server/helper/Zip4jHelper.java
@@ -11,6 +11,7 @@
import org.apache.commons.logging.LogFactory;
import java.io.File;
+import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
/**
@@ -41,7 +42,7 @@
f.delete();
}
- ZipParameters params = getZipParams();
+ ZipParameters params = getZipParams(!StringHelper.isEmpty(pwd));
// 瑕佹墦鍖呯殑鏂囦欢鎴栨枃浠跺す
File currentFile = new File(sourcePath);
@@ -64,6 +65,7 @@
public static ZipFile createZipFile(String zipFile, String pwd) {
try {
ZipFile zip = StringHelper.isEmpty(pwd) ? new ZipFile(zipFile) : new ZipFile(zipFile, pwd.toCharArray());
+ // zip.setCharset(Charset.forName("GBK"))
zip.setCharset(StandardCharsets.UTF_8);
File f = zip.getFile();
@@ -84,23 +86,34 @@
/**
* 鑾峰彇ZipParameters
*/
- public static ZipParameters getZipParams() {
+ public static ZipParameters getZipParams(boolean hasPwd) {
// 璁剧疆鍘嬬缉鏂囦欢鍙傛暟
ZipParameters params = new ZipParameters();
// 鍘嬬缉鏂瑰紡
params.setCompressionMethod(CompressionMethod.DEFLATE);
// 鍘嬬缉绾у埆
params.setCompressionLevel(CompressionLevel.MAXIMUM);
- // 鏄惁璁剧疆鍔犲瘑鏂囦欢
- params.setEncryptFiles(true);
- // 璁剧疆AES鍔犲瘑寮哄害锛欿EY_STRENGTH_256
- params.setAesKeyStrength(AesKeyStrength.KEY_STRENGTH_128);
- // 璁剧疆鍔犲瘑绠楁硶
- params.setEncryptionMethod(EncryptionMethod.AES);
+
+ if (hasPwd) {
+ // 鏄惁璁剧疆鍔犲瘑鏂囦欢
+ params.setEncryptFiles(true);
+ // 璁剧疆AES鍔犲瘑寮哄害锛欿EY_STRENGTH_256
+ params.setAesKeyStrength(AesKeyStrength.KEY_STRENGTH_128);
+ // 璁剧疆鍔犲瘑绠楁硶
+ params.setEncryptionMethod(EncryptionMethod.AES);
+ }
return params;
}
+ /**
+ * 娣诲姞鏂囦欢鑷冲帇缂╁寘
+ *
+ * @param zip ZipFile
+ * @param params ZipParameters
+ * @param file File
+ * @throws ZipException
+ */
private static void addZipFile(ZipFile zip, ZipParameters params, File file) throws ZipException {
if (file.isDirectory()) {
File[] files = file.listFiles();
--
Gitblit v1.9.3