diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8fc619d6..946b91af5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,10 +3,11 @@
 
 -------------------------------------------------------------------------------------------------------------
 
-# 5.7.11 (2021-08-27)
+# 5.7.11 (2021-08-30)
 
 ### 🐣新特性
 * 【crypto 】     修改SymmetricCrypto初始化逻辑
+* 【core   】     FileTypeUtil增加对wps编辑的docx的识别（issue#I47JGH@Gitee）
 
 ### 🐞Bug修复
 
diff --git a/hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java b/hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java
index cb43c87a0..876d140fa 100644
--- a/hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/io/FileTypeUtil.java
@@ -182,6 +182,9 @@ public class FileTypeUtil {
 			final String extName = FileUtil.extName(filename);
 			if ("xlsx".equalsIgnoreCase(extName)) {
 				typeName = "xlsx";
+			} else if ("docx".equalsIgnoreCase(extName)) {
+				// issue#I47JGH
+				typeName = "docx";
 			}
 		}
 		return typeName;
diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
index 5a015e08b..4d8717dcb 100644
--- a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
@@ -1,5 +1,6 @@
 package cn.hutool.core.collection;
 
+import cn.hutool.core.comparator.ComparableComparator;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.map.MapUtil;
@@ -764,4 +765,11 @@ public class CollUtilTest {
 		Assert.assertEquals(1, result.size());
 		Assert.assertEquals(1L, result.get(0), 1);
 	}
+
+	@Test
+	public void sortComparableTest(){
+		final List<String> of = ListUtil.toList("a", "c", "b");
+		final List<String> sort = CollUtil.sort(of, new ComparableComparator<>());
+		Assert.assertEquals("a,b,c", CollUtil.join(sort, ","));
+	}
 }