ready to release v5.6.55

Author: markjrzhang

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/demo/ci/ImageAuditingDemo.java

@@ -36,7 +36,7 @@ public static void imageAuditing(COSClient client) {
         ImageAuditingRequest request = new ImageAuditingRequest();
         //2.添加请求参数 参数详情请见api接口文档
         //2.1设置请求bucket
-        request.setBucketName("markjrzhang-1251704708");
+        request.setBucketName("demo-123456789");
         //2.2设置审核类型
         request.setDetectType("porn");
         //2.3设置bucket中的图片位置
@@ -49,37 +49,24 @@ public static void imageAuditing(COSClient client) {
     }
 
     /**
-     * 批量获取图片标签
+     * 批量发送图片审核任务
      */
     public static void batchPostImageAuditing(COSClient client) throws InterruptedException {
         List<ImageAuditingRequest> requestList = new ArrayList<>();
         ImageAuditingRequest request = new ImageAuditingRequest();
-        request.setBucketName("markjrzhang-1251704708");
+        request.setBucketName("demo-123456789");
         request.setObjectKey("1.png");
         request.setDetectType("all");
         requestList.add(request);
 
         request = new ImageAuditingRequest();
-        request.setBucketName("markjrzhang-1251704708");
+        request.setBucketName("demo-123456789");
         request.setObjectKey("1.jpg");
         request.setDetectType("all");
         requestList.add(request);
 
-        request = new ImageAuditingRequest();
-        request.setBucketName("markjrzhang-1251704708");
-        request.setObjectKey("1.jpg");
-        request.setDetectType("all");
-        requestList.add(request);
-
-        request = new ImageAuditingRequest();
-        request.setBucketName("markjrzhang-1251704708");
-        request.setObjectKey("1.jpg");
-        request.setDetectType("all");
-        requestList.add(request);
-
-        long start = System.currentTimeMillis();
-        ExecutorService threadPool = Executors.newFixedThreadPool(4);
         // 传入一个threadpool, 若不传入线程池, 默认TransferManager中会生成一个单线程的线程池。
+        ExecutorService threadPool = Executors.newFixedThreadPool(4);
         TransferManager transferManager = new TransferManager(client, threadPool);
         MultipleImageAuditingImpl multipleImageAuditing = transferManager.batchPostImageAuditing(requestList);
         multipleImageAuditing.waitForCompletion();
@@ -89,7 +76,6 @@ public static void batchPostImageAuditing(COSClient client) throws InterruptedEx
             System.out.println(imageAuditing.getResponse());
             System.out.println(imageAuditing.getErrMsg());
         }
-        System.out.println(System.currentTimeMillis() - start);
         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,7 +26,7 @@ public static void createAuditingTextJobs(COSClient client) {
         //1.创建任务请求对象
         TextAuditingRequest request = new TextAuditingRequest();
         //2.添加请求参数 参数详情请见api接口文档
-        request.setBucketName("markjrzhang-1251704708");
+        request.setBucketName("demo-1234567898");
         //2.1.1设置对象地址
 //        request.getInput().setObject("1.txt");
         //2.1.2或直接设置请求内容,文本内容的Base64编码

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

@@ -26,7 +26,7 @@ public static void createVideoAuditingJob(COSClient client) {
         //1.创建任务请求对象
         VideoAuditingRequest request = new VideoAuditingRequest();
         //2.添加请求参数 参数详情请见api接口文档
-        request.setBucketName("markjrzhang-125170470");
+        request.setBucketName("demo-123456789");
         request.getInput().setObject("1.mp4");
         request.getConf().setDetectType("Porn,Terrorism,Politics,Ads");
         request.getConf().getSnapshot().setCount("10");

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

@@ -19,19 +19,6 @@
 package com.qcloud.cos.http;
 
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-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;
@@ -51,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;
@@ -76,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 {
 
@@ -473,17 +470,6 @@ public <X, Y extends CosServiceRequest> X exeute(CosHttpRequest<Y> request,
                 httpRequest = buildHttpRequest(request);
                 httpResponse = null;
                 httpResponse = executeOneRequest(context, httpRequest);
-//                                BufferedReader in = new BufferedReader(new InputStreamReader(httpResponse.getEntity()
-//                        .getContent()));
-//                StringBuffer sb = new StringBuffer("");
-//                String line = "";
-//                String NL = System.getProperty("line.separator");
-//                while ((line = in.readLine()) != null) {
-//                    sb.append(line + NL);
-//                }
-////                in.close();
-//                String content = sb.toString();
-//                System.out.println(content);
                 checkResponse(request, httpRequest, httpResponse);
                 break;
             } catch (CosServiceException cse) {