ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2021-05-13 16:41:40 +08:00
parent 389ce1d27e
commit 415b2a285f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hutool-core/src/main/java/cn/hutool/core/util/ZipUtil.java
View File

@ -1068,13 +1068,14 @@ public class ZipUtil {
final String subPath = FileUtil.subPath(srcRootDir, file); // 获取文件相对于压缩文件夹根目录的子路径 final String subPath = FileUtil.subPath(srcRootDir, file); // 获取文件相对于压缩文件夹根目录的子路径
if (file.isDirectory()) {// 如果是目录，则压缩压缩目录中的文件或子目录 if (file.isDirectory()) {// 如果是目录，则压缩压缩目录中的文件或子目录
final File[] files = file.listFiles(); final File[] files = file.listFiles();
if (ArrayUtil.isEmpty(files) && StrUtil.isNotEmpty(subPath)) { if (ArrayUtil.isEmpty(files)) {
// 加入目录，只有空目录时才加入目录，非空时会在创建文件时自动添加父级目录 // 加入目录，只有空目录时才加入目录，非空时会在创建文件时自动添加父级目录
addDir(subPath, out); addDir(subPath, out);
} } else{
// 压缩目录下的子文件或目录 // 压缩目录下的子文件或目录
for (File childFile : files) { for (File childFile : files) {
zip(childFile, srcRootDir, out, filter); zip(childFile, srcRootDir, out, filter);
}
} }
} else {// 如果是文件或其它符号，则直接压缩该文件 } else {// 如果是文件或其它符号，则直接压缩该文件
add(file, subPath, out); add(file, subPath, out);
@ -1125,6 +1126,11 @@ public class ZipUtil {
* @throws UtilException IO异常 * @throws UtilException IO异常
*/ */
private static void addDir(String path, ZipOutputStream out) throws UtilException { private static void addDir(String path, ZipOutputStream out) throws UtilException {
if(StrUtil.isEmpty(path)){
// 空路径不处理
return;
}
path = StrUtil.addSuffixIfNot(path, StrUtil.SLASH); path = StrUtil.addSuffixIfNot(path, StrUtil.SLASH);
try { try {
out.putNextEntry(new ZipEntry(path)); out.putNextEntry(new ZipEntry(path));
@ -1224,4 +1230,4 @@ public class ZipUtil {
} }
// ---------------------------------------------------------------------------------------------- Private method end // ---------------------------------------------------------------------------------------------- Private method end
} }