Browse Source

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 years ago
parent
commit
39b425552d

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/WatermarkVideoJob.java

@@ -35,7 +35,7 @@ public class WatermarkVideoJob implements Job {
                 MpsUtils mpsUtils = new MpsUtils();
                 QueryJobListResponse.Job job = mpsUtils.getJobStatus(videoWatermarkTask.getJobId());
                 if (job.getState().equals("TranscodeSuccess")){
-                    String url = "https://ctop-media.oss-cn-beijing.aliyuncs.com/watermark/"+DateUtils.getNowDate("yyyy-MM-dd")+"/"+job.getOutput().getOutputFile().getObject();
+                    String url = "https://ctop-media.oss-cn-beijing.aliyuncs.com/"+job.getOutput().getOutputFile().getObject();
 
                     try {
                         String localPath = LoadFileUtil.downLoadFromUrl(url, PropertiesUtils.getValue("kuaishou_config", "video_sava_path"));