Explorar o código

Merge remote-tracking branch 'origin/master'

syh %!s(int64=5) %!d(string=hai) anos
pai
achega
7cdd0a34c1

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialCutFrameServiceImpl.java

@@ -97,7 +97,7 @@ public class MaterialCutFrameServiceImpl extends ServiceImpl<MaterialCutFrameMap
             JSONObject input = new JSONObject();
             input.put("Location", ossLocation);
             input.put("Bucket", ossBucket);
-
+         //   https://ctop-media.oss-cn-beijing.aliyuncs.com/video/2020-06-03/bp%E8%95%89%E4%B8%8B%E7%9B%B4%E6%92%AD2-1591188835505.mp4
             String replaceUrl = url.replace("https://ctop-media.oss-cn-beijing.aliyuncs.com/", "");
             input.put("Object", replaceUrl);
 

+ 3 - 2
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -336,7 +336,8 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                 log.info("获取素材基本信息,code:{}", materialInfo.getCode());
                 if (!Check.isNull(materialInfo)) {
                     long l = System.currentTimeMillis();
-                    String url = materialInfo.getUrl().replace(replaceOldValue, replaceValue);
+                    String videoUrl = materialInfo.getUrl();
+                    String url = videoUrl.replace(replaceOldValue, replaceValue);
                     log.info("replaceUrl:{}", url);
                     String localUrl = null;
                     it.sauronsoftware.jave.MultimediaInfo m = null;
@@ -383,7 +384,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                             public void run() {
                                 try {
                                     log.info("开始抽帧");
-                                    materialCutFrameService.getCutFrame(url, materialInfo.getCode(), secondDuration, height, width);
+                                    materialCutFrameService.getCutFrame(videoUrl, materialInfo.getCode(), secondDuration, height, width);
                                 } catch (Exception e) {
                                     e.printStackTrace();
                                 }