From ce3d529f8064beb2465c3ce8b685b538430f77a0 Mon Sep 17 00:00:00 2001
From: sion123 <450702724@qq.com>
Date: Mon, 2 Mar 2026 01:28:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web-gold/src/components/VoiceSelector.vue | 13 ++++++-
 .../app/web-gold/src/composables/useUpload.js | 12 ++++---
 .../src/views/material/MaterialListNew.vue    |  8 ++++-
 frontend/app/web-gold/vite.config.ts          |  2 +-
 frontend/config/api.js                        | 15 ++++++++
 .../file/core/client/s3/S3FileClient.java     | 35 +++++++++++++++++--
 .../tik/media/BatchProduceAlignment.java      |  9 +++--
 .../module/tik/mix/config/IceProperties.java  |  7 ++++
 .../tik/mix/service/MixTaskServiceImpl.java   | 18 ----------
 .../src/main/resources/application-dev.yaml   |  1 +
 .../src/main/resources/application.yaml       |  1 +
 11 files changed, 88 insertions(+), 33 deletions(-)

diff --git a/frontend/app/web-gold/src/components/VoiceSelector.vue b/frontend/app/web-gold/src/components/VoiceSelector.vue
index 2aeeaec778..4faec8a771 100644
--- 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 = ''
     }
   })
 }
diff --git a/frontend/app/web-gold/src/composables/useUpload.js b/frontend/app/web-gold/src/composables/useUpload.js
index d06581ce09..8c9dc7bc67 100644
--- 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'])
diff --git a/frontend/app/web-gold/src/views/material/MaterialListNew.vue b/frontend/app/web-gold/src/views/material/MaterialListNew.vue
index aad8a63045..f6cd241e04 100644
--- a/frontend/app/web-gold/src/views/material/MaterialListNew.vue
+++ b/frontend/app/web-gold/src/views/material/MaterialListNew.vue
@@ -406,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',
diff --git a/frontend/app/web-gold/vite.config.ts b/frontend/app/web-gold/vite.config.ts
index 8a5c3541ad..19036b7ee2 100644
--- 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: {
diff --git a/frontend/config/api.js b/frontend/config/api.js
index f91026236b..5164d31f84 100644
--- a/frontend/config/api.js
+++ b/frontend/config/api.js
@@ -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')
diff --git 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
index 00d3511966..3c36413ae5 100644
--- 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 地址
      *
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 75a38533fb..8e08f19f23 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
@@ -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;
@@ -374,8 +373,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;
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 1083b858a6..7731dfabf8 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
@@ -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;
+    }
 }
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 4b56bb551b..e0aa8a1ab8 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
@@ -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分页结果，消除冗余代码
      * 优化点：
diff --git a/yudao-server/src/main/resources/application-dev.yaml b/yudao-server/src/main/resources/application-dev.yaml
index 9dabe762b5..3124b85d09 100644
--- 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:
diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml
index f2466165b1..f6b6065aa5 100644
--- 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  # 请求超时时间（秒）