From feb7c85d57c5e47fd40f87ee94c707fc61042e04 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 16 六月 2021 13:29:33 +0800
Subject: [PATCH] update mybatis-plus 升级 3.4.3.1 fixbug 版本
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java | 90 ++++-----------------------------------------
1 files changed, 8 insertions(+), 82 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..bc953de 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,5 +1,6 @@
package com.ruoyi.common.utils.file;
+import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
@@ -11,91 +12,16 @@
/**
* 鏂囦欢澶勭悊宸ュ叿绫�
- *
+ *
* @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 闈炴硶
*/
@@ -130,7 +56,7 @@
/**
* 涓嬭浇鏂囦欢鍚嶉噸鏂扮紪鐮�
- *
+ *
* @param request 璇锋眰瀵硅薄
* @param fileName 鏂囦欢鍚�
* @return 缂栫爜鍚庣殑鏂囦欢鍚�
@@ -142,7 +68,7 @@
if (agent.contains("MSIE"))
{
// IE娴忚鍣�
- filename = URLEncoder.encode(filename, "utf-8");
+ filename = URLEncoder.encode(filename, StandardCharsets.UTF_8.toString());
filename = filename.replace("+", " ");
}
else if (agent.contains("Firefox"))
@@ -153,12 +79,12 @@
else if (agent.contains("Chrome"))
{
// google娴忚鍣�
- filename = URLEncoder.encode(filename, "utf-8");
+ filename = URLEncoder.encode(filename, StandardCharsets.UTF_8.toString());
}
else
{
// 鍏跺畠娴忚鍣�
- filename = URLEncoder.encode(filename, "utf-8");
+ filename = URLEncoder.encode(filename, StandardCharsets.UTF_8.toString());
}
return filename;
}
--
Gitblit v1.9.3