diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMediaAsyncCheckResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMediaAsyncCheckResult.java index f4428b959..64351ece6 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMediaAsyncCheckResult.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMediaAsyncCheckResult.java @@ -2,7 +2,11 @@ package cn.binarywang.wx.miniapp.bean; import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import com.google.gson.annotations.SerializedName; +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamConverter; +import lombok.Builder; import lombok.Data; +import me.chanjar.weixin.common.util.xml.XStreamCDataConverter; import java.io.Serializable; @@ -19,6 +23,60 @@ public class WxMaMediaAsyncCheckResult implements Serializable { @SerializedName("trace_id") private String traceId; + /** + * 综合结果 + */ + @Data + @Builder + @XStreamAlias("result") + public static class ResultBean implements Serializable { + /** + * suggest : risky + * label : 20001 + */ + @SerializedName("suggest") + @XStreamAlias("suggest") + @XStreamConverter(value = XStreamCDataConverter.class) + private String suggest; + @SerializedName("label") + @XStreamAlias("label") + @XStreamConverter(value = XStreamCDataConverter.class) + private String label; + } + + /** + * 详细检测结果 + */ + @Data + @Builder + @XStreamAlias("detail") + public static class DetailBean implements Serializable { + /** + * strategy : content_model + * errcode : 0 + * suggest : risky + * label : 20006 + * prob : 90 + */ + @SerializedName("strategy") + @XStreamAlias("strategy") + @XStreamConverter(value = XStreamCDataConverter.class) + private String strategy; + @SerializedName("errcode") + @XStreamAlias("errcode") + private Integer errcode; + @SerializedName("suggest") + @XStreamAlias("suggest") + @XStreamConverter(value = XStreamCDataConverter.class) + private String suggest; + @SerializedName("label") + @XStreamAlias("label") + @XStreamConverter(value = XStreamCDataConverter.class) + private String label; + @SerializedName("prob") + @XStreamAlias("prob") + private Integer prob; + } public static WxMaMediaAsyncCheckResult fromJson(String json) { return WxMaGsonBuilder.create().fromJson(json, WxMaMediaAsyncCheckResult.class); diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java index aa9fd868d..e34d63cd6 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java @@ -7,6 +7,7 @@ import cn.binarywang.wx.miniapp.util.xml.XStreamTransformer; import com.google.gson.annotations.SerializedName; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamConverter; +import com.thoughtworks.xstream.annotations.XStreamImplicit; import lombok.Data; import me.chanjar.weixin.common.error.WxRuntimeException; import me.chanjar.weixin.common.util.XmlUtils; @@ -18,6 +19,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.Serializable; import java.nio.charset.StandardCharsets; +import java.util.List; import java.util.Map; /** @@ -144,6 +146,29 @@ public class WxMaMessage implements Serializable { @XStreamConverter(value = XStreamCDataConverter.class) private String statusCode; + /** + * 异步校验图片/音频内容安全 接口版本 + * @since 2.0 + */ + @SerializedName("version") + @XStreamAlias("version") + private Integer version; + /** + * 异步校验图片/音频内容安全 综合结果 + * @since 2.0 + */ + @SerializedName("result") + @XStreamAlias("result") + private WxMaMediaAsyncCheckResult.ResultBean result; + /** + * 异步校验图片/音频内容安全 详细检测结果 + * @since 2.0 + */ + @SerializedName("detail") + @XStreamAlias("detail") + @XStreamImplicit + private List detail; + @SerializedName("Scene") @XStreamAlias("Scene") private Integer scene;