cropParams = new HashMap<>();
+
+ if ("fill".equals(cropMode)) {
+ cropParams.put("X", 0);
+ cropParams.put("Y", 0);
+ cropParams.put("Width", sourceWidth);
+ cropParams.put("Height", sourceHeight);
+ return cropParams;
+ }
+
+ if ("smart".equals(cropMode)) {
+ log.info("[裁剪模式] smart 模式暂未开放，降级为 center");
+ }
+
+ double targetRatio = 9.0 / 16.0;
+ double cropHeight = sourceHeight;
+ double cropWidth = cropHeight * targetRatio;
+ int cropX = (int) Math.round((sourceWidth - cropWidth) / 2);
+
+ cropParams.put("X", cropX);
+ cropParams.put("Y", 0);
+ cropParams.put("Width", (int) Math.round(cropWidth));
+ cropParams.put("Height", (int) Math.round(cropHeight));
+
+ log.debug("[裁剪计算] 源尺寸={}x{}, 模式={}, 参数={}", sourceWidth, sourceHeight, cropMode, cropParams);
+ return cropParams;
+ }
+}
diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/mix/client/IceClient.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/mix/client/IceClient.java
index fa9cafe7ca..abce411e1b 100644
--- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/mix/client/IceClient.java
+++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/mix/client/IceClient.java
@@ -1,114 +1,161 @@
package cn.iocoder.yudao.module.tik.mix.client;
-import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.module.tik.mix.config.IceProperties;
import com.aliyun.ice20201109.Client;
import com.aliyun.ice20201109.models.*;
import com.aliyun.teaopenapi.models.Config;
-import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
-import java.util.concurrent.TimeUnit;
-
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0;
import static cn.iocoder.yudao.module.tik.enums.ErrorCodeConstants.VOICE_TTS_FAILED;
/**
- * 阿里云 ICE 客户端
+ * 阿里云 ICE 客户端 —— 项目中 ICE SDK 的唯一封装入口
+ *
+ * 设计原则：
+ *
+ * - 单一入口：所有 ICE API 调用必须经过此类，禁止各业务类自行创建 {@link Client}
+ * - 统一超时：通过 {@link IceProperties} 集中管理连接/读取超时
+ * - 懒加载 + 线程安全：DCL 保证全局唯一 Client 实例
+ * - 统一异常转换：ICE SDK 异常统一转为 {@link cn.iocoder.yudao.framework.common.exception.ServiceException}
+ *
+ *
+ * @author 芋道源码
*/
@Slf4j
@Component
-@RequiredArgsConstructor
public class IceClient {
private final IceProperties properties;
- private volatile Client iceClient;
+ private volatile Client client;
- /**
- * 获取 ICE 客户端（懒加载，线程安全）
- */
- public Client getClient() {
- if (iceClient == null) {
+ public IceClient(IceProperties properties) {
+ this.properties = properties;
+ }
+
+ /* ════════════════════════════════════════════════════════════════════════════
+ * Client 生命周期管理
+ * ════════════════════════════════════════════════════════════════════════════ */
+
+ private Client getClient() {
+ if (client == null) {
synchronized (this) {
- if (iceClient == null) {
+ if (client == null) {
if (!properties.isEnabled()) {
throw exception0(VOICE_TTS_FAILED.getCode(), "未配置 ICE AccessKey");
}
- iceClient = createClient();
+ client = createClient();
}
}
}
- return iceClient;
+ return client;
}
- /**
- * 创建 ICE 客户端
- */
private Client createClient() {
try {
- log.info("[ICE][开始初始化客户端][regionId={}, bucket={}]",
- properties.getRegionId(), properties.getBucket());
+ log.info("[ICE][初始化] regionId={}, bucket={}, connectTimeout={}, readTimeout={}",
+ properties.getRegionId(), properties.getBucket(),
+ properties.getConnectTimeout(), properties.getReadTimeout());
Config config = new Config();
config.accessKeyId = properties.getAccessKeyId();
config.accessKeySecret = properties.getAccessKeySecret();
config.endpoint = "ice." + properties.getRegionId() + ".aliyuncs.com";
config.regionId = properties.getRegionId();
+ config.connectTimeout = (int) properties.getConnectTimeout().toMillis();
+ config.readTimeout = (int) properties.getReadTimeout().toMillis();
- Client client = new Client(config);
-
- log.info("[ICE][客户端初始化成功]");
- return client;
+ Client c = new Client(config);
+ log.info("[ICE][初始化成功]");
+ return c;
} catch (Exception e) {
- log.error("[ICE][客户端初始化失败]", e);
+ log.error("[ICE][初始化失败]", e);
throw exception0(VOICE_TTS_FAILED.getCode(), "ICE 客户端初始化失败: " + e.getMessage());
}
}
+ /* ════════════════════════════════════════════════════════════════════════════
+ * 业务 API
+ * ════════════════════════════════════════════════════════════════════════════ */
+
/**
- * 提交媒体制作任务
+ * 提交媒体制作任务（底层方法，接受已构建好的 Request）
+ *
+ * 供 {@link cn.iocoder.yudao.module.tik.media.BatchProduceAlignment} 等
+ * 需要自定义 Timeline 构建逻辑的上层组件调用。
+ *
+ * @param request 已填充 timeline 和 outputMediaConfig 的请求对象
+ * @return ICE 任务 ID（jobId）
*/
- public String submitMediaProducingJob(String timeline, String outputMediaConfig) {
+ public String submitJob(SubmitMediaProducingJobRequest request) {
try {
- Client client = getClient();
- SubmitMediaProducingJobRequest request = new SubmitMediaProducingJobRequest();
- request.setTimeline(timeline);
- request.setOutputMediaConfig(outputMediaConfig);
-
- SubmitMediaProducingJobResponse response = client.submitMediaProducingJob(request);
+ SubmitMediaProducingJobResponse response = getClient().submitMediaProducingJob(request);
String jobId = response.getBody().getJobId();
-
- log.info("[ICE][提交任务成功][jobId={}]", jobId);
+ log.info("[ICE][提交成功] jobId={}", jobId);
return jobId;
-
} catch (Exception e) {
- log.error("[ICE][提交任务失败]", e);
+ log.error("[ICE][提交失败]", e);
throw exception0(VOICE_TTS_FAILED.getCode(), "ICE 提交任务失败: " + e.getMessage());
}
}
/**
- * 查询媒体制作任务状态
+ * 提交媒体制作任务（便捷方法，接受字符串参数）
+ *
+ * @param timeline 时间线 JSON
+ * @param outputMediaConfig 输出媒体配置 JSON
+ * @return ICE 任务 ID（jobId）
*/
- public String getMediaProducingJobStatus(String jobId) {
+ public String submitJob(String timeline, String outputMediaConfig) {
+ SubmitMediaProducingJobRequest request = new SubmitMediaProducingJobRequest();
+ request.setTimeline(timeline);
+ request.setOutputMediaConfig(outputMediaConfig);
+ return submitJob(request);
+ }
+
+ /**
+ * 查询媒体制作任务状态
+ *
+ * @param jobId ICE 任务 ID
+ * @return 任务状态：Success / Failed / Running / Pending 等
+ */
+ public String getJobStatus(String jobId) {
try {
- Client client = getClient();
GetMediaProducingJobRequest request = new GetMediaProducingJobRequest();
request.setJobId(jobId);
- GetMediaProducingJobResponse response = client.getMediaProducingJob(request);
+ GetMediaProducingJobResponse response = getClient().getMediaProducingJob(request);
String status = response.getBody().getMediaProducingJob().getStatus();
- log.debug("[ICE][查询任务状态][jobId={}, status={}]", jobId, status);
+ log.debug("[ICE][状态查询] jobId={}, status={}", jobId, status);
return status;
} catch (Exception e) {
- log.error("[ICE][查询任务状态失败][jobId={}]", jobId, e);
+ log.error("[ICE][状态查询失败] jobId={}", jobId, e);
throw exception0(VOICE_TTS_FAILED.getCode(), "ICE 查询任务状态失败: " + e.getMessage());
}
}
+
+ /* ════════════════════════════════════════════════════════════════════════════
+ * 历史兼容方法（逐步废弃）
+ * ════════════════════════════════════════════════════════════════════════════ */
+
+ /**
+ * @deprecated 请使用 {@link #submitJob(String, String)}
+ */
+ @Deprecated
+ public String submitMediaProducingJob(String timeline, String outputMediaConfig) {
+ return submitJob(timeline, outputMediaConfig);
+ }
+
+ /**
+ * @deprecated 请使用 {@link #getJobStatus(String)}
+ */
+ @Deprecated
+ public String getMediaProducingJobStatus(String jobId) {
+ return getJobStatus(jobId);
+ }
}
diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/mix/service/MixTaskServiceImpl.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/mix/service/MixTaskServiceImpl.java
index 69d2fe08c1..ff5a0cf61f 100644
--- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/mix/service/MixTaskServiceImpl.java
+++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/mix/service/MixTaskServiceImpl.java
@@ -384,7 +384,7 @@ public class MixTaskServiceImpl implements MixTaskService {
for (String jobId : jobIds) {
try {
- String status = iceClient.getMediaProducingJobStatus(jobId);
+ String status = iceClient.getJobStatus(jobId);
log.debug("[MixTask][jobId状态] taskId={}, jobId={}, status={}", taskId, jobId, status);
if ("Success".equalsIgnoreCase(status)) {
successJobIds.add(jobId);