diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
index 1c4353ea6..6974d9ce8 100644
--- a/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/collection/CollUtil.java
@@ -1554,10 +1554,10 @@ public class CollUtil {
 	 * @param map    Map
 	 * @param editor 编辑器接口
 	 * @return 过滤后的Map
-	 * @see MapUtil#filter(Map, Editor)
+	 * @see MapUtil#edit(Map, Editor)
 	 */
-	public static <K, V> Map<K, V> filter(Map<K, V> map, Editor<Entry<K, V>> editor) {
-		return MapUtil.filter(map, editor);
+	public static <K, V> Map<K, V> edit(Map<K, V> map, Editor<Entry<K, V>> editor) {
+		return MapUtil.edit(map, editor);
 	}
 
 	/**
@@ -1830,7 +1830,7 @@ public class CollUtil {
 	 * @since 3.0.4
 	 */
 	public static Map<String, String> zip(String keys, String values, String delimiter, boolean isOrder) {
-		return ArrayUtil.zip(StrUtil.split(keys, delimiter), StrUtil.split(values, delimiter), isOrder);
+		return ArrayUtil.zip(StrUtil.splitToArray(keys, delimiter), StrUtil.splitToArray(values, delimiter), isOrder);
 	}
 
 	/**
diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java b/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java
index 57ec9ab38..543571286 100644
--- a/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/map/MapUtil.java
@@ -623,7 +623,7 @@ public class MapUtil {
 	 * @param editor 编辑器接口
 	 * @return 过滤后的Map
 	 */
-	public static <K, V> Map<K, V> filter(Map<K, V> map, Editor<Entry<K, V>> editor) {
+	public static <K, V> Map<K, V> edit(Map<K, V> map, Editor<Entry<K, V>> editor) {
 		if (null == map || null == editor) {
 			return map;
 		}
@@ -716,7 +716,7 @@ public class MapUtil {
 	 * @since 3.2.2
 	 */
 	public static <T> Map<T, T> reverse(Map<T, T> map) {
-		return filter(map, (Editor<Entry<T, T>>) t -> new Entry<T, T>() {
+		return edit(map, t -> new Entry<T, T>() {
 
 			@Override
 			public T getKey() {
@@ -905,7 +905,7 @@ public class MapUtil {
 	 */
 	@SuppressWarnings("unchecked")
 	public static <K, V> Map<K, V> getAny(Map<K, V> map, final K... keys) {
-		return filter(map, (Filter<Entry<K, V>>) entry -> ArrayUtil.contains(keys, entry.getKey()));
+		return filter(map, entry -> ArrayUtil.contains(keys, entry.getKey()));
 	}
 
 	/**
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java
index cb9edf18e..19fdc8316 100644
--- a/hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java
@@ -1,18 +1,15 @@
 package cn.hutool.core.map;
 
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.lang.Editor;
-import cn.hutool.core.lang.Filter;
 import cn.hutool.core.util.StrUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 
 public class MapUtilTest {
-	
+
 	@Test
 	public void filterTest() {
 		Map<String, String> map = MapUtil.newHashMap();
@@ -21,7 +18,7 @@ public class MapUtilTest {
 		map.put("c", "3");
 		map.put("d", "4");
 
-		Map<String, String> map2 = MapUtil.filter(map, (Filter<Entry<String, String>>) t -> Convert.toInt(t.getValue()) % 2 == 0);
+		Map<String, String> map2 = MapUtil.filter(map, t -> Convert.toInt(t.getValue()) % 2 == 0);
 
 		Assert.assertEquals(2, map2.size());
 
@@ -30,14 +27,28 @@ public class MapUtilTest {
 	}
 
 	@Test
-	public void filterForEditorTest() {
+	public void filterContainsTest() {
+		Map<String, String> map = MapUtil.newHashMap();
+		map.put("abc", "1");
+		map.put("bcd", "2");
+		map.put("def", "3");
+		map.put("fgh", "4");
+
+		Map<String, String> map2 = MapUtil.filter(map, t -> StrUtil.contains(t.getKey(), "bc"));
+		Assert.assertEquals(2, map2.size());
+		Assert.assertEquals("1", map2.get("abc"));
+		Assert.assertEquals("2", map2.get("bcd"));
+	}
+
+	@Test
+	public void editTest() {
 		Map<String, String> map = MapUtil.newHashMap();
 		map.put("a", "1");
 		map.put("b", "2");
 		map.put("c", "3");
 		map.put("d", "4");
 
-		Map<String, String> map2 = MapUtil.filter(map, (Editor<Entry<String, String>>) t -> {
+		Map<String, String> map2 = MapUtil.edit(map, t -> {
 			// 修改每个值使之*10
 			t.setValue(t.getValue() + "0");
 			return t;
@@ -74,7 +85,7 @@ public class MapUtilTest {
 		map.put("b", "2");
 		map.put("c", "3");
 		map.put("d", "4");
-		
+
 		Object[][] objectArray = MapUtil.toObjectArray(map);
 		Assert.assertEquals("a", objectArray[0][0]);
 		Assert.assertEquals("1", objectArray[0][1]);