Merge pull request #3837 from ZhenhengXie/v5-dev

fix: 修复Xml转义相关问题

hutool-core/src/main/java/cn/hutool/core/text/escape/XmlEscape.java

@@ -22,7 +22,7 @@ public class XmlEscape extends ReplacerChain {
 	private static final long serialVersionUID = 1L;
 
 	protected static final String[][] BASIC_ESCAPE = { //
-//			{"'", "'"}, // " - single-quote
+			{"'", "'"}, // " - single-quote
 			{"\"", """}, // " - double-quote
 			{"&", "&"}, // & - ampersand
 			{"<", "&lt;"}, // < - less-than

hutool-core/src/main/java/cn/hutool/core/text/escape/XmlUnescape.java

@@ -13,8 +13,6 @@ public class XmlUnescape extends ReplacerChain {
 	private static final long serialVersionUID = 1L;
 
 	protected static final String[][] BASIC_UNESCAPE  = InternalEscapeUtil.invert(XmlEscape.BASIC_ESCAPE);
-	// issue#1118
-	protected static final String[][] OTHER_UNESCAPE  = new String[][]{new String[]{"'", "'"}};
 
 	/**
 	 * 构造
@@ -22,6 +20,5 @@ public class XmlUnescape extends ReplacerChain {
 	public XmlUnescape() {
 		addChain(new LookupReplacer(BASIC_UNESCAPE));
 		addChain(new NumericEntityUnescaper());
-		addChain(new LookupReplacer(OTHER_UNESCAPE));
 	}
 }

hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java

@@ -956,6 +956,7 @@ public class XmlUtil {
 	 * < (小于) 替换为 <
 	 * > (大于) 替换为 >
 	 * " (双引号) 替换为 "
+	 * ' (单引号) 替换为 '
 	 * </pre>
 	 *
 	 * @param string 被替换的字符串
@@ -963,7 +964,7 @@ public class XmlUtil {
 	 * @since 4.0.8
 	 */
 	public static String escape(String string) {
-		return EscapeUtil.escapeHtml4(string);
+		return EscapeUtil.escapeXml(string);
 	}
 
 	/**
@@ -975,7 +976,7 @@ public class XmlUtil {
 	 * @since 5.0.6
 	 */
 	public static String unescape(String string) {
-		return EscapeUtil.unescapeHtml4(string);
+		return EscapeUtil.unescapeXml(string);
 	}
 
 	/**

hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java

@@ -320,6 +320,7 @@ public class XmlUtilTest {
 		final String a = "<>";
 		final String escape = XmlUtil.escape(a);
 		Console.log(escape);
+		Console.log(XmlUtil.escape("中文“双引号”"));
 	}
 
 	@Test