Просмотр исходного кода

Merge remote-tracking branch 'origin/test' into test

syh 5 лет назад
Родитель
Сommit
dd857f9f6d

+ 6 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouMaterialUploadServiceImpl.java

@@ -1,10 +1,7 @@
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 
 import cn.com.ctop.common.module.enums.MaterialEnum;
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
-import cn.com.ctop.common.module.utils.LoadFileUtil;
-import cn.com.ctop.common.module.utils.PropertiesUtils;
+import cn.com.ctop.common.module.utils.*;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideoGet;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageGetService;
@@ -28,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -82,7 +80,10 @@ public class KuaiShouMaterialUploadServiceImpl implements IKuaiShouMaterialUploa
                         videoGet.setPhotoId(photoId);
                         videoGet.setSignature(signature);
                         videoGet.setStatDate(DateUtils.getNowDate());
-                        videoGet.setCoverUrl(url + "?x-oss-process=video/snapshot,t_00000,m_fast");
+                        String videoUrl = URLDecoder.decode(url).replace("https://media-1301855440.cos.ap-chongqing.myqcloud.com/", "");
+                        String loadImage = "cutFrame/" + signature + "/zero.jpg";
+                        String coverUrl = CloudVideoProcessUtil.videoCutPictureHandle(videoUrl, loadImage);
+                        videoGet.setCoverUrl(coverUrl);
                         kuaiShouVideoGetService.saveOrUpdate(videoGet);
                         returnJson.put("success", true);
                         returnJson.put("photoId", photoId);