diff --git a/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/CompressUtil.java b/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/CompressUtil.java index 51d2d951..7ef01cb5 100644 --- a/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/CompressUtil.java +++ b/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/CompressUtil.java @@ -3,14 +3,15 @@ package com.baiye.util; import cn.hutool.core.text.StrPool; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; import net.lingala.zip4j.core.ZipFile; import net.lingala.zip4j.exception.ZipException; import net.lingala.zip4j.model.ZipParameters; import net.lingala.zip4j.util.Zip4jConstants; +import org.apache.commons.lang3.StringUtils; import java.io.File; import java.util.ArrayList; +import java.util.List; /** * @author Enzo @@ -45,8 +46,6 @@ public class CompressUtil { //DEFLATE_LEVEL_ULTRA - Highest compression level but low speed parameters.setCompressionLevel(Zip4jConstants.DEFLATE_LEVEL_NORMAL); - //设置压缩文件加密 - parameters.setEncryptFiles(true); //设置加密方法 parameters.setEncryptionMethod(Zip4jConstants.ENC_METHOD_AES); @@ -54,8 +53,12 @@ public class CompressUtil { //设置aes加密强度 parameters.setAesKeyStrength(Zip4jConstants.AES_STRENGTH_256); - //设置密码 - parameters.setPassword(password); + if (StringUtils.isNotBlank(password)) { + //设置压缩文件加密 + parameters.setEncryptFiles(Boolean.TRUE); + //设置密码 + parameters.setPassword(password); + } //添加文件到压缩文件 zipFile.addFiles(files, parameters);