Skip to content

Commit 3ba128f

Browse files
committed
1 parent f3ec0b1 commit 3ba128f

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
99
import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
1010
import com.thoughtworks.xstream.io.xml.XppDriver;
11+
import com.thoughtworks.xstream.security.NoTypePermission;
12+
import com.thoughtworks.xstream.security.NullPermission;
13+
import com.thoughtworks.xstream.security.PrimitiveTypePermission;
1114

1215
import java.io.Writer;
1316

@@ -18,6 +21,7 @@ public class XStreamInitializer {
1821

1922
public static XStream getInstance() {
2023
XStream xstream = new XStream(new XppDriver() {
24+
2125
@Override
2226
public HierarchicalStreamWriter createWriter(Writer out) {
2327
return new PrettyPrintWriter(out, getNameCoder()) {
@@ -39,7 +43,10 @@ protected void writeText(QuickWriter writer, String text) {
3943
};
4044
}
4145
});
46+
xstream.ignoreUnknownElements();
4247
xstream.setMode(XStream.NO_REFERENCES);
48+
xstream.addPermission(NullPermission.NULL);
49+
xstream.addPermission(PrimitiveTypePermission.PRIMITIVES);
4350
return xstream;
4451
}
4552

weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxBaseAPITest.java renamed to weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBaseAPITest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515
@Test(groups = "baseAPI")
1616
@Guice(modules = ApiTestModule.class)
17-
public class WxBaseAPITest {
17+
public class WxMpBaseAPITest {
1818

1919
@Inject
2020
protected WxMpServiceImpl wxService;

weixin-java-mp/src/test/resources/testng.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<suite name="Weixin-java-tool-suite" verbose="1">
44
<test name="API_Test">
55
<classes>
6-
<class name="me.chanjar.weixin.mp.api.WxBaseAPITest" />
6+
<class name="me.chanjar.weixin.mp.api.WxMpBaseAPITest" />
77
<class name="me.chanjar.weixin.mp.api.WxMpCustomMessageAPITest" />
88
<class name="me.chanjar.weixin.mp.api.WxMpMenuAPITest" />
99
<class name="me.chanjar.weixin.mp.api.WxMpGroupAPITest" />

0 commit comments

Comments
 (0)