Skip to content

Commit 8e4077e

Browse files
chanjarsterchanjarster
committed
issue binarywang#45 生成的xml去掉<?xml...的头
1 parent 7b92a14 commit 8e4077e

File tree

13 files changed

+24
-44
lines changed

13 files changed

+24
-44
lines changed

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/xml/XmlTransformer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public static <T> void toXml(Class<T> clazz, T object, Writer writer) throws JAX
5959
Marshaller m = JAXB_CONTEXT.createMarshaller();
6060
m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
6161
m.setProperty(CharacterEscapeHandler.class.getName(), CHAR_ESCAPE_HANDLER);
62+
m.setProperty(Marshaller.JAXB_FRAGMENT, true);
6263
m.marshal(object, writer);
6364
}
6465

‎weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutImageMessageTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ public void test() {
1313
m.setFromUserName("from");
1414
m.setToUserName("to");
1515

16-
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
17-
+ "<xml>"
16+
String expected = "<xml>"
1817
+ "<ToUserName><![CDATA[to]]></ToUserName>"
1918
+ "<FromUserName><![CDATA[from]]></FromUserName>"
2019
+ "<CreateTime>1122</CreateTime>"
@@ -27,8 +26,7 @@ public void test() {
2726

2827
public void testBuild() {
2928
WxCpXmlOutImageMessage m = WxCpXmlOutMessage.IMAGE().mediaId("ddfefesfsdfef").fromUser("from").toUser("to").build();
30-
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
31-
+ "<xml>"
29+
String expected = "<xml>"
3230
+ "<ToUserName><![CDATA[to]]></ToUserName>"
3331
+ "<FromUserName><![CDATA[from]]></FromUserName>"
3432
+ "<CreateTime>1122</CreateTime>"

‎weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutNewsMessageTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ public void test() {
1919
item.setUrl("url");
2020
m.addArticle(item);
2121
m.addArticle(item);
22-
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
23-
+ "<xml>"
22+
String expected = "<xml>"
2423
+ "<ToUserName><![CDATA[toUser]]></ToUserName>"
2524
+ "<FromUserName><![CDATA[fromUser]]></FromUserName>"
2625
+ "<CreateTime>1122</CreateTime>"
@@ -58,8 +57,7 @@ public void testBuild() {
5857
.addArticle(item)
5958
.addArticle(item)
6059
.build();
61-
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
62-
+ "<xml>"
60+
String expected = "<xml>"
6361
+ "<ToUserName><![CDATA[toUser]]></ToUserName>"
6462
+ "<FromUserName><![CDATA[fromUser]]></FromUserName>"
6563
+ "<CreateTime>1122</CreateTime>"

‎weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutTextMessageTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ public void test() {
1313
m.setFromUserName("from");
1414
m.setToUserName("to");
1515

16-
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
17-
+ "<xml>"
16+
String expected = "<xml>"
1817
+ "<ToUserName><![CDATA[to]]></ToUserName>"
1918
+ "<FromUserName><![CDATA[from]]></FromUserName>"
2019
+ "<CreateTime>1122</CreateTime>"
@@ -27,8 +26,7 @@ public void test() {
2726

2827
public void testBuild() {
2928
WxCpXmlOutTextMessage m = WxCpXmlOutMessage.TEXT().content("content").fromUser("from").toUser("to").build();
30-
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
31-
+ "<xml>"
29+
String expected = "<xml>"
3230
+ "<ToUserName><![CDATA[to]]></ToUserName>"
3331
+ "<FromUserName><![CDATA[from]]></FromUserName>"
3432
+ "<CreateTime>1122</CreateTime>"

‎weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutVideoMessageTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ public void test() {
1515
m.setFromUserName("fromUser");
1616
m.setToUserName("toUser");
1717

18-
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
19-
+ "<xml>"
18+
String expected = "<xml>"
2019
+ "<ToUserName><![CDATA[toUser]]></ToUserName>"
2120
+ "<FromUserName><![CDATA[fromUser]]></FromUserName>"
2221
+ "<CreateTime>1122</CreateTime>"
@@ -39,8 +38,7 @@ public void testBuild() {
3938
.title("title")
4039
.description("ddfff")
4140
.build();
42-
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
43-
+ "<xml>"
41+
String expected = "<xml>"
4442
+ "<ToUserName><![CDATA[toUser]]></ToUserName>"
4543
+ "<FromUserName><![CDATA[fromUser]]></FromUserName>"
4644
+ "<CreateTime>1122</CreateTime>"

‎weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlOutVoiceMessageTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ public void test() {
1313
m.setFromUserName("from");
1414
m.setToUserName("to");
1515

16-
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
17-
+ "<xml>"
16+
String expected = "<xml>"
1817
+ "<ToUserName><![CDATA[to]]></ToUserName>"
1918
+ "<FromUserName><![CDATA[from]]></FromUserName>"
2019
+ "<CreateTime>1122</CreateTime>"
@@ -27,8 +26,7 @@ public void test() {
2726

2827
public void testBuild() {
2928
WxCpXmlOutVoiceMessage m = WxCpXmlOutMessage.VOICE().mediaId("ddfefesfsdfef").fromUser("from").toUser("to").build();
30-
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
31-
+ "<xml>"
29+
String expected = "<xml>"
3230
+ "<ToUserName><![CDATA[to]]></ToUserName>"
3331
+ "<FromUserName><![CDATA[from]]></FromUserName>"
3432
+ "<CreateTime>1122</CreateTime>"

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/xml/XmlTransformer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public static <T> void toXml(Class<T> clazz, T object, Writer writer) throws JAX
5656
Marshaller m = JAXB_CONTEXT.createMarshaller();
5757
m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
5858
m.setProperty(CharacterEscapeHandler.class.getName(), CHAR_ESCAPE_HANDLER);
59+
m.setProperty(Marshaller.JAXB_FRAGMENT, true);
5960
m.marshal(object, writer);
6061
}
6162

‎weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxMpXmlOutImageMessageTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ public void test() {
1313
m.setFromUserName("from");
1414
m.setToUserName("to");
1515

16-
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
17-
+ "<xml>"
16+
String expected = "<xml>"
1817
+ "<ToUserName><![CDATA[to]]></ToUserName>"
1918
+ "<FromUserName><![CDATA[from]]></FromUserName>"
2019
+ "<CreateTime>1122</CreateTime>"
@@ -27,8 +26,7 @@ public void test() {
2726

2827
public void testBuild() {
2928
WxMpMpXmlOutImageMessage m = WxMpXmlOutMessage.IMAGE().mediaId("ddfefesfsdfef").fromUser("from").toUser("to").build();
30-
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
31-
+ "<xml>"
29+
String expected = "<xml>"
3230
+ "<ToUserName><![CDATA[to]]></ToUserName>"
3331
+ "<FromUserName><![CDATA[from]]></FromUserName>"
3432
+ "<CreateTime>1122</CreateTime>"

‎weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutMusicMessageTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ public void test() {
1717
m.setFromUserName("fromUser");
1818
m.setToUserName("toUser");
1919

20-
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
21-
+ "<xml>"
20+
String expected = "<xml>"
2221
+ "<ToUserName><![CDATA[toUser]]></ToUserName>"
2322
+ "<FromUserName><![CDATA[fromUser]]></FromUserName>"
2423
+ "<CreateTime>1122</CreateTime>"
@@ -45,8 +44,7 @@ public void testBuild() {
4544
.musicUrl("musicUrl")
4645
.thumbMediaId("thumbMediaId")
4746
.build();
48-
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
49-
+ "<xml>"
47+
String expected = "<xml>"
5048
+ "<ToUserName><![CDATA[toUser]]></ToUserName>"
5149
+ "<FromUserName><![CDATA[fromUser]]></FromUserName>"
5250
+ "<CreateTime>1122</CreateTime>"

‎weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxXmlOutNewsMessageTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ public void test() {
1919
item.setUrl("url");
2020
m.addArticle(item);
2121
m.addArticle(item);
22-
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
23-
+ "<xml>"
22+
String expected = "<xml>"
2423
+ "<ToUserName><![CDATA[toUser]]></ToUserName>"
2524
+ "<FromUserName><![CDATA[fromUser]]></FromUserName>"
2625
+ "<CreateTime>1122</CreateTime>"
@@ -58,8 +57,7 @@ public void testBuild() {
5857
.addArticle(item)
5958
.addArticle(item)
6059
.build();
61-
String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
62-
+ "<xml>"
60+
String expected = "<xml>"
6361
+ "<ToUserName><![CDATA[toUser]]></ToUserName>"
6462
+ "<FromUserName><![CDATA[fromUser]]></FromUserName>"
6563
+ "<CreateTime>1122</CreateTime>"

0 commit comments

Comments
 (0)