Looly 5 年之前
父节点
当前提交
b8e5cc006e

+ 1 - 0
CHANGELOG.md

@@ -12,6 +12,7 @@
 * 【core   】     修复ZipUtil.unzip从流解压关闭问题(issue#I2B0S1@Gitee)
 * 【core   】     修复ZipUtil.unzip从流解压关闭问题(issue#I2B0S1@Gitee)
 * 【poi    】     修复Excel07Writer写出表格错乱问题(issue#I2B57B@Gitee)
 * 【poi    】     修复Excel07Writer写出表格错乱问题(issue#I2B57B@Gitee)
 * 【poi    】     修复SheetRidReader读取字段错误问题(issue#1342@Github)
 * 【poi    】     修复SheetRidReader读取字段错误问题(issue#1342@Github)
+* 【core   】     修复FileUtil.getMimeType不支持css和js(issue#1341@Github)
 
 
 -------------------------------------------------------------------------------------------------------------
 -------------------------------------------------------------------------------------------------------------
 
 

+ 10 - 1
hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java

@@ -3182,7 +3182,16 @@ public class FileUtil extends PathUtil {
 	 * @since 4.1.15
 	 * @since 4.1.15
 	 */
 	 */
 	public static String getMimeType(String filePath) {
 	public static String getMimeType(String filePath) {
-		return URLConnection.getFileNameMap().getContentTypeFor(filePath);
+		String contentType = URLConnection.getFileNameMap().getContentTypeFor(filePath);
+		if(null == contentType){
+			// 补充一些常用的mimeType
+			if(filePath.endsWith(".css")){
+				contentType = "text/css";
+			} else if(filePath.endsWith(".js")){
+				contentType = "application/x-javascript";
+			}
+		}
+		return contentType;
 	}
 	}
 
 
 	/**
 	/**

+ 6 - 0
hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java

@@ -376,6 +376,12 @@ public class FileUtilTest {
 	public void getMimeTypeTest() {
 	public void getMimeTypeTest() {
 		String mimeType = FileUtil.getMimeType("test2Write.jpg");
 		String mimeType = FileUtil.getMimeType("test2Write.jpg");
 		Assert.assertEquals("image/jpeg", mimeType);
 		Assert.assertEquals("image/jpeg", mimeType);
+
+		mimeType = FileUtil.getMimeType("main.css");
+		Assert.assertEquals("text/css", mimeType);
+
+		mimeType = FileUtil.getMimeType("test.js");
+		Assert.assertEquals("application/x-javascript", mimeType);
 	}
 	}
 
 
 	@Test
 	@Test

+ 0 - 2
hutool-http/src/main/java/cn/hutool/http/server/action/RootAction.java

@@ -2,7 +2,6 @@ package cn.hutool.http.server.action;
 
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.lang.Console;
 import cn.hutool.http.server.HttpServerRequest;
 import cn.hutool.http.server.HttpServerRequest;
 import cn.hutool.http.server.HttpServerResponse;
 import cn.hutool.http.server.HttpServerResponse;
 
 
@@ -80,7 +79,6 @@ public class RootAction implements Action {
 			}
 			}
 		}
 		}
 
 
-		Console.log(file.getAbsolutePath());
 		response.send404("404 Not Found !");
 		response.send404("404 Not Found !");
 	}
 	}
 }
 }

+ 6 - 0
hutool-http/src/main/java/cn/hutool/http/server/action/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * {@link com.sun.net.httpserver.HttpServer} 封装
+ *
+ * @author looly
+ */
+package cn.hutool.http.server.action;