浏览代码

Merge branch 'test' of https://gitee.com/hcst/adsp-boot into test

# Conflicts:
#	module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java
xuzuoyun 5 年之前
父节点
当前提交
1f69f3f85e

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

@@ -54,6 +54,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         MaterialInfo materialInfo = this.getById(materialId);
         MaterialInfo materialInfo = this.getById(materialId);
         MpsUtils mpsUtils = new MpsUtils();
         MpsUtils mpsUtils = new MpsUtils();
         String path = materialInfo.getUrl().substring(materialInfo.getUrl().indexOf("/",10)+1,materialInfo.getUrl().length());
         String path = materialInfo.getUrl().substring(materialInfo.getUrl().indexOf("/",10)+1,materialInfo.getUrl().length());
+        System.out.println(path);
         String jobId = mpsUtils.videoWaterMark(path,videoWatermarkTemplate.getTemplatePath(),videoWatermarkTemplate.getTemplateId(),videoWatermarkTemplate.getHeight());
         String jobId = mpsUtils.videoWaterMark(path,videoWatermarkTemplate.getTemplatePath(),videoWatermarkTemplate.getTemplateId(),videoWatermarkTemplate.getHeight());
         QueryJobListResponse.Job job = mpsUtils.getJobStatus(jobId);
         QueryJobListResponse.Job job = mpsUtils.getJobStatus(jobId);
         VideoWatermarkTask videoWatermarkTask = new VideoWatermarkTask();
         VideoWatermarkTask videoWatermarkTask = new VideoWatermarkTask();