From 65f121585d53fa910205d8185aebf37a914ad8ac Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 16 Mar 2020 20:38:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!106=20:?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96class=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E5=90=8D=E7=A7=B0=E6=96=B9=E6=B3=95?= =?UTF-8?q?'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/hutool/core/io/FileUtil.java | 17 ----------------- .../cn/hutool/core/io/file/TailerTest.java | 18 +++++------------- 2 files changed, 5 insertions(+), 30 deletions(-) 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 8a0cc4e2c..852ee8aa2 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 @@ -3578,21 +3578,4 @@ public class FileUtil { public static void tail(File file, Charset charset) { FileUtil.tail(file, charset, Tailer.CONSOLE_HANDLER); } - - /** - * 获取class类当前文件夹, 不管是否在jar包中都会返回文件夹的路径 - * class在jar包中返回jar所在文件夹,class不在jar中返回文件夹目录 - * jdk中的类不能使用此方法 - */ - public static String getClassDir(Class clazz) { - String currentDir = null; - File file = new File(clazz.getProtectionDomain().getCodeSource().getLocation().getPath()); - if (file.isFile()) { - currentDir = file.getParentFile().getAbsolutePath(); - } else { - currentDir = file.getAbsolutePath(); - } - return currentDir; - } - } diff --git a/hutool-core/src/test/java/cn/hutool/core/io/file/TailerTest.java b/hutool-core/src/test/java/cn/hutool/core/io/file/TailerTest.java index 0ca3c1a25..50263d484 100644 --- a/hutool-core/src/test/java/cn/hutool/core/io/file/TailerTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/io/file/TailerTest.java @@ -1,31 +1,23 @@ package cn.hutool.core.io.file; -import cn.hutool.core.io.FileUtil; -import cn.hutool.core.util.CharsetUtil; -import lombok.Data; import org.junit.Ignore; import org.junit.Test; -public class TailerTest { +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.CharsetUtil; +public class TailerTest { + @Test @Ignore public void tailTest() { FileUtil.tail(FileUtil.file("e:/tail.txt"), CharsetUtil.CHARSET_GBK); } - + @Test @Ignore public void tailWithLinesTest() { Tailer tailer = new Tailer(FileUtil.file("f:/test/test.log"), Tailer.CONSOLE_HANDLER, 2); tailer.start(); } - - @Test - @Ignore - public void testDir() { - System.out.println(FileUtil.getClassDir(FileUtil.class)); - System.out.println(FileUtil.getClassDir(Data.class)); - System.out.println(FileUtil.getClassDir(Test.class)); - } }