From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java | 157 +--------------------------------------------------
1 files changed, 5 insertions(+), 152 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 587b2bf..3ab304c 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,167 +1,19 @@
package com.ruoyi.common.utils.file;
-import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.io.FileUtil;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
/**
* 鏂囦欢澶勭悊宸ュ叿绫�
- *
+ *
* @author ruoyi
*/
-public class FileUtils extends org.apache.commons.io.FileUtils
+public class FileUtils extends FileUtil
{
- public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";
-
- /**
- * 杈撳嚭鎸囧畾鏂囦欢鐨刡yte鏁扮粍
- *
- * @param filePath 鏂囦欢璺緞
- * @param os 杈撳嚭娴�
- * @return
- */
- public static void writeBytes(String filePath, OutputStream os) throws IOException
- {
- FileInputStream fis = null;
- try
- {
- File file = new File(filePath);
- if (!file.exists())
- {
- throw new FileNotFoundException(filePath);
- }
- fis = new FileInputStream(file);
- byte[] b = new byte[1024];
- int length;
- while ((length = fis.read(b)) > 0)
- {
- os.write(b, 0, length);
- }
- }
- catch (IOException e)
- {
- throw e;
- }
- finally
- {
- if (os != null)
- {
- try
- {
- os.close();
- }
- catch (IOException e1)
- {
- e1.printStackTrace();
- }
- }
- if (fis != null)
- {
- try
- {
- fis.close();
- }
- catch (IOException e1)
- {
- e1.printStackTrace();
- }
- }
- }
- }
-
- /**
- * 鍒犻櫎鏂囦欢
- *
- * @param filePath 鏂囦欢
- * @return
- */
- public static boolean deleteFile(String filePath)
- {
- boolean flag = false;
- File file = new File(filePath);
- // 璺緞涓烘枃浠朵笖涓嶄负绌哄垯杩涜鍒犻櫎
- if (file.isFile() && file.exists())
- {
- file.delete();
- flag = true;
- }
- return flag;
- }
-
- /**
- * 鏂囦欢鍚嶇О楠岃瘉
- *
- * @param filename 鏂囦欢鍚嶇О
- * @return true 姝ｅ父 false 闈炴硶
- */
- public static boolean isValidFilename(String filename)
- {
- return filename.matches(FILENAME_PATTERN);
- }
-
- /**
- * 妫�鏌ユ枃浠舵槸鍚﹀彲涓嬭浇
- *
- * @param resource 闇�瑕佷笅杞界殑鏂囦欢
- * @return true 姝ｅ父 false 闈炴硶
- */
- public static boolean checkAllowDownload(String resource)
- {
- // 绂佹鐩綍涓婅烦绾у埆
- if (StrUtil.contains(resource, ".."))
- {
- return false;
- }
-
- // 妫�鏌ュ厑璁镐笅杞界殑鏂囦欢瑙勫垯
- if (ArrayUtil.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource)))
- {
- return true;
- }
-
- // 涓嶅湪鍏佽涓嬭浇鐨勬枃浠惰鍒�
- return false;
- }
-
- /**
- * 涓嬭浇鏂囦欢鍚嶉噸鏂扮紪鐮�
- *
- * @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, "utf-8");
- 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, "utf-8");
- }
- else
- {
- // 鍏跺畠娴忚鍣�
- filename = URLEncoder.encode(filename, "utf-8");
- }
- return filename;
- }
/**
* 涓嬭浇鏂囦欢鍚嶉噸鏂扮紪鐮�
@@ -183,6 +35,7 @@
.append(percentEncodedFileName);
response.setHeader("Content-disposition", contentDispositionValue.toString());
+ response.setHeader("download-filename", percentEncodedFileName);
}
/**
--
Gitblit v1.9.3