lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-05 17:37:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3837 from ZhenhengXie/v5-dev

Browse Source 
fix: 修复Xml转义相关问题
This commit is contained in:
Golden Looly 2025-01-09 19:22:36 +08:00 committed by GitHub
commit 50df86d846
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

5
hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java
View File

@ -956,6 +956,7 @@ public class XmlUtil {
* &lt; (小于) 替换为 &amp;lt; * &lt; (小于) 替换为 &amp;lt;
* &gt; (大于) 替换为 &amp;gt; * &gt; (大于) 替换为 &amp;gt;
* &quot; (双引号) 替换为 &amp;quot; * &quot; (双引号) 替换为 &amp;quot;
* &apos; (单引号) 替换为 &amp;apos;
* </pre> * </pre>
* *
* @param string 被替换的字符串 * @param string 被替换的字符串
@ -963,7 +964,7 @@ public class XmlUtil {
* @since 4.0.8 * @since 4.0.8
*/ */
public static String escape(String string) { 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 * @since 5.0.6
*/ */
public static String unescape(String string) { public static String unescape(String string) {
return EscapeUtil.unescapeHtml4(string); return EscapeUtil.unescapeXml(string);
} }
/** /**

1
hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java
View File

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