From 2602935b60507532701b34c3b28a4939e4566f07 Mon Sep 17 00:00:00 2001
From: lixiaohua <1124205446@qq.com>
Date: Thu, 8 Oct 2020 03:25:17 +0800
Subject: [PATCH 1/2] add method

---
 .../main/java/cn/hutool/core/util/XmlUtil.java  | 17 +++++++++++++++++
 .../java/cn/hutool/core/util/XmlUtilTest.java   |  7 +++++++
 2 files changed, 24 insertions(+)

diff --git a/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java
index 357c859c7..09fbf6df8 100644
--- a/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/util/XmlUtil.java
@@ -69,6 +69,10 @@ public class XmlUtil {
 	 * 在XML中无效的字符 正则
 	 */
 	public static final String INVALID_REGEX = "[\\x00-\\x08\\x0b-\\x0c\\x0e-\\x1f]";
+	/**
+	 * 在XML中注释的内容 正则
+	 */
+	public static final String NOTE_REGEX = "(?s)<!--.+?-->";
 	/**
 	 * XML格式化输出默认缩进量
 	 */
@@ -671,6 +675,19 @@ public class XmlUtil {
 		return xmlContent.replaceAll(INVALID_REGEX, "");
 	}
 
+	/**
+	 * 去除XML文本中的注释内容
+	 *
+	 * @param xmlContent XML文本
+	 * @return 当传入为null时返回null
+	 */
+	public static String cleanNote(String xmlContent) {
+		if (xmlContent == null) {
+			return null;
+		}
+		return xmlContent.replaceAll(NOTE_REGEX, "");
+	}
+
 	/**
 	 * 根据节点名获得子节点列表
 	 *
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java
index aaa9527ca..fb2a7e5c3 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java
@@ -211,6 +211,13 @@ public class XmlUtilTest {
 		Assert.assertEquals(testBean.getBankCode(), testBean2.getBankCode());
 	}
 
+	@Test
+	public void cleanNoteTest() {
+		final String xmlContent = "<title>hutool</title><!-- 这是注释 --><lang>java</lang>";
+		final String ret = XmlUtil.cleanNote(xmlContent);
+		Assert.assertEquals("<title>hutool</title><lang>java</lang>", ret);
+	}
+
 	@Data
 	public static class TestBean {
 		private String ReqCode;

From ec2669d586154ff79ca90d59822f93ce39ca716a Mon Sep 17 00:00:00 2001
From: lixiaohua <1124205446@qq.com>
Date: Thu, 8 Oct 2020 09:36:11 +0800
Subject: [PATCH 2/2] update unit test

---
 .../src/test/java/cn/hutool/core/util/XmlUtilTest.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java
index fb2a7e5c3..a78c938da 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java
@@ -213,9 +213,9 @@ public class XmlUtilTest {
 
 	@Test
 	public void cleanNoteTest() {
-		final String xmlContent = "<title>hutool</title><!-- 这是注释 --><lang>java</lang>";
+		final String xmlContent = "<info><title>hutool</title><!-- 这是注释 --><lang>java</lang></info>";
 		final String ret = XmlUtil.cleanNote(xmlContent);
-		Assert.assertEquals("<title>hutool</title><lang>java</lang>", ret);
+		Assert.assertEquals("<info><title>hutool</title><lang>java</lang></info>", ret);
 	}
 
 	@Data