Skip to content

Commit e0c995e

Browse files
giveme0101binarywang
authored andcommitted
🐛 #1777 XML工具类修复无法解析<ExtAttr><Item>这种节点数据的问题
1 parent 807ed7d commit e0c995e

File tree

1 file changed

+8
-8
lines changed
  • weixin-java-common/src/main/java/me/chanjar/weixin/common/util

1 file changed

+8
-8
lines changed

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/XmlUtils.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
import com.google.common.collect.Lists;
44
import com.google.common.collect.Maps;
55
import com.google.common.collect.Sets;
6-
import org.dom4j.Document;
7-
import org.dom4j.DocumentException;
8-
import org.dom4j.Element;
9-
import org.dom4j.Node;
6+
import org.dom4j.*;
107
import org.dom4j.io.SAXReader;
118
import org.dom4j.tree.DefaultText;
129
import org.xml.sax.SAXException;
@@ -50,14 +47,16 @@ public static Map<String, Object> xml2Map(String xmlString) {
5047
}
5148

5249
private static Object element2MapOrString(Element element) {
53-
Map<String, Object> result = Maps.newHashMap();
5450

5551
final List<Node> content = element.content();
56-
if (content.size() <= 1) {
52+
final Set<String> names = names(content);
53+
54+
// 判断节点下有无非文本节点(非Text和CDATA),如无,直接取Text文本内容
55+
if (names.size() < 1) {
5756
return element.getText();
5857
}
5958

60-
final Set<String> names = names(content);
59+
Map<String, Object> result = Maps.newHashMap();
6160
if (names.size() == 1) {
6261
// 说明是个列表,各个子对象是相同的name
6362
List<Object> list = Lists.newArrayList();
@@ -90,7 +89,8 @@ private static Object element2MapOrString(Element element) {
9089
private static Set<String> names(List<Node> nodes) {
9190
Set<String> names = Sets.newHashSet();
9291
for (Node node : nodes) {
93-
if (node instanceof DefaultText) {
92+
// 如果节点类型是Text或CDATA跳过
93+
if (node instanceof DefaultText || node instanceof CDATA) {
9494
continue;
9595
}
9696
names.add(node.getName());

0 commit comments

Comments
 (0)