From 17f0c20242c6ee3d35b9ee8f677d747ed012423c Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 02 九月 2022 16:30:20 +0800 Subject: [PATCH] remove 移除maven docker插件 过于老旧功能缺陷大 使用idea自带的docker插件替代 --- ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java | 103 +++++++-------------------------------------------- 1 files changed, 15 insertions(+), 88 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java index d30ac51..1ef2229 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java @@ -1,10 +1,9 @@ package com.ruoyi.common.utils.file; import cn.hutool.core.io.FileUtil; -import cn.hutool.core.util.ArrayUtil; -import com.ruoyi.common.utils.StringUtils; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -13,102 +12,31 @@ /** * 鏂囦欢澶勭悊宸ュ叿绫� * - * @author ruoyi + * @author Lion Li */ -public class FileUtils extends FileUtil -{ - public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+"; - - /** - * 鏂囦欢鍚嶇О楠岃瘉 - * - * @param filename 鏂囦欢鍚嶇О - * @return true 姝e父 false 闈炴硶 - */ - public static boolean isValidFilename(String filename) - { - return filename.matches(FILENAME_PATTERN); - } - - /** - * 妫�鏌ユ枃浠舵槸鍚﹀彲涓嬭浇 - * - * @param resource 闇�瑕佷笅杞界殑鏂囦欢 - * @return true 姝e父 false 闈炴硶 - */ - public static boolean checkAllowDownload(String resource) - { - // 绂佹鐩綍涓婅烦绾у埆 - if (StringUtils.contains(resource, "..")) - { - return false; - } - - // 妫�鏌ュ厑璁镐笅杞界殑鏂囦欢瑙勫垯 - if (ArrayUtil.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource))) - { - return true; - } - - // 涓嶅湪鍏佽涓嬭浇鐨勬枃浠惰鍒� - return false; - } +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class FileUtils extends FileUtil { /** * 涓嬭浇鏂囦欢鍚嶉噸鏂扮紪鐮� * - * @param request 璇锋眰瀵硅薄 - * @param fileName 鏂囦欢鍚� - * @return 缂栫爜鍚庣殑鏂囦欢鍚� - */ - public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException - { - final String agent = request.getHeader("USER-AGENT"); - String filename = fileName; - if (agent.contains("MSIE")) - { - // IE娴忚鍣� - filename = URLEncoder.encode(filename, StandardCharsets.UTF_8.toString()); - filename = filename.replace("+", " "); - } - else if (agent.contains("Firefox")) - { - // 鐏嫄娴忚鍣� - filename = new String(fileName.getBytes(), "ISO8859-1"); - } - else if (agent.contains("Chrome")) - { - // google娴忚鍣� - filename = URLEncoder.encode(filename, StandardCharsets.UTF_8.toString()); - } - else - { - // 鍏跺畠娴忚鍣� - filename = URLEncoder.encode(filename, StandardCharsets.UTF_8.toString()); - } - return filename; - } - - /** - * 涓嬭浇鏂囦欢鍚嶉噸鏂扮紪鐮� - * - * @param response 鍝嶅簲瀵硅薄 + * @param response 鍝嶅簲瀵硅薄 * @param realFileName 鐪熷疄鏂囦欢鍚� - * @return */ - public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException - { + public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException { String percentEncodedFileName = percentEncode(realFileName); StringBuilder contentDispositionValue = new StringBuilder(); contentDispositionValue.append("attachment; filename=") - .append(percentEncodedFileName) - .append(";") - .append("filename*=") - .append("utf-8''") - .append(percentEncodedFileName); + .append(percentEncodedFileName) + .append(";") + .append("filename*=") + .append("utf-8''") + .append(percentEncodedFileName); + response.addHeader("Access-Control-Expose-Headers", "Content-Disposition,download-filename"); response.setHeader("Content-disposition", contentDispositionValue.toString()); + response.setHeader("download-filename", percentEncodedFileName); } /** @@ -117,8 +45,7 @@ * @param s 闇�瑕佺櫨鍒嗗彿缂栫爜鐨勫瓧绗︿覆 * @return 鐧惧垎鍙风紪鐮佸悗鐨勫瓧绗︿覆 */ - public static String percentEncode(String s) throws UnsupportedEncodingException - { + public static String percentEncode(String s) throws UnsupportedEncodingException { String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString()); return encode.replaceAll("\\+", "%20"); } -- Gitblit v1.9.3