Merge branch 'fixbug/snapshot' into 'master'

fixbug:[none]视频转码报错

See merge request rays/pcloud-common-parent!119

pcloud-common/src/main/java/com/pcloud/common/utils/aliyun/OssUtils.java

@@ -39,6 +39,7 @@ import com.pcloud.common.exceptions.FileException;
 import com.pcloud.common.utils.DateUtils;
 import com.pcloud.common.utils.FileUtils;
 import com.pcloud.common.utils.ImageUtils;
+import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.LocalDateUtils;
 import com.pcloud.common.utils.UUIDUitl;
 import com.pcloud.common.utils.encode.ZSEncode;
@@ -1127,10 +1128,17 @@ public class OssUtils {
             QueryThumbTaskResponse queryThumbTaskResponse = mpcClient.queryThumbnailsTask(queryThumbTaskRequest);
             // 返回消息
             System.out.println(new Gson().toJson(queryThumbTaskResponse));
+            if (ListUtils.isEmpty(queryThumbTaskResponse.getTaskArray())){
+                return outObject;
+            }
             if (QueryThumbTaskResponse.ThumbTask.StatusEnum.SUCCEEDED.equals(queryThumbTaskResponse.getTaskArray().get(0).getStatus())) {
                 QueryThumbTaskResponse.ThumbTask thumbTask = queryThumbTaskResponse.getTaskArray().get(0);
-                String picName = thumbTask.getThumbnailInfo().get(0).getPicName();
-                outObject = URLDecoder.decode(thumbTask.getOutput().getObject()+"/"+picName, "UTF-8");
+                if (!ListUtils.isEmpty(thumbTask.getThumbnailInfo())){
+                    String picName = thumbTask.getThumbnailInfo().get(0).getPicName();
+                    outObject = URLDecoder.decode(thumbTask.getOutput().getObject()+"/"+picName, "UTF-8");
+                }else {
+                    outObject = "https://oss.5rs.me/oss/uploadfe/jpg/d026cd83cf2ff55e3f4b4493a6919712.jpg";//默认图
+                }
             }
         } catch (Exception e) {
             LOGGER.error("【aliOSS】查询视频截图任务失败：" + e.getMessage(), e);