From b6ee83d119386bcbe2739d17bd9fcd047f7db027 Mon Sep 17 00:00:00 2001
From: zhangyulai <zyl@zhangyl.com>
Date: Mon, 18 Apr 2022 15:28:33 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20#2593=20=E3=80=90=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E3=80=91=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=E7=B1=BB?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87/=E9=9F=B3=E9=A2=91?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=A3=80=E6=B5=8B2.0=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bean/WxMaMediaAsyncCheckResult.java       | 58 +++++++++++++++++++
 .../wx/miniapp/bean/WxMaMessage.java          | 25 ++++++++
 2 files changed, 83 insertions(+)

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<WxMaMediaAsyncCheckResult.DetailBean> detail;
+
   @SerializedName("Scene")
   @XStreamAlias("Scene")
   private Integer scene;