优化
This commit is contained in:
@@ -167,8 +167,9 @@ public class BatchProduceAlignment {
|
|||||||
|
|
||||||
String jobId = response.getBody().getJobId();
|
String jobId = response.getBody().getJobId();
|
||||||
log.info("[ICE][任务提交成功][jobId={}, outputMediaUrl={}]", jobId, outputMediaUrl);
|
log.info("[ICE][任务提交成功][jobId={}, outputMediaUrl={}]", jobId, outputMediaUrl);
|
||||||
// 返回原始URL,签名URL在用户下载时生成
|
// 返回CDN URL用于存储到数据库(ICE写入用OSS原始URL,存储用CDN URL)
|
||||||
return jobId + " : " + outputMediaUrl;
|
String cdnUrl = properties.getCdnStorageUrl(outputMediaPath);
|
||||||
|
return jobId + " : " + cdnUrl;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -381,7 +382,9 @@ public class BatchProduceAlignment {
|
|||||||
|
|
||||||
String jobId = response.getBody().getJobId();
|
String jobId = response.getBody().getJobId();
|
||||||
log.info("[ICE][任务提交成功][videoIndex={}, jobId={}, outputUrl={}]", videoIndex, jobId, outputMediaUrl);
|
log.info("[ICE][任务提交成功][videoIndex={}, jobId={}, outputUrl={}]", videoIndex, jobId, outputMediaUrl);
|
||||||
return jobId + " : " + outputMediaUrl;
|
// 返回CDN URL用于存储到数据库(ICE写入用OSS原始URL,存储用CDN URL)
|
||||||
|
String cdnUrl = properties.getCdnStorageUrl(outputMediaPath);
|
||||||
|
return jobId + " : " + cdnUrl;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -87,4 +87,16 @@ public class IceProperties {
|
|||||||
String ossDomain = "https://" + bucket + ".oss-" + regionId + ".aliyuncs.com";
|
String ossDomain = "https://" + bucket + ".oss-" + regionId + ".aliyuncs.com";
|
||||||
return url.replace(cdnDomain, ossDomain);
|
return url.replace(cdnDomain, ossDomain);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取用于存储的CDN URL
|
||||||
|
*/
|
||||||
|
public String getCdnStorageUrl(String path) {
|
||||||
|
String cdnDomain = fileApi.getMasterFileDomain();
|
||||||
|
if (StrUtil.isNotBlank(cdnDomain)) {
|
||||||
|
return cdnDomain + "/" + path;
|
||||||
|
}
|
||||||
|
// 没有配置CDN,回退到OSS原始域名
|
||||||
|
return getOssWriteUrl(path);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user