feat: 优化

feat: 功能优化
2026-03-02 01:32:02 +08:00 · 2026-03-02 01:28:46 +08:00 · 2026-03-01 23:57:19 +08:00
11 changed files with 154 additions and 88 deletions
--- a/frontend/app/web-gold/src/components/VoiceSelector.vue
+++ b/frontend/app/web-gold/src/components/VoiceSelector.vue
@@ -47,7 +47,7 @@

 <script setup>
 import { ref, computed, onMounted, onBeforeUnmount, nextTick, watch } from 'vue'
-import { Empty } from 'ant-design-vue'
+import { Empty, message } from 'ant-design-vue'
 import { SoundOutlined } from '@ant-design/icons-vue'
 import { useVoiceCopyStore } from '@/stores/voiceCopy'
 import { useTTS, TTS_PROVIDERS } from '@/composables/useTTS'
@@ -205,6 +205,14 @@ const initPlayer = (url) => {

  nextTick(() => {
    try {
+      // 检查容器是否存在
+      if (!playerContainer.value) {
+        message.error('播放器容器未就绪')
+        isPlayerInitializing.value = false
+        audioUrl.value = ''
+        return
+      }
+
      player = new APlayer({
        container: playerContainer.value,
        autoplay: true,
@@ -225,6 +233,7 @@ const initPlayer = (url) => {

      player.on('error', (e) => {
        console.error('APlayer 播放错误:', e)
+        message.error('音频播放失败，请重试')
      })

      player.on('canplay', () => {
@@ -232,7 +241,9 @@ const initPlayer = (url) => {
      })
    } catch (e) {
      console.error('APlayer 初始化失败:', e)
+      message.error('播放器初始化失败，请重试')
      isPlayerInitializing.value = false
+      audioUrl.value = ''
    }
  })
 }
--- a/frontend/app/web-gold/src/composables/useUpload.js
+++ b/frontend/app/web-gold/src/composables/useUpload.js
@@ -7,6 +7,7 @@ import { ref, reactive } from 'vue'
 import { message } from 'ant-design-vue'
 import { MaterialService } from '@/api/material'
 import { useUserStore } from '@/stores/user'
+import { OSS_ORIGINAL, isDev } from '@gold/config/api'

 // GB转字节常量
 const GB_TO_BYTES = 1073741824
@@ -106,11 +107,12 @@ export function useUpload() {
        reject(new Error('网络错误，上传失败'))
      })

-      // 发起PUT请求 - 使用代理路径
-      const uploadUrl = presignedData.presignedUrl.replace(
-        'https://muye-ai-chat.oss-cn-hangzhou.aliyuncs.com',
-        '/oss'
-      )
+      // 发起PUT请求
+      // 开发环境：使用 /oss 代理避免CORS问题
+      // 生产环境：直接使用OSS原始域名（需要OSS配置CORS）
+      const uploadUrl = isDev()
+        ? presignedData.presignedUrl.replace(OSS_ORIGINAL, '/oss')
+        : presignedData.presignedUrl
      xhr.open('PUT', uploadUrl)
      if (presignedData.headers && presignedData.headers['Content-Type']) {
        xhr.setRequestHeader('Content-Type', presignedData.headers['Content-Type'])
--- a/frontend/app/web-gold/src/views/material/MaterialListNew.vue
+++ b/frontend/app/web-gold/src/views/material/MaterialListNew.vue
@@ -101,7 +101,12 @@
              <SearchOutlined />
            </template>
          </a-input>
-          <a-button type="primary" class="upload-btn" @click="handleOpenUploadModal">
+          <a-button
+            type="primary"
+            class="upload-btn"
+            :disabled="activeCategory === 'MIX' && (!selectedGroupId || groupList.length === 0)"
+            @click="handleOpenUploadModal"
+          >
            <UploadOutlined />
            上传
          </a-button>
@@ -401,10 +406,16 @@ const handleSaveGroupName = async (group) => {
 const handleDeleteGroup = async (group, event) => {
  event?.stopPropagation?.()

+  // 校验：分组内还有文件时不允许删除
+  if (group.fileCount > 0) {
+    message.warning(`分组「${group.name}」内还有 ${group.fileCount} 个文件，请先删除文件后再删除分组`)
+    return
+  }
+
  const confirmed = await new Promise((resolve) => {
    Modal.confirm({
      title: '删除分组',
-      content: `确定要删除分组「${group.name}」吗？删除后该分组下的所有文件将被移动到默认分组。此操作不可恢复。`,
+      content: `确定要删除分组「${group.name}」吗？此操作不可恢复。`,
      okText: '确认删除',
      cancelText: '取消',
      okType: 'danger',
@@ -657,10 +668,13 @@ const handleBatchDelete = async () => {
 }

 const formatFileSize = (size) => {
-  if (size < 1024) return size + ' B'
-  if (size < 1024 * 1024) return (size / 1024).toFixed(2) + ' KB'
-  if (size < 1024 * 1024 * 1024) return (size / (1024 * 1024)).toFixed(2) + ' MB'
-  return (size / (1024 * 1024 * 1024)).toFixed(2) + ' GB'
+  const units = ['B', 'KB', 'MB', 'GB']
+  let unitIndex = 0
+  while (size >= 1024 && unitIndex < units.length - 1) {
+    size /= 1024
+    unitIndex++
+  }
+  return `${size.toFixed(2)} ${units[unitIndex]}`
 }

 const formatDate = (date) => {
--- a/frontend/app/web-gold/vite.config.ts
+++ b/frontend/app/web-gold/vite.config.ts
@@ -70,7 +70,7 @@ export default defineConfig(({ mode }) => {
          },
        },
        '/oss': {
-          target: 'https://muye-ai-chat.oss-cn-hangzhou.aliyuncs.com',
+          target: 'https://oss.muyetools.cn',
          changeOrigin: true,
          rewrite: (path: string) => path.replace(/^\/oss/, ''),
          headers: {
--- a/frontend/config/api.js
+++ b/frontend/config/api.js
@@ -19,7 +19,7 @@ function getBaseUrl() {
  }
  return ''
 }
-//  
+
 const BASE_URL = getBaseUrl()

 /**
@@ -38,6 +38,21 @@ export const API_BASE = {
  AI_APP: `${BASE_URL}/api/ai`,
 }

+/**
+ * OSS 原始域名（用于上传预签名URL代理）
+ */
+export const OSS_ORIGINAL = 'https://muye-ai-chat.oss-cn-hangzhou.aliyuncs.com'
+
+/**
+ * 判断是否为开发环境
+ */
+export const isDev = () => {
+  if (typeof import.meta !== 'undefined' && import.meta.env) {
+    return import.meta.env.DEV
+  }
+  return false
+}
+
 /**
 * 获取完整的 API 路径
 * @param {string} module - 模块名称 (如 'ADMIN_AI', 'APP_MEMBER')
@@ -46,7 +61,7 @@ export const API_BASE = {
 */
 export function getApiUrl(module, path) {
  const base = API_BASE[module] || API_BASE.APP
-  return `${base}${path.startsWith('/') ? path : '/' + path}`
+  return `${base}${path.startsWith('/') ? '' : '/'}${path}`
 }

 export default API_BASE
--- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/s3/S3FileClient.java
+++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/s3/S3FileClient.java
@@ -116,8 +116,8 @@ public class S3FileClient extends AbstractFileClient<S3FileClientConfig> {

    @Override
    public String presignGetUrl(String url, Integer expirationSeconds) {
-        // 1. 将 url 转换为 path
-        String path = StrUtil.removePrefix(url, config.getDomain() + "/");
+        // 1. 将 url 转换为 path（支持多种URL格式）
+        String path = extractPathFromUrl(url);
        path = HttpUtils.removeUrlQuery(path);
        String decodedPath = URLUtil.decode(path, StandardCharsets.UTF_8);

@@ -138,6 +138,37 @@ public class S3FileClient extends AbstractFileClient<S3FileClientConfig> {
        return signedUrl.toString();
    }

+    /**
+     * 从URL中提取相对路径
+     * 支持多种URL格式：
+     * 1. CDN域名：https://oss.muyetools.cn/path/to/file
+     * 2. OSS原始域名：https://bucket.oss-region.aliyuncs.com/path/to/file
+     * 3. 相对路径：path/to/file
+     */
+    private String extractPathFromUrl(String url) {
+        if (StrUtil.isEmpty(url)) {
+            return url;
+        }
+
+        // 1. 尝试移除配置的域名前缀
+        String path = StrUtil.removePrefix(url, config.getDomain() + "/");
+        if (!StrUtil.equals(url, path)) {
+            return path;
+        }
+
+        // 2. 如果不是以配置域名开头，检查是否是完整URL
+        if (url.contains("://")) {
+            // 提取域名后的路径
+            int pathStart = url.indexOf("/", url.indexOf("://") + 3);
+            if (pathStart > 0) {
+                return url.substring(pathStart + 1);
+            }
+        }
+
+        // 3. 已经是相对路径，直接返回
+        return url;
+    }
+
    /**
     * 基于 bucket + endpoint 构建访问的 Domain 地址
     *
--- 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
@@ -151,9 +151,8 @@ public class BatchProduceAlignment {
        String dateDir = java.time.LocalDate.now().format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
        String outputMediaPath = mixDirectory + "/" + dateDir + "/" + targetFileName + ".mp4";

-        // 使用默认的阿里云OSS endpoint格式
-        String bucketEndpoint = "https://" + properties.getBucket() + ".oss-" + properties.getRegionId() + ".aliyuncs.com";
-        String outputMediaUrl = bucketEndpoint + "/" + outputMediaPath;
+        // ICE写入必须使用OSS原始域名（不能是CDN域名，因为ICE需要写权限）
+        String outputMediaUrl = properties.getOssWriteUrl(outputMediaPath);

        // ICE需要将处理结果写入到该URL，签名URL会导致写入失败
        int width = 720;
@@ -217,39 +216,32 @@ public class BatchProduceAlignment {
     */
    private Map<String, Integer> calculateCropParams(int sourceWidth, int sourceHeight, String cropMode) {
        Map<String, Integer> cropParams = new HashMap<>();
-        double targetRatio = 9.0 / 16.0; // 9:16竖屏比例

+        // 填充模式：不裁剪，保持原尺寸
        if ("fill".equals(cropMode)) {
-            // 填充模式：不裁剪，保持原尺寸
            cropParams.put("X", 0);
            cropParams.put("Y", 0);
            cropParams.put("Width", sourceWidth);
            cropParams.put("Height", sourceHeight);
-        } else if ("smart".equals(cropMode)) {
-            // 智能裁剪功能暂未开放，自动降级为居中裁剪
-            log.info("[裁剪模式] smart模式暂未开放，自动降级为center模式");
-            double cropHeight = sourceHeight;
-            double cropWidth = cropHeight * targetRatio;
-            int cropX = (int) Math.round((sourceWidth - cropWidth) / 2);
-            int cropY = 0;
-
-            cropParams.put("X", cropX);
-            cropParams.put("Y", cropY);
-            cropParams.put("Width", (int) Math.round(cropWidth));
-            cropParams.put("Height", (int) Math.round(cropHeight));
-        } else {
-            // center模式：居中裁剪（默认）
-            double cropHeight = sourceHeight;
-            double cropWidth = cropHeight * targetRatio;
-            int cropX = (int) Math.round((sourceWidth - cropWidth) / 2);
-            int cropY = 0;
-
-            cropParams.put("X", cropX);
-            cropParams.put("Y", cropY);
-            cropParams.put("Width", (int) Math.round(cropWidth));
-            cropParams.put("Height", (int) Math.round(cropHeight));
+            log.debug("[裁剪计算] 源尺寸={}x{}, 模式=fill, 裁剪参数={}", sourceWidth, sourceHeight, cropParams);
+            return cropParams;
        }

+        // center/smart模式：居中裁剪（smart暂未开放，降级为center）
+        if ("smart".equals(cropMode)) {
+            log.info("[裁剪模式] smart模式暂未开放，自动降级为center模式");
+        }
+
+        double targetRatio = 9.0 / 16.0; // 9:16竖屏比例
+        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;
    }
@@ -374,8 +366,8 @@ public class BatchProduceAlignment {
        String dateDir = java.time.LocalDate.now().format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd"));
        String outputMediaPath = mixDirectory + "/" + dateDir + "/" + targetFileName + ".mp4";

-        String bucketEndpoint = "https://" + properties.getBucket() + ".oss-" + properties.getRegionId() + ".aliyuncs.com";
-        String outputMediaUrl = bucketEndpoint + "/" + outputMediaPath;
+        // ICE写入必须使用OSS原始域名（不能是CDN域名，因为ICE需要写权限）
+        String outputMediaUrl = properties.getOssWriteUrl(outputMediaPath);

        int width = 720;
        int height = 1280;
--- 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
@@ -53,4 +53,11 @@ public class IceProperties {
    public boolean isEnabled() {
        return enabled && StrUtil.isNotBlank(accessKeyId) && StrUtil.isNotBlank(accessKeySecret);
    }
+
+    /**
+     * 获取ICE写入用的OSS URL（必须使用原始域名）
+     */
+    public String getOssWriteUrl(String path) {
+        return "https://" + bucket + ".oss-" + regionId + ".aliyuncs.com/" + path;
+    }
 }
--- 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
@@ -551,24 +551,6 @@ public class MixTaskServiceImpl implements MixTaskService {
        }
    }

-    /**
-     * 从OSS URL中提取相对路径
-     */
-    private String extractPathFromUrl(String ossUrl) {
-        if (StrUtil.isEmpty(ossUrl)) {
-            return null;
-        }
-
-        // 查找 ".aliyuncs.com/" 的位置
-        int index = ossUrl.indexOf(".aliyuncs.com/");
-        if (index == -1) {
-            return null;
-        }
-
-        // 提取 "/" 后的路径
-        return ossUrl.substring(index + ".aliyuncs.com/".length());
-    }
-
    /**
     * 将DO分页结果转换为VO分页结果，消除冗余代码
     * 优化点：
@@ -607,6 +589,11 @@ public class MixTaskServiceImpl implements MixTaskService {
        }
    }

+    private static final int MIN_TOTAL_DURATION = 15;
+    private static final int MAX_TOTAL_DURATION = 30;
+    private static final int MIN_SEGMENT_DURATION = 3;
+    private static final int MAX_SEGMENT_DURATION = 5;
+
    /**
     * 验证新格式场景配置
     */
@@ -636,9 +623,7 @@ public class MixTaskServiceImpl implements MixTaskService {
            }

            // 场景时长验证
-            if (scene.getDuration() < 3 || scene.getDuration() > 5) {
-                throw new IllegalArgumentException("场景" + i + "时长需在3-5秒之间，当前：" + scene.getDuration() + "秒");
-            }
+            validateSegmentDuration(scene.getDuration(), "场景" + i);

            // 候选素材验证
            for (int j = 0; j < scene.getCandidates().size(); j++) {
@@ -652,18 +637,11 @@ public class MixTaskServiceImpl implements MixTaskService {
            }
        }

-        // 3. 计算总时长
+        // 3. 计算并校验总时长
        int totalDuration = req.getScenes().stream()
                .mapToInt(MixTaskSaveReqVO.SceneConfig::getDuration)
                .sum();
-
-        // 4. 总时长校验（15s-30s）
-        if (totalDuration < 15) {
-            throw new IllegalArgumentException("总时长不能小于15秒，当前：" + totalDuration + "秒");
-        }
-        if (totalDuration > 30) {
-            throw new IllegalArgumentException("总时长不能超过30秒，当前：" + totalDuration + "秒");
-        }
+        validateTotalDuration(totalDuration);

        log.info("[MixTask][新格式场景校验通过] totalDuration={}s, sceneCount={}", totalDuration, req.getScenes().size());
    }
@@ -682,21 +660,35 @@ public class MixTaskServiceImpl implements MixTaskService {
                .mapToInt(MixTaskSaveReqVO.MaterialItem::getDuration)
                .sum();

-        // 3. 总时长校验（15s-30s）
-        if (totalDuration < 15) {
-            throw new IllegalArgumentException("总时长不能小于15秒，当前：" + totalDuration + "秒");
-        }
-        if (totalDuration > 30) {
-            throw new IllegalArgumentException("总时长不能超过30秒，当前：" + totalDuration + "秒");
-        }
+        // 3. 校验总时长
+        validateTotalDuration(totalDuration);

-        // 4. 单个素材时长校验（3s-5s）
+        // 4. 单个素材时长校验
        for (MixTaskSaveReqVO.MaterialItem item : req.getMaterials()) {
-            if (item.getDuration() < 3 || item.getDuration() > 5) {
-                throw new IllegalArgumentException("单个素材时长需在3-5秒之间，当前：" + item.getDuration() + "秒");
-            }
+            validateSegmentDuration(item.getDuration(), "素材");
        }

        log.info("[MixTask][旧格式素材校验通过] totalDuration={}s, materialCount={}", totalDuration, req.getMaterials().size());
    }
+
+    /**
+     * 校验总时长
+     */
+    private void validateTotalDuration(int totalDuration) {
+        if (totalDuration < MIN_TOTAL_DURATION) {
+            throw new IllegalArgumentException("总时长不能小于" + MIN_TOTAL_DURATION + "秒，当前：" + totalDuration + "秒");
+        }
+        if (totalDuration > MAX_TOTAL_DURATION) {
+            throw new IllegalArgumentException("总时长不能超过" + MAX_TOTAL_DURATION + "秒，当前：" + totalDuration + "秒");
+        }
+    }
+
+    /**
+     * 校验单个片段时长
+     */
+    private void validateSegmentDuration(int duration, String context) {
+        if (duration < MIN_SEGMENT_DURATION || duration > MAX_SEGMENT_DURATION) {
+            throw new IllegalArgumentException(context + "时长需在" + MIN_SEGMENT_DURATION + "-" + MAX_SEGMENT_DURATION + "秒之间，当前：" + duration + "秒");
+        }
+    }
 }
--- a/yudao-server/src/main/resources/application-dev.yaml
+++ b/yudao-server/src/main/resources/application-dev.yaml
@@ -206,6 +206,7 @@ yudao:
    region-id: cn-hangzhou
    bucket: muye-ai-chat
    enabled: true
+    oss-domain: https://oss.muyetools.cn  # CDN加速域名（用于文件访问）
  captcha:
    enable: false # 关闭图片验证码，方便登录等接口的测试
  security:
--- a/yudao-server/src/main/resources/application.yaml
+++ b/yudao-server/src/main/resources/application.yaml
@@ -268,6 +268,7 @@ yudao:
    region-id: cn-hangzhou
    bucket: muye-ai-chat
    enabled: true
+    oss-domain: https://oss.muyetools.cn  # CDN加速域名（用于文件访问）
  dify:
    api-url: http://127.0.0.1:8088  # Dify API 地址，请根据实际情况修改
    timeout: 240  # 请求超时时间（秒）
Author	SHA1	Message	Date
sion123	668515a451	feat: 优化	2026-03-02 01:32:02 +08:00
sion123	ce3d529f80	feat: 优化	2026-03-02 01:28:46 +08:00
sion123	b2e5bb85f4	feat: 功能优化	2026-03-01 23:57:19 +08:00