Merge branch 'mark-dev' into 'master' (merge request !37)

add ImageAuditing new param

Author: markjrzhang

src/main/java/com/qcloud/cos/COSClient.java

@@ -3834,13 +3834,14 @@ public ImageAuditingResponse imageAuditing(ImageAuditingRequest imageAuditingReq
                 "The imageAuditingRequest parameter must be specified setting the object tags");
         rejectNull(imageAuditingRequest.getBucketName(),
                 "The bucketName parameter must be specified setting the object tags");
-        this.checkAuditingRequest(imageAuditingRequest);
+        rejectNull(imageAuditingRequest.getDetectType(), "The detectType parameter must be specified setting the object tags");
         CosHttpRequest<ImageAuditingRequest> request = createRequest(imageAuditingRequest.getBucketName(), imageAuditingRequest.getObjectKey(), imageAuditingRequest, HttpMethodName.GET);
         request.addParameter("ci-process", "sensitive-content-recognition");
         addParameterIfNotNull(request, "detect-type", imageAuditingRequest.getDetectType());
         addParameterIfNotNull(request, "interval", Integer.toString(imageAuditingRequest.getInterval()));
         addParameterIfNotNull(request, "max-frames", Integer.toString(imageAuditingRequest.getMaxFrames()));
         addParameterIfNotNull(request, "biz-type", imageAuditingRequest.getBizType());
+        addParameterIfNotNull(request, "detect-url", imageAuditingRequest.getDetectUrl());
         return invoke(request, new Unmarshallers.ImageAuditingUnmarshaller());
     }
 
@@ -3924,7 +3925,7 @@ public TextAuditingResponse describeAuditingTextJob(TextAuditingRequest textAudi
 
     private void checkAuditingRequest(ImageAuditingRequest request) {
         rejectNull(request.getDetectType(), "The detectType parameter must be specified setting the object tags");
-        rejectNull(request.getObjectKey(), "The detectType parameter must be specified setting the object tags");
+        rejectNull(request.getObjectKey(), "The objectKey parameter must be specified setting the object tags");
     }
 
     private void checkWorkflowParameter(MediaWorkflowRequest request) {

src/main/java/com/qcloud/cos/model/ciModel/auditing/ImageAuditingRequest.java

@@ -25,20 +25,28 @@ public class ImageAuditingRequest extends CosServiceRequest {
     private String objectKey;
 
     /**
-     * 截帧频率，GIF 图或长图检测专用，默认值为0，表示只会检测 GIF 图或长图的第一帧
+     * 截帧频率，GIF 图或长图检测专用，默认值为5，表示只会检测 GIF 图或长图的第一帧
      */
-    private int interval;
+    private int interval = 5;
 
     /**
-     * 最大截帧数量，GIF 图或长图检测专用，默认值为1，表示只取 GIF 的第1帧图片进行审核，或长图不进行切分识别
+     * 最大截帧数量，GIF 图或长图检测专用，默认值为5，表示只取 GIF 的第1帧图片进行审核，或长图不进行切分识别
      */
-    private int maxFrames;
+    private int maxFrames = 5;
 
     /**
      * 审核策略的唯一标识，由后台自动生成，在控制台中对应为 Biztype 值
      */
     private String bizType;
 
+    /**
+     * 您可以通过填写detect-url审核任意公网可访问的图片链接
+     * 不填写detect-url时，后台会默认审核ObjectKey
+     * 填写了detect-url时，后台会审核detect-url链接，无需再填写ObjectKey
+     * detect-url示例：http://www.example.com/abc.jpg
+     */
+    private String detectUrl;
+
     public String getDetectType() {
         return detectType;
     }
@@ -88,6 +96,14 @@ public void setBizType(String bizType) {
         this.bizType = bizType;
     }
 
+    public String getDetectUrl() {
+        return detectUrl;
+    }
+
+    public void setDetectUrl(String detectUrl) {
+        this.detectUrl = detectUrl;
+    }
+
     @Override
     public String toString() {
         final StringBuffer sb = new StringBuffer("ImageAuditingRequest{");
@@ -96,7 +112,8 @@ public String toString() {
         sb.append(", objectKey='").append(objectKey).append('\'');
         sb.append(", interval=").append(interval);
         sb.append(", maxFrames=").append(maxFrames);
-        sb.append(", bizType=").append(bizType);
+        sb.append(", bizType='").append(bizType).append('\'');
+        sb.append(", detectUrl='").append(detectUrl).append('\'');
         sb.append('}');
         return sb.toString();
     }