将FileUtil合并至IOUtil

NotBadPad · NotBadPad · commit 202c47bb1ef4 · 2014-03-13T10:40:41.000+08:00
diff --git a/src/main/java/org/eh/core/http/EHHttpHandler.java b/src/main/java/org/eh/core/http/EHHttpHandler.java
@@ -14,7 +14,6 @@
 import org.eh.core.common.ReturnType;
 import org.eh.core.model.ResultInfo;
 import org.eh.core.util.FileUploadContentAnalysis;
-import org.eh.core.util.FileUtil;
 import org.eh.core.util.IOUtil;
 import org.eh.core.util.StringUtil;
 import org.eh.core.web.controller.Controller;
@@ -40,7 +39,7 @@ public void handle(HttpExchange httpExchange) throws IOException {
 			// 根据后缀判断是否是静态资源
 			String suffix = path.substring(path.lastIndexOf("."), path.length());
 			if (Constants.STATIC_SUFFIXS.contains(suffix)) {
-				byte[] bytes = FileUtil.readFileByBytes(this.getClass().getResource("/").getPath()
+				byte[] bytes = IOUtil.readFileByBytes(this.getClass().getResource("/").getPath()
 						+ "static" + path);
 				responseStaticToClient(httpExchange, 200, bytes);
 				return;
diff --git a/src/main/java/org/eh/core/util/FileUtil.java b/src/main/java/org/eh/core/util/FileUtil.java
diff --git a/src/main/java/org/eh/core/util/IOUtil.java b/src/main/java/org/eh/core/util/IOUtil.java
@@ -1,9 +1,13 @@
 package org.eh.core.util;
 
 import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -31,4 +35,55 @@ public static String getRequestContent(InputStream inputStream) {
 		}
 		return sb.toString();
 	}
+
+	public static boolean isExist(String path) {
+		File file = new File(path);
+		return file.exists();
+	}
+
+	public static String readFile(String path) {
+		if (!isExist(path)) {
+			return "";
+		}
+		FileInputStream fis = null;
+		StringBuilder sb = new StringBuilder();
+		try {
+			fis = new FileInputStream(path);
+			FileChannel c = fis.getChannel();
+			ByteBuffer bc = ByteBuffer.allocate(1024);
+			int i = c.read(bc);
+			while (i != -1) {
+				sb.append(new String(bc.array()));
+				bc.clear();
+				i = c.read(bc);
+			}
+			c.close();
+			fis.close();
+		} catch (Exception e) {
+			log.error("读取模板文件失败：", e);
+		}
+		return sb.toString();
+	}
+
+	public static byte[] readFileByBytes(String path) {
+		if (!isExist(path)) {
+			return "".getBytes();
+		}
+		byte[] bytes = null;
+		FileInputStream fis = null;
+		try {
+			fis = new FileInputStream(path);
+			FileChannel c = fis.getChannel();
+			ByteBuffer bc = ByteBuffer.allocate((int) c.size());
+			int i = c.read(bc);
+			if (i != -1) {
+				bytes = bc.array();
+			}
+			c.close();
+			fis.close();
+		} catch (Exception e) {
+			log.error("读取资源文件失败：", e);
+		}
+		return bytes;
+	}
 }
diff --git a/src/main/java/org/eh/core/web/view/ViewHandler.java b/src/main/java/org/eh/core/web/view/ViewHandler.java
@@ -4,7 +4,7 @@
 
 import org.eh.core.common.Constants;
 import org.eh.core.model.ResultInfo;
-import org.eh.core.util.FileUtil;
+import org.eh.core.util.IOUtil;
 import org.eh.core.util.StringUtil;
 import org.eh.core.util.VelocityUtil;
 
@@ -23,8 +23,8 @@ public String processView(ResultInfo resultInfo) {
 		// 获取路径
 		String path = analysisViewPath(resultInfo.getView());
 		String content = "";
-		if (FileUtil.isExist(path)) {
-			content = FileUtil.readFile(path);
+		if (IOUtil.isExist(path)) {
+			content = IOUtil.readFile(path);
 		}
 
 		if (StringUtil.isEmpty(content)) {
diff --git a/src/test/java/org/eh/core/util/FileUtilTest.java b/src/test/java/org/eh/core/util/FileUtilTest.java
@@ -13,7 +13,7 @@ public class FileUtilTest {
 	public void TestRead() {
 		String path = this.getClass().getResource("/").getPath()
 				+ "org/eh/web/view/test/myinfo.page";
-		String content = FileUtil.readFile(path);
+		String content = IOUtil.readFile(path);
 		System.out.println(content);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class FileUtilTest {`
`13`	`13`	`public void TestRead() {`
`14`	`14`	`String path = this.getClass().getResource("/").getPath()`
`15`	`15`	`+ "org/eh/web/view/test/myinfo.page";`
`16`		`- String content = FileUtil.readFile(path);`
	`16`	`+ String content = IOUtil.readFile(path);`
`17`	`17`	`System.out.println(content);`
`18`	`18`	`}`
`19`	`19`