|
@@ -15,6 +15,7 @@ import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import java.io.File;
|
|
|
+import java.nio.charset.Charset;
|
|
|
import java.util.List;
|
|
|
import java.util.Objects;
|
|
|
import java.util.Optional;
|
|
@@ -170,7 +171,7 @@ public class Zip4jUtil {
|
|
|
}
|
|
|
// 生成的压缩文件
|
|
|
ZipFile zipFile = new ZipFile(scrPath);
|
|
|
-// zipFile.setCharset(Charset.forName("UTF-8"));
|
|
|
+ zipFile.setCharset(Charset.forName("UTF-8"));
|
|
|
if (Objects.nonNull(password)) {
|
|
|
zipFile.setPassword(password.toCharArray());
|
|
|
}
|
|
@@ -183,7 +184,7 @@ public class Zip4jUtil {
|
|
|
parameters.setEncryptFiles(true);
|
|
|
parameters.setEncryptionMethod(EncryptionMethod.AES);
|
|
|
parameters.setAesKeyStrength(AesKeyStrength.KEY_STRENGTH_256);
|
|
|
-// parameters.setPassword(password);
|
|
|
+ // parameters.setPassword(password);
|
|
|
}
|
|
|
|
|
|
File[] fs = null;
|