From 5fcec99e6cf7e9e059729fcb30a0dc0621462591 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Tue, 18 Apr 2023 16:07:22 +0800
Subject: [PATCH] !321 解决文件输入流为可能为空的问题 Merge pull request !321 from maochd/master
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java
index 9dfca16..0c28db7 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java
@@ -18,7 +18,7 @@
*
* @author ruoyi
*/
-public class FileUtils extends org.apache.commons.io.FileUtils
+public class FileUtils
{
/** 字符常量：斜杠 {@code '/'} */
public static final char SLASH = '/';
@@ -97,8 +97,7 @@
// 路径为文件且不为空则进行删除
if (file.isFile() && file.exists())
{
- file.delete();
- flag = true;
+ flag = file.delete();
}
return flag;
}
@@ -127,15 +126,8 @@
{
return false;
}
-
- // 检查允许下载的文件规则
- if (ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource)))
- {
- return true;
- }
-
- // 不在允许下载的文件规则
- return false;
+ // 判断是否在允许下载的文件规则内
+ return ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource));
}
/**
@@ -244,6 +236,7 @@
.append(percentEncodedFileName);
response.setHeader("Content-disposition", contentDispositionValue.toString());
+ response.setHeader("download-filename", percentEncodedFileName);
}
/**
--
Gitblit v1.9.3