Merge pull request #186 from 563750789/master

563750789 · web-flow · commit 7a9f75f24241 · 2024-04-24T15:54:45.000+08:00
update CI API
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qcloud</groupId>
     <artifactId>cos_api</artifactId>
-    <version>5.6.210</version>
+    <version>5.6.211</version>
     <packaging>jar</packaging>
     <name>cos-java-sdk</name>
     <description>java sdk for qcloud cos</description>
diff --git a/src/main/java/com/qcloud/cos/demo/ci/AIGameRecDemo.java b/src/main/java/com/qcloud/cos/demo/ci/AIGameRecDemo.java
@@ -6,7 +6,7 @@
 import com.qcloud.cos.utils.Jackson;
 
 /**
- * 游戏图场景识别demo
+ * 游戏图场景识别demo  相关API 请参考 https://cloud.tencent.com/document/product/460/93153
  */
 public class AIGameRecDemo {
     public static void main(String[] args) throws InterruptedException {
diff --git a/src/main/java/com/qcloud/cos/demo/ci/AuditingKeywordDemo.java b/src/main/java/com/qcloud/cos/demo/ci/AuditingKeywordDemo.java
@@ -9,7 +9,7 @@
 import java.util.List;
 
 /**
- * 内容审核 自定义文本库关键词相关demo 详情见https://cloud.tencent.com/document/product/460/76261
+ * 内容审核 自定义文本库关键词相关demo
  */
 public class AuditingKeywordDemo {
 
diff --git a/src/main/java/com/qcloud/cos/demo/ci/AuditingStrategyDemo.java b/src/main/java/com/qcloud/cos/demo/ci/AuditingStrategyDemo.java
@@ -11,7 +11,7 @@
 import java.util.List;
 
 /**
- * 内容审核 审核策略相关demo 详情见https://cloud.tencent.com/document/product/460/76261
+ * 内容审核 审核策略相关demo
  */
 public class AuditingStrategyDemo {
 
diff --git a/src/main/java/com/qcloud/cos/demo/ci/AuditingTextLibDemo.java b/src/main/java/com/qcloud/cos/demo/ci/AuditingTextLibDemo.java
@@ -6,7 +6,7 @@
 import com.qcloud.cos.utils.Jackson;
 
 /**
- * 内容审核 自定义文本库相关demo 详情见https://cloud.tencent.com/document/product/460/76261
+ * 内容审核 自定义文本库相关demo
  */
 public class AuditingTextLibDemo {
 
diff --git a/src/main/java/com/qcloud/cos/demo/ci/BlindWatermarkDemo.java b/src/main/java/com/qcloud/cos/demo/ci/BlindWatermarkDemo.java
@@ -26,7 +26,9 @@
 import java.util.LinkedList;
 import java.util.List;
 
-
+/**
+ * 盲水印相关demo API 接口说明：https://cloud.tencent.com/document/product/460/19017
+ */
 public class BlindWatermarkDemo {
     public static void addBlindWatermark(COSClient cosClient) {
         // bucket名需包含appid
diff --git a/src/main/java/com/qcloud/cos/demo/ci/ClientUtils.java b/src/main/java/com/qcloud/cos/demo/ci/ClientUtils.java
@@ -7,7 +7,10 @@
 import com.qcloud.cos.region.Region;
 
 /**
- * Generate request client tool class
+ * 仅为demo演示所用 在demo中每次执行都会创建client对象
+ * COSClient 是线程安全的类，允许多线程访问同一实例。
+ * 因为实例内部维持了一个连接池，创建多个实例可能导致程序资源耗尽，请确保程序生命周期内实例只有一个
+ * 在不再需要使用时，调用 shutdown 方法将其关闭。如果需要新建实例，请先将之前的实例关闭。
  */
 public class ClientUtils {
 
diff --git a/src/main/java/com/qcloud/cos/demo/ci/DocJobDemo.java b/src/main/java/com/qcloud/cos/demo/ci/DocJobDemo.java
@@ -14,7 +14,7 @@
 import java.net.URISyntaxException;
 
 /**
- * 文档预览任务相关demo
+ * 文档预览任务相关demo 详情参考API文档 https://cloud.tencent.com/document/product/460/46942
  */
 public class DocJobDemo {
     public static void main(String[] args)  {
diff --git a/src/main/java/com/qcloud/cos/demo/ci/FileProcessJobDemo.java b/src/main/java/com/qcloud/cos/demo/ci/FileProcessJobDemo.java
@@ -3,10 +3,8 @@
 import com.qcloud.cos.COSClient;
 import com.qcloud.cos.model.ciModel.common.MediaOutputObject;
 import com.qcloud.cos.model.ciModel.job.*;
-import com.qcloud.cos.utils.Base64;
 import com.qcloud.cos.utils.Jackson;
 
-import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/qcloud/cos/demo/ci/ImagePersistenceDemo.java b/src/main/java/com/qcloud/cos/demo/ci/ImagePersistenceDemo.java
@@ -26,7 +26,9 @@
 import com.qcloud.cos.transfer.TransferManager;
 import com.qcloud.cos.transfer.Upload;
 
-
+/**
+ * 基础图片处理相关demo  相关API https://cloud.tencent.com/document/product/460/36540
+ */
 public class ImagePersistenceDemo {
     public static void persistenceImage(COSClient cosClient) {
         // bucket名需包含appid
diff --git a/src/main/java/com/qcloud/cos/demo/ci/JobDemo.java b/src/main/java/com/qcloud/cos/demo/ci/JobDemo.java
@@ -17,7 +17,7 @@
 import java.util.List;
 
 /**
- * 媒体处理 job接口相关demo 详情见https://cloud.tencent.com/document/product/460/48216
+ * 媒体处理 job接口相关demo 详情见https://cloud.tencent.com/document/product/460/84790
  */
 public class JobDemo {
 
diff --git a/src/main/java/com/qcloud/cos/demo/ci/TranscodeJobDemo.java b/src/main/java/com/qcloud/cos/demo/ci/TranscodeJobDemo.java
@@ -68,6 +68,8 @@ public static void createMediaJobs(COSClient client) {
         request.getOperation().getOutput().setRegion("ap-chongqing");
         request.getOperation().getOutput().setObject("demo1.mp4");
         request.setCallBack("https://cloud.tencent.com/xxx");
+        //任务所在的队列类型，限制为 SpeedTranscoding, 表示为开启倍速转码
+//        request.setQueueType("SpeedTranscoding");
         //3.调用接口,获取任务响应对象
         MediaJobResponse response = client.createMediaJobs(request);
         System.out.println(response.getJobsDetail().getJobId());
diff --git a/src/main/java/com/qcloud/cos/internal/ParserMediaInfoUtils.java b/src/main/java/com/qcloud/cos/internal/ParserMediaInfoUtils.java
@@ -717,16 +717,19 @@ public static void ParsingAuditingCommonInfo(AudtingCommonInfo obj, String name,
         }
     }
 
-    public static void parseOrcInfo(OcrResults obj, String name, String value) {
-        switch (name) {
-            case "Text":
-                obj.setText(value);
-                break;
-            case "Keywords":
-                obj.setKeywords(value);
-                break;
-            default:
-                break;
+    public static void parseOrcInfo(List<OcrResults> obj, String name, String value) {
+        if (obj != null && !obj.isEmpty()) {
+            OcrResults ocrResults = obj.get(obj.size() - 1);
+            switch (name) {
+                case "Text":
+                    ocrResults.setText(value);
+                    break;
+                case "Keywords":
+                    ocrResults.setKeywords(value);
+                    break;
+                default:
+                    break;
+            }
         }
     }
 
diff --git a/src/main/java/com/qcloud/cos/internal/XmlResponsesSaxParser.java b/src/main/java/com/qcloud/cos/internal/XmlResponsesSaxParser.java
@@ -6448,13 +6448,13 @@ protected void doEndElement(String uri, String name, String qName) {
                     resultDetail.setSheetNumber(getText());
                 }
             } else if (in("Response", "JobsDetail", "PageSegment", "Results", "PornInfo", "OcrResults")) {
-                parseResultInfo(resultDetail.getPornInfo().getOcrResults(), name, getText());
+                ParserMediaInfoUtils.parseOrcInfo(resultDetail.getPornInfo().getOcrResults(), name, getText());
             } else if (in("Response", "JobsDetail", "PageSegment", "Results", "PoliticsInfo", "OcrResults")) {
-                parseResultInfo(resultDetail.getPoliticsInfo().getOcrResults(), name, getText());
+                ParserMediaInfoUtils.parseOrcInfo(resultDetail.getPoliticsInfo().getOcrResults(), name, getText());
             } else if (in("Response", "JobsDetail", "PageSegment", "Results", "TerrorismInfo", "OcrResults")) {
-                parseResultInfo(resultDetail.getTerroristInfo().getOcrResults(), name, getText());
+                ParserMediaInfoUtils.parseOrcInfo(resultDetail.getTerroristInfo().getOcrResults(), name, getText());
             } else if (in("Response", "JobsDetail", "PageSegment", "Results", "AdsInfo", "OcrResults")) {
-                parseResultInfo(resultDetail.getAdsInfo().getOcrResults(), name, getText());
+                ParserMediaInfoUtils.parseOrcInfo(resultDetail.getAdsInfo().getOcrResults(), name, getText());
             } else if (in("Response", "JobsDetail", "PageSegment", "Results", "PornInfo", "ObjectResults")) {
                 parseResultInfo(resultDetail.getPornInfo().getObjectResults(), name, getText());
             } else if (in("Response", "JobsDetail", "PageSegment", "Results", "PoliticsInfo", "ObjectResults")) {
@@ -6548,19 +6548,6 @@ private void parseResultInfo(List<ObjectResults> obj, String name, String value)
                 }
             }
         }
-
-        private void parseResultInfo(OcrResults obj, String name, String value) {
-            switch (name) {
-                case "Text":
-                    obj.setText(value);
-                    break;
-                case "Keywords":
-                    obj.setKeywords(getText());
-                    break;
-                default:
-                    break;
-            }
-        }
     }
 
     public static class BatchImageAuditingHandler extends AbstractHandler {
diff --git a/src/main/java/com/qcloud/cos/model/ciModel/auditing/AudtingCommonInfo.java b/src/main/java/com/qcloud/cos/model/ciModel/auditing/AudtingCommonInfo.java
@@ -59,8 +59,8 @@ public class AudtingCommonInfo {
     @XStreamAlias("SubLabel")
     private String subLabel;
 
-    @XStreamAlias("OcrResults")
-    private OcrResults ocrResults;
+    @XStreamImplicit(itemFieldName = "OcrResults")
+    private List<OcrResults> ocrResults;
 
     @XStreamAlias("Category")
     private String category;
@@ -142,14 +142,11 @@ public void setCount(String count) {
         this.count = count;
     }
 
-    public OcrResults getOcrResults() {
-        if (ocrResults == null) {
-            ocrResults = new OcrResults();
-        }
+    public List<OcrResults> getOcrResults() {
         return ocrResults;
     }
 
-    public void setOcrResults(OcrResults ocrResults) {
+    public void setOcrResults(List<OcrResults> ocrResults) {
         this.ocrResults = ocrResults;
     }
 
diff --git a/src/main/java/com/qcloud/cos/model/ciModel/auditing/Location.java b/src/main/java/com/qcloud/cos/model/ciModel/auditing/Location.java
@@ -0,0 +1,57 @@
+package com.qcloud.cos.model.ciModel.auditing;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+public class Location {
+
+    @XStreamAlias("X")
+    private String x;
+    @XStreamAlias("Y")
+    private String y;
+    @XStreamAlias("Width")
+    private String width;
+    @XStreamAlias("Height")
+    private String height;
+    @XStreamAlias("Rotate")
+    private String rotate;
+
+    public String getX() {
+        return x;
+    }
+
+    public void setX(String x) {
+        this.x = x;
+    }
+
+    public String getY() {
+        return y;
+    }
+
+    public void setY(String y) {
+        this.y = y;
+    }
+
+    public String getWidth() {
+        return width;
+    }
+
+    public void setWidth(String width) {
+        this.width = width;
+    }
+
+    public String getHeight() {
+        return height;
+    }
+
+    public void setHeight(String height) {
+        this.height = height;
+    }
+
+    public String getRotate() {
+        return rotate;
+    }
+
+    public void setRotate(String rotate) {
+        this.rotate = rotate;
+    }
+}
diff --git a/src/main/java/com/qcloud/cos/model/ciModel/auditing/OcrResults.java b/src/main/java/com/qcloud/cos/model/ciModel/auditing/OcrResults.java
@@ -1,9 +1,14 @@
 package com.qcloud.cos.model.ciModel.auditing;
 
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
 public class OcrResults {
+    @XStreamAlias("Text")
     private String text;
+    @XStreamAlias("Keywords")
     private String keywords;
-
+    @XStreamAlias("Location")
+    private Location location;
     public String getText() {
         return text;
     }
@@ -20,6 +25,14 @@ public void setKeywords(String keywords) {
         this.keywords = keywords;
     }
 
+    public Location getLocation() {
+        return location;
+    }
+
+    public void setLocation(Location location) {
+        this.location = location;
+    }
+
     @Override
     public String toString() {
         final StringBuffer sb = new StringBuffer("OcrResults{");
diff --git a/src/main/java/com/qcloud/cos/model/ciModel/job/MediaJobsRequest.java b/src/main/java/com/qcloud/cos/model/ciModel/job/MediaJobsRequest.java
@@ -99,6 +99,17 @@ public class MediaJobsRequest extends CIServiceRequest implements Serializable {
     @XStreamAlias("CallBackMqConfig")
     private CallBackMqConfig callBackMqConfig;
 
+    @XStreamAlias("QueueType")
+    private String queueType;
+
+    public String getQueueType() {
+        return queueType;
+    }
+
+    public void setQueueType(String queueType) {
+        this.queueType = queueType;
+    }
+
     public String getCallBackType() {
         return callBackType;
     }
diff --git a/src/main/java/com/qcloud/cos/model/ciModel/job/v2/MediaJobsRequestV2.java b/src/main/java/com/qcloud/cos/model/ciModel/job/v2/MediaJobsRequestV2.java
@@ -44,7 +44,7 @@ public class MediaJobsRequestV2 extends CIServiceRequest implements Serializable
      * 查询数量，默认为十个
      */
     @XStreamAlias("Size")
-    private Integer size ;
+    private Integer size;
 
     /**
      * 任务状态
@@ -99,6 +99,16 @@ public class MediaJobsRequestV2 extends CIServiceRequest implements Serializable
     private String callBackType;
     @XStreamAlias("CallBackMqConfig")
     private CallBackMqConfig callBackMqConfig;
+    @XStreamAlias("QueueType")
+    private String queueType;
+
+    public String getQueueType() {
+        return queueType;
+    }
+
+    public void setQueueType(String queueType) {
+        this.queueType = queueType;
+    }
 
     public String getCallBackType() {
         return callBackType;
diff --git a/src/main/java/com/qcloud/cos/model/ciModel/xml/CIMediaXmlFactory.java b/src/main/java/com/qcloud/cos/model/ciModel/xml/CIMediaXmlFactory.java
@@ -595,6 +595,7 @@ private static void addCommonParams(XmlWriter xml, MediaJobsRequest request) {
             addIfNotNull(xml, "CallBack", request.getCallBack());
             addIfNotNull(xml, "CallBackFormat", request.getCallBackFormat());
             addIfNotNull(xml, "CallBackType", request.getCallBackType());
+            addIfNotNull(xml, "QueueType", request.getQueueType());
         }
     }
 
