diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenMaDomainResult.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenMaDomainResult.java index 028dd62e2..0582a5f73 100644 --- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenMaDomainResult.java +++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenMaDomainResult.java @@ -38,6 +38,16 @@ public class WxOpenMaDomainResult extends WxOpenResult { */ @SerializedName("downloaddomain") private List downloadDomain; + /** + * udp合法域名 + */ + @SerializedName("udpdomain") + private List udpDomain; + /** + * tcp合法域名 + */ + @SerializedName("tcpdomain") + private List tcpDomain; /** * request不合法域名 */ @@ -58,6 +68,16 @@ public class WxOpenMaDomainResult extends WxOpenResult { */ @SerializedName("invalid_downloaddomain") private List invalidDownloadDomain; + /** + * udp不合法域名 + */ + @SerializedName("invalid_udpdomain") + private List invalidUdpDomain; + /** + * tcp不合法域名 + */ + @SerializedName("invalid_tcpdomain") + private List invalidTcpDomain; public static WxOpenMaDomainResult fromJson(String json) { return WxGsonBuilder.create().fromJson(json, WxOpenMaDomainResult.class); diff --git a/weixin-java-open/src/test/java/me/chanjar/weixin/open/bean/result/WxOpenMaDomainResultTest.java b/weixin-java-open/src/test/java/me/chanjar/weixin/open/bean/result/WxOpenMaDomainResultTest.java new file mode 100644 index 000000000..20efd4c9f --- /dev/null +++ b/weixin-java-open/src/test/java/me/chanjar/weixin/open/bean/result/WxOpenMaDomainResultTest.java @@ -0,0 +1,27 @@ +package me.chanjar.weixin.open.bean.result; + +import org.testng.annotations.Test; + +import java.util.Arrays; + +import static org.testng.Assert.assertEquals; + +public class WxOpenMaDomainResultTest { + + @Test + public void testFromJson() { + String json = "{" + + "\"udpdomain\":[\"udp://valid.example.com\"]," + + "\"tcpdomain\":[\"tcp://valid.example.com\"]," + + "\"invalid_udpdomain\":[\"udp://invalid.example.com\"]," + + "\"invalid_tcpdomain\":[\"tcp://invalid.example.com\"]" + + "}"; + + WxOpenMaDomainResult result = WxOpenMaDomainResult.fromJson(json); + + assertEquals(result.getUdpDomain(), Arrays.asList("udp://valid.example.com")); + assertEquals(result.getTcpDomain(), Arrays.asList("tcp://valid.example.com")); + assertEquals(result.getInvalidUdpDomain(), Arrays.asList("udp://invalid.example.com")); + assertEquals(result.getInvalidTcpDomain(), Arrays.asList("tcp://invalid.example.com")); + } +} diff --git a/weixin-java-open/src/test/resources/testng.xml b/weixin-java-open/src/test/resources/testng.xml index 4599e3798..2698187a5 100644 --- a/weixin-java-open/src/test/resources/testng.xml +++ b/weixin-java-open/src/test/resources/testng.xml @@ -6,6 +6,7 @@ +