diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b40fb55 --- /dev/null +++ b/.gitignore @@ -0,0 +1,24 @@ +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +.idea +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* diff --git a/pay-java-ali/pom.xml b/pay-java-ali/pom.xml index 9b17eb2..35e8c8c 100644 --- a/pay-java-ali/pom.xml +++ b/pay-java-ali/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.12.9 + 2.13.1-SNAPSHOT 4.0.0 pay-java-ali diff --git a/pay-java-common/pom.xml b/pay-java-common/pom.xml index 1dfa318..0a0a62d 100644 --- a/pay-java-common/pom.xml +++ b/pay-java-common/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.12.9 + 2.13.1-SNAPSHOT 4.0.0 jar diff --git a/pay-java-common/src/main/java/com/egzosn/pay/common/util/XML.java b/pay-java-common/src/main/java/com/egzosn/pay/common/util/XML.java index 2410653..b61898b 100644 --- a/pay-java-common/src/main/java/com/egzosn/pay/common/util/XML.java +++ b/pay-java-common/src/main/java/com/egzosn/pay/common/util/XML.java @@ -27,6 +27,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.StringWriter; import java.nio.charset.Charset; +import java.util.List; import java.util.Map; @@ -232,10 +233,11 @@ public class XML { for (int idx = 0; idx < children.getLength(); ++idx) { Node node = children.item(idx); NodeList nodeList = node.getChildNodes(); - if (node.getNodeType() == Node.ELEMENT_NODE && nodeList.getLength() <= 1) { - m.put(node.getNodeName(), node.getTextContent()); - } else if (node.getNodeType() == Node.ELEMENT_NODE && nodeList.getLength() > 1) { + int length = nodeList.getLength(); + if (node.getNodeType() == Node.ELEMENT_NODE && length >= 1 && nodeList.item(0).hasChildNodes()) { m.put(node.getNodeName(), getChildren(nodeList)); + } else if (node.getNodeType() == Node.ELEMENT_NODE ) { + m.put(node.getNodeName(), node.getTextContent()); } } } catch (Exception e) { @@ -323,13 +325,47 @@ public class XML { value = ""; } org.w3c.dom.Element filed = document.createElement(entry.getKey()); - if (value instanceof Map){ + /* if (value instanceof Map){ + map2Xml((Map)value, document, filed); + }else if (value instanceof List){ + List vs = (List)value; + for (Object v : vs ){ + if (value instanceof Map){ + map2Xml((Map)value, document, filed); + } + } map2Xml((Map)value, document, filed); }else { value = value.toString().trim(); filed.appendChild(document.createTextNode(value.toString())); - } + }*/ + object2Xml(value, document, filed); element.appendChild(filed); } } + + private static void object2Xml(Object value, Document document, org.w3c.dom.Element element){ + + if (value instanceof Map){ + map2Xml((Map)value, document, element); + }else if (value instanceof List){ + List vs = (List)value; + for (Object v : vs ){ + object2Xml(v, document, element); + } +// map2Xml((Map)value, document, element); + }else { + value = value.toString().trim(); + element.appendChild(document.createTextNode(value.toString())); + } + + + } + + + public static void main(String[] args) { + String text = "01张三2张4"; + System.out.println( getMap2Xml(toJSONObject(text), "data", "utf-8")); + + } } diff --git a/pay-java-demo/pom.xml b/pay-java-demo/pom.xml index 17c0e16..b196ab5 100644 --- a/pay-java-demo/pom.xml +++ b/pay-java-demo/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.12.9 + 2.13.1-SNAPSHOT 4.0.0 war diff --git a/pay-java-fuiou/pom.xml b/pay-java-fuiou/pom.xml index 63e5797..a77d590 100644 --- a/pay-java-fuiou/pom.xml +++ b/pay-java-fuiou/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.12.9 + 2.13.1-SNAPSHOT 4.0.0 pay-java-fuiou diff --git a/pay-java-payoneer/pom.xml b/pay-java-payoneer/pom.xml index dd049db..6020570 100644 --- a/pay-java-payoneer/pom.xml +++ b/pay-java-payoneer/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.12.9 + 2.13.1-SNAPSHOT 4.0.0 pay-java-payoneer diff --git a/pay-java-paypal/pom.xml b/pay-java-paypal/pom.xml index 6dbe403..969573e 100644 --- a/pay-java-paypal/pom.xml +++ b/pay-java-paypal/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.12.9 + 2.13.1-SNAPSHOT 4.0.0 diff --git a/pay-java-union/pom.xml b/pay-java-union/pom.xml index cadae0c..b9ebdc1 100644 --- a/pay-java-union/pom.xml +++ b/pay-java-union/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.12.9 + 2.13.1-SNAPSHOT 4.0.0 diff --git a/pay-java-wx-youdian/pom.xml b/pay-java-wx-youdian/pom.xml index cdd7f5d..c424d22 100644 --- a/pay-java-wx-youdian/pom.xml +++ b/pay-java-wx-youdian/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.12.9 + 2.13.1-SNAPSHOT 4.0.0 pay-java-wx-youdian diff --git a/pay-java-wx/pom.xml b/pay-java-wx/pom.xml index 0842391..484a61e 100644 --- a/pay-java-wx/pom.xml +++ b/pay-java-wx/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.12.9 + 2.13.1-SNAPSHOT 4.0.0 pay-java-wx diff --git a/pay-java-yiji/pom.xml b/pay-java-yiji/pom.xml index c1d5845..63fb58e 100644 --- a/pay-java-yiji/pom.xml +++ b/pay-java-yiji/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.12.9 + 2.13.1-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 8db4562..979bbd9 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.egzosn pay-java-parent pom - 2.12.9 + 2.13.1-SNAPSHOT Pay Java - Parent Pay Java Parent @@ -58,7 +58,7 @@ - 2.12.9 + 2.13.1-SNAPSHOT 4.5.4 1.2.17 1.2.58