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

mark-dev

Author: aldoli

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [5.6.55]
+- add batch image auditing api
+- add DocumentAuditing api
+- update CI Auditing api
+
 ## [5.6.54]
 - default use https request
 - use strict sign

README.md

@@ -8,7 +8,7 @@
 <dependency>
     <groupId>com.qcloud</groupId>
     <artifactId>cos_api</artifactId>
-    <version>5.6.52</version>
+    <version>5.6.55</version>
 </dependency>
 ```
 

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

@@ -34,6 +34,8 @@
 import com.qcloud.cos.model.*;
 import com.qcloud.cos.model.ciModel.auditing.AudioAuditingRequest;
 import com.qcloud.cos.model.ciModel.auditing.AudioAuditingResponse;
+import com.qcloud.cos.model.ciModel.auditing.DocumentAuditingRequest;
+import com.qcloud.cos.model.ciModel.auditing.DocumentAuditingResponse;
 import com.qcloud.cos.model.ciModel.auditing.ImageAuditingRequest;
 import com.qcloud.cos.model.ciModel.auditing.ImageAuditingResponse;
 import com.qcloud.cos.model.ciModel.auditing.TextAuditingRequest;
@@ -2899,6 +2901,18 @@ SelectObjectContentResult selectObjectContent(SelectObjectContentRequest selectR
      * DescribeAuditingTextJob 查询文本审核任务结果 https://cloud.tencent.com/document/product/436/56288
      */
     TextAuditingResponse describeAuditingTextJob(TextAuditingRequest request);
+
+    /**
+     * CreateAuditingDocumentJobs 提交文档审核任务 https://cloud.tencent.com/document/product/460/59380
+     */
+    DocumentAuditingResponse createAuditingDocumentJobs(DocumentAuditingRequest request);
+
+    /**
+     * DescribeAuditingDocumentJobs 提交文档审核任务 https://cloud.tencent.com/document/product/460/59383
+     */
+    DocumentAuditingResponse describeAuditingDocumentJob(DocumentAuditingRequest request);
+
+
 }
 
 

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

@@ -97,6 +97,8 @@
 import com.qcloud.cos.model.*;
 import com.qcloud.cos.model.ciModel.auditing.AudioAuditingRequest;
 import com.qcloud.cos.model.ciModel.auditing.AudioAuditingResponse;
+import com.qcloud.cos.model.ciModel.auditing.DocumentAuditingRequest;
+import com.qcloud.cos.model.ciModel.auditing.DocumentAuditingResponse;
 import com.qcloud.cos.model.ciModel.auditing.ImageAuditingRequest;
 import com.qcloud.cos.model.ciModel.auditing.ImageAuditingResponse;
 import com.qcloud.cos.model.ciModel.auditing.TextAuditingRequest;
@@ -3838,10 +3840,13 @@ 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");
-        rejectNull(imageAuditingRequest.getDetectType(), "The detectType parameter must be specified setting the object tags");
+        String detectType = imageAuditingRequest.getDetectType();
+        rejectNull(detectType, "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());
+        if ("all".equalsIgnoreCase(detectType))
+            detectType = "porn,terrorist,politics,ads";
+        addParameterIfNotNull(request, "detect-type", detectType);
         addParameterIfNotNull(request, "interval", Integer.toString(imageAuditingRequest.getInterval()));
         addParameterIfNotNull(request, "max-frames", Integer.toString(imageAuditingRequest.getMaxFrames()));
         addParameterIfNotNull(request, "biz-type", imageAuditingRequest.getBizType());
@@ -3927,6 +3932,24 @@ public TextAuditingResponse describeAuditingTextJob(TextAuditingRequest textAudi
         return invoke(request, new Unmarshallers.TextAuditingDescribeJobUnmarshaller());
     }
 
+    @Override
+    public DocumentAuditingResponse createAuditingDocumentJobs(DocumentAuditingRequest documentAuditingRequest) {
+        this.checkCIRequestCommon(documentAuditingRequest);
+        this.rejectStartWith(documentAuditingRequest.getConf().getCallback(), "http", "The Conf.CallBack parameter mush start with http or https");
+        CosHttpRequest<DocumentAuditingRequest> request = createRequest(documentAuditingRequest.getBucketName(), "/document/auditing", documentAuditingRequest, HttpMethodName.POST);
+        this.setContent(request, RequestXmlFactory.convertToXmlByteArray(documentAuditingRequest), "application/xml", false);
+        return invoke(request, new Unmarshallers.DocumentAuditingJobUnmarshaller());
+    }
+
+    @Override
+    public DocumentAuditingResponse describeAuditingDocumentJob(DocumentAuditingRequest documentAuditingRequest) {
+        this.checkCIRequestCommon(documentAuditingRequest);
+        rejectNull(documentAuditingRequest.getJobId(),
+                "The jobId parameter must be specified setting the object tags");
+        CosHttpRequest<DocumentAuditingRequest> request = createRequest(documentAuditingRequest.getBucketName(), "/document/auditing/" + documentAuditingRequest.getJobId(), documentAuditingRequest, HttpMethodName.GET);
+        return invoke(request, new Unmarshallers.DocumentAuditingDescribeJobUnmarshaller());
+    }
+
     private void checkAuditingRequest(ImageAuditingRequest request) {
         rejectNull(request.getDetectType(), "The detectType parameter must be specified setting the object tags");
         rejectNull(request.getObjectKey(), "The objectKey parameter must be specified setting the object tags");

src/main/java/com/qcloud/cos/demo/ci/DocumentAuditingJobDemo.java

@@ -0,0 +1,54 @@
+package com.qcloud.cos.demo.ci;
+
+import com.qcloud.cos.COSClient;
+import com.qcloud.cos.model.ciModel.auditing.DocumentAuditingRequest;
+import com.qcloud.cos.model.ciModel.auditing.DocumentAuditingResponse;
+
+
+/**
+ * 内容审核 文档审核接口相关demo 详情见https://cloud.tencent.com/document/product/460/59380
+ */
+public class DocumentAuditingJobDemo {
+
+    public static void main(String[] args) {
+        // 1 初始化用户身份信息（secretId, secretKey）。
+        COSClient client = ClientUtils.getTestClient();
+        // 2 调用要使用的方法。
+        describeAuditingDocumentJob(client);
+    }
+
+    /**
+     * createAuditingTextJobs 接口用于创建文档审核任务。
+     */
+    public static void createAuditingDocumentJobs(COSClient client) {
+        //1.创建任务请求对象
+        DocumentAuditingRequest request = new DocumentAuditingRequest();
+        //2.添加请求参数 参数详情请见api接口文档
+        request.setBucketName("markjrzhang-1251704708");
+        //2.1.1设置对象地址
+//        request.getInput().setObject("1.txt");
+        //2.1.2或直接设置请求内容,文本内容的Base64编码
+        request.getInput().setUrl("https://markjrzhang-1251704708.cos.ap-chongqing.myqcloud.com/%E9%97%AE%E9%A2%98%E6%B1%87%E6%80%BB.pptx");
+        //2.2设置审核类型参数
+        request.getConf().setDetectType("all");
+        //2.3设置审核模板（可选）
+//        request.getConf().setBizType("aa3e9d84a6a079556b0109a935c*****");
+        //3.调用接口,获取任务响应对象
+        DocumentAuditingResponse response = client.createAuditingDocumentJobs(request);
+    }
+
+    /**
+     * DescribeAuditingTextJob 接口用于查询文档审核任务。
+     *
+     * @param client
+     */
+    public static void describeAuditingDocumentJob(COSClient client) {
+        //1.创建任务请求对象
+        DocumentAuditingRequest request = new DocumentAuditingRequest();
+        //2.添加请求参数 参数详情请见api接口文档
+        request.setBucketName("markjrzhang-1251704708");
+        request.setJobId("sdd5d1cc630fdc11ecb3fa525400946f76");
+        //3.调用接口,获取任务响应对象
+        DocumentAuditingResponse response = client.describeAuditingDocumentJob(request);
+    }
+}

src/main/java/com/qcloud/cos/demo/ci/ImageAuditingDemo.java

@@ -4,19 +4,26 @@
 import com.qcloud.cos.model.ciModel.auditing.AuditingInfo;
 import com.qcloud.cos.model.ciModel.auditing.ImageAuditingRequest;
 import com.qcloud.cos.model.ciModel.auditing.ImageAuditingResponse;
+import com.qcloud.cos.transfer.ImageAuditingImpl;
+import com.qcloud.cos.transfer.MultipleImageAuditingImpl;
+import com.qcloud.cos.transfer.TransferManager;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * 内容审核 图片审核接口相关demo 详情见https://cloud.tencent.com/document/product/460/37318
  */
 public class ImageAuditingDemo {
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws InterruptedException {
         // 1 初始化用户身份信息（secretId, secretKey）。
         COSClient client = ClientUtils.getTestClient();
         // 2 调用要使用的方法。
-        imageAuditing(client);
+//        imageAuditing(client);
+        batchPostImageAuditing(client);
     }
 
     /**
@@ -31,12 +38,45 @@ public static void imageAuditing(COSClient client) {
         //2.1设置请求bucket
         request.setBucketName("demo-123456789");
         //2.2设置审核类型
-        request.setDetectType("porn,terrorist,politics,ads");
+        request.setDetectType("porn");
         //2.3设置bucket中的图片位置
-        request.setObjectKey("1.png");
+        request.setObjectKey("1.jpg");
         //3.调用接口,获取任务响应对象
         ImageAuditingResponse response = client.imageAuditing(request);
         //4调用工具类，获取各审核类型详情集合 (也可自行根据业务解析)
         List<AuditingInfo> imageInfoList = AuditingResultUtil.getImageInfoList(response);
+        System.out.println(response);
+    }
+
+    /**
+     * 批量发送图片审核任务
+     */
+    public static void batchPostImageAuditing(COSClient client) throws InterruptedException {
+        List<ImageAuditingRequest> requestList = new ArrayList<>();
+        ImageAuditingRequest request = new ImageAuditingRequest();
+        request.setBucketName("demo-123456789");
+        request.setObjectKey("1.png");
+        request.setDetectType("all");
+        requestList.add(request);
+
+        request = new ImageAuditingRequest();
+        request.setBucketName("demo-123456789");
+        request.setObjectKey("1.jpg");
+        request.setDetectType("all");
+        requestList.add(request);
+
+        // 传入一个threadpool, 若不传入线程池, 默认TransferManager中会生成一个单线程的线程池。
+        ExecutorService threadPool = Executors.newFixedThreadPool(4);
+        TransferManager transferManager = new TransferManager(client, threadPool);
+        MultipleImageAuditingImpl multipleImageAuditing = transferManager.batchPostImageAuditing(requestList);
+        multipleImageAuditing.waitForCompletion();
+        List<ImageAuditingImpl> imageAuditingList = multipleImageAuditing.getImageAuditingList();
+        for (ImageAuditingImpl imageAuditing : imageAuditingList) {
+            System.out.println(imageAuditing.getState());
+            System.out.println(imageAuditing.getResponse());
+            System.out.println(imageAuditing.getErrMsg());
+        }
+        transferManager.shutdownNow();
+        client.shutdown();
     }
 }

src/main/java/com/qcloud/cos/demo/ci/ImageLabelDemo.java

@@ -5,8 +5,6 @@
 import com.qcloud.cos.COSClient;
 import com.qcloud.cos.model.ciModel.image.ImageLabelRequest;
 import com.qcloud.cos.model.ciModel.image.ImageLabelResponse;
-import com.qcloud.cos.model.ciModel.image.ImageLabelV2Request;
-import com.qcloud.cos.model.ciModel.image.ImageLabelV2Response;
 
 /**
  * 图片标签接口使用demo https://cloud.tencent.com/document/product/460/39082

src/main/java/com/qcloud/cos/demo/ci/TextAuditingJobDemo.java

@@ -26,15 +26,15 @@ public static void createAuditingTextJobs(COSClient client) {
         //1.创建任务请求对象
         TextAuditingRequest request = new TextAuditingRequest();
         //2.添加请求参数 参数详情请见api接口文档
-        request.setBucketName("demo-123456789");
+        request.setBucketName("demo-1234567898");
         //2.1.1设置对象地址
 //        request.getInput().setObject("1.txt");
         //2.1.2或直接设置请求内容,文本内容的Base64编码
         request.getInput().setContent("Base64Str");
         //2.2设置审核类型参数
         request.getConf().setDetectType("all");
         //2.3设置审核模板（可选）
-        request.getConf().setBizType("aa3e9d84a6a079556b0109a935c*****");
+//        request.getConf().setBizType("aa3e9d84a6a079556b0109a935c*****");
         //3.调用接口,获取任务响应对象
         TextAuditingResponse response = client.createAuditingTextJobs(request);
         //4.调用工具类，获取各审核类型详情集合 (也可自行根据业务解析)

src/main/java/com/qcloud/cos/demo/ci/VideoAuditingJobDemo.java

@@ -16,7 +16,7 @@ public static void main(String[] args) {
         // 1 初始化用户身份信息（secretId, secretKey）。
         COSClient client = ClientUtils.getTestClient();
         // 2 调用要使用的方法。
-        describeAuditingJob(client);
+        createVideoAuditingJob(client);
     }
 
     /**

src/main/java/com/qcloud/cos/http/DefaultCosHttpClient.java

@@ -19,17 +19,6 @@
 package com.qcloud.cos.http;
 
 
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import com.qcloud.cos.ClientConfig;
 import com.qcloud.cos.Headers;
 import com.qcloud.cos.event.ProgressInputStream;
@@ -49,7 +38,6 @@
 import com.qcloud.cos.utils.ExceptionUtils;
 import com.qcloud.cos.utils.UrlEncoderUtils;
 import com.qcloud.cos.utils.ValidationUtils;
-
 import org.apache.commons.codec.binary.Base64;
 import org.apache.http.Header;
 import org.apache.http.HttpHost;
@@ -74,6 +62,17 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
 
 public class DefaultCosHttpClient implements CosHttpClient {