diff --git a/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java index 2b30df3a2..0e7b87e29 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java @@ -1151,6 +1151,30 @@ public class FileUtil { } } + /** + * 修改文件或目录的文件名,不变更路径,只是简单修改文件名
+ * 重命名有两种模式:
+ * 1、isRetainExt为true时,保留原扩展名: + * + *
+	 * FileUtil.rename(file, "aaa", true) xx/xx.png =》xx/aaa.png
+	 * 
+ *

+ * + *

+	 * FileUtil.rename(file, "aaa.jpg", false) xx/xx.png =》xx/aaa.jpg
+	 * 
+ * + * @param file 被修改的文件 + * @param newName 新的文件名,包括扩展名 + * @param isOverride 是否覆盖目标文件 + * @return 目标文件 + * @since 5.3.6 + */ + public static File rename(File file, String newName, boolean isOverride) { + return rename(file, newName, false, isOverride); + } + /** * 修改文件或目录的文件名,不变更路径,只是简单修改文件名
* 重命名有两种模式:
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java index a5c240e0a..7d73a4c62 100644 --- a/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java @@ -70,7 +70,7 @@ public class FileUtilTest { @Test @Ignore public void renameTest() { - FileUtil.rename(FileUtil.file("hutool.jpg"), "b.png", false, false); + FileUtil.rename(FileUtil.file("d:/test/3.jpg"), "2.jpg", false); } @Test diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelReader.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelReader.java index 38dc24c43..5c8cbb013 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelReader.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelReader.java @@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.IterUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Assert; -import cn.hutool.core.lang.Console; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -240,7 +239,6 @@ public class ExcelReader extends ExcelBase { List rowList; for (int i = startRowIndex; i <= endRowIndex; i++) { rowList = readRow(i); - Console.log("### {}: {}", i, rowList); if (CollUtil.isNotEmpty(rowList) || false == ignoreEmptyRow) { if (null == rowList) { rowList = new ArrayList<>(0);