From b5ec2bf3d055d5092fd6ff8dc387d9de06891d9e Mon Sep 17 00:00:00 2001 From: sion123 <450702724@qq.com> Date: Wed, 4 Mar 2026 03:29:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/tik/media/BatchProduceAlignment.java | 9 ++++++--- .../yudao/module/tik/mix/config/IceProperties.java | 12 ++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/media/BatchProduceAlignment.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/media/BatchProduceAlignment.java index 200d23ec52..14abc1f9e3 100644 --- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/media/BatchProduceAlignment.java +++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/media/BatchProduceAlignment.java @@ -167,8 +167,9 @@ public class BatchProduceAlignment { String jobId = response.getBody().getJobId(); log.info("[ICE][任务提交成功][jobId={}, outputMediaUrl={}]", jobId, outputMediaUrl); - // 返回原始URL,签名URL在用户下载时生成 - return jobId + " : " + outputMediaUrl; + // 返回CDN URL用于存储到数据库(ICE写入用OSS原始URL,存储用CDN URL) + String cdnUrl = properties.getCdnStorageUrl(outputMediaPath); + return jobId + " : " + cdnUrl; } /** @@ -381,7 +382,9 @@ public class BatchProduceAlignment { String jobId = response.getBody().getJobId(); 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; } } \ No newline at end of file diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/mix/config/IceProperties.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/mix/config/IceProperties.java index bba718af7f..caef3c0360 100644 --- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/mix/config/IceProperties.java +++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/mix/config/IceProperties.java @@ -87,4 +87,16 @@ public class IceProperties { String ossDomain = "https://" + bucket + ".oss-" + regionId + ".aliyuncs.com"; 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); + } }