From ae3349d2ff53767b5bc9cb30e1bf7e15f9e814ee Mon Sep 17 00:00:00 2001
From: lrj <owen.stl@gmail.com>
Date: 星期五, 03 十月 2025 20:45:44 +0800
Subject: [PATCH] 清理测试代码和调试文件
---
web/src/api/media.js | 169 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 123 insertions(+), 46 deletions(-)
diff --git a/web/src/api/media.js b/web/src/api/media.js
index 1934b37..ac6a772 100644
--- a/web/src/api/media.js
+++ b/web/src/api/media.js
@@ -1,5 +1,7 @@
// 濯掍綋鏌ヨ API
-const GRAPHQL_ENDPOINT = 'http://localhost:8080/api/graphql';
+import { graphqlRequest, API_CONFIG } from '../config/api.ts';
+
+const GRAPHQL_ENDPOINT = API_CONFIG.GRAPHQL_ENDPOINT;
const MEDIAS_BY_TARGET_QUERY = `
query MediasByTarget($targetType: Int!, $targetId: ID!) {
@@ -36,9 +38,17 @@
`;
export const getMediasByTarget = async (targetType, targetId) => {
+ // 鑾峰彇JWT token
+ const { getToken } = await import('@/utils/auth');
+ const token = getToken();
+ const headers = { 'Content-Type': 'application/json' };
+ if (token) {
+ headers['Authorization'] = `Bearer ${token}`;
+ }
+
const res = await fetch(GRAPHQL_ENDPOINT, {
method: 'POST',
- headers: { 'Content-Type': 'application/json' },
+ headers: headers,
body: JSON.stringify({
query: MEDIAS_BY_TARGET_QUERY,
variables: { targetType, targetId }
@@ -52,9 +62,17 @@
};
export const saveMedia = async (input) => {
+ // 鑾峰彇JWT token
+ const { getToken } = await import('@/utils/auth');
+ const token = getToken();
+ const headers = { 'Content-Type': 'application/json' };
+ if (token) {
+ headers['Authorization'] = `Bearer ${token}`;
+ }
+
const res = await fetch(GRAPHQL_ENDPOINT, {
method: 'POST',
- headers: { 'Content-Type': 'application/json' },
+ headers: headers,
body: JSON.stringify({
query: SAVE_MEDIA_MUTATION,
variables: { input }
@@ -68,48 +86,84 @@
};
export const deleteMedia = async (id) => {
- console.log('=== deleteMedia API璋冪敤 ===');
- console.log('瑕佸垹闄ょ殑濯掍綋ID:', id);
- console.log('GraphQL鏌ヨ:', DELETE_MEDIA_MUTATION);
-
- const res = await fetch(GRAPHQL_ENDPOINT, {
- method: 'POST',
- headers: { 'Content-Type': 'application/json' },
- body: JSON.stringify({
- query: DELETE_MEDIA_MUTATION,
- variables: { id: id.toString() }
- })
- });
- const result = await res.json();
- console.log('GraphQL鍝嶅簲:', result);
- console.log('deleteMedia缁撴灉:', result.data?.deleteMedia);
-
- if (result.errors) {
- console.error('GraphQL閿欒:', result.errors);
- throw new Error(result.errors[0].message);
+ try {
+ const variables = { id: parseInt(id) };
+
+ // 鍙戦�丟raphQL璇锋眰
+ const result = await graphqlRequest(DELETE_MEDIA_MUTATION, variables);
+
+ // 妫�鏌ヨ繑鍥炵粨鏋�
+ const deleteResult = result.data?.deleteMedia;
+
+ return deleteResult;
+ } catch (error) {
+ throw new Error(`鍒犻櫎濯掍綋澶辫触: ${error.message}`);
}
-
- const deleteResult = result.data.deleteMedia;
- console.log('杩斿洖鐨勫垹闄ょ粨鏋�:', deleteResult, '绫诲瀷:', typeof deleteResult);
- return deleteResult;
};
-// 涓婁紶鏂囦欢鍒版湇鍔″櫒
-export const uploadFile = async (file) => {
+// 涓婁紶鏂囦欢鍒版湇鍔″櫒锛堝甫閲嶈瘯鏈哄埗锛�
+export const uploadFile = async (file, maxRetries = 3) => {
const formData = new FormData();
formData.append('file', file);
- const response = await fetch('http://localhost:8080/api/upload/image', {
- method: 'POST',
- body: formData
- });
-
- const result = await response.json();
- if (!result.success) {
- throw new Error(result.error || '涓婁紶澶辫触');
+ // 鑾峰彇JWT token
+ const { getToken } = await import('@/utils/auth');
+ const token = getToken();
+ const headers = {};
+ if (token) {
+ headers['Authorization'] = `Bearer ${token}`;
}
- return result;
+ let lastError;
+
+ for (let attempt = 1; attempt <= maxRetries; attempt++) {
+ try {
+ const response = await fetch('http://localhost:8080/api/upload/image', {
+ method: 'POST',
+ headers: headers,
+ body: formData,
+ // 娣诲姞瓒呮椂璁剧疆
+ signal: AbortSignal.timeout(30000) // 30绉掕秴鏃�
+ });
+
+ if (!response.ok) {
+ throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+ }
+
+ const result = await response.json();
+ if (!result.success) {
+ throw new Error(result.error || '涓婁紶澶辫触');
+ }
+
+ return result;
+ } catch (error) {
+ lastError = error;
+ console.warn(`鏂囦欢涓婁紶绗�${attempt}娆″皾璇曞け璐�:`, error.message);
+
+ // 濡傛灉鏄渶鍚庝竴娆″皾璇曪紝鎴栬�呮槸闈炵綉缁滈敊璇紝鐩存帴鎶涘嚭
+ if (attempt === maxRetries ||
+ (!error.message.includes('Failed to fetch') &&
+ !error.message.includes('ERR_CONNECTION_RESET') &&
+ !error.message.includes('ERR_NETWORK'))) {
+ break;
+ }
+
+ // 绛夊緟涓�娈垫椂闂村悗閲嶈瘯锛堟寚鏁伴��閬匡級
+ const delay = Math.min(1000 * Math.pow(2, attempt - 1), 5000);
+ await new Promise(resolve => setTimeout(resolve, delay));
+ }
+ }
+
+ // 鎻愪緵鏇村弸濂界殑閿欒淇℃伅
+ if (lastError.message.includes('Failed to fetch') ||
+ lastError.message.includes('ERR_CONNECTION_RESET') ||
+ lastError.message.includes('ERR_NETWORK')) {
+ throw new Error('缃戠粶杩炴帴澶辫触锛岃妫�鏌ョ綉缁滆繛鎺ユ垨绋嶅悗閲嶈瘯');
+ } else if (lastError.message.includes('timeout')) {
+ throw new Error('涓婁紶瓒呮椂锛岃妫�鏌ョ綉缁滆繛鎺ユ垨绋嶅悗閲嶈瘯');
+ } else {
+ throw new Error(`涓婁紶澶辫触: ${lastError.message}`);
+ }
};
// 涓婁紶瑙嗛鏂囦欢骞惰嚜鍔ㄧ敓鎴愮缉鐣ュ浘
@@ -117,17 +171,11 @@
const { extractVideoFrame, generateThumbnailFileName } = await import('@/utils/video.js');
try {
- console.log('寮�濮嬪鐞嗚棰戞枃浠�:', videoFile.name);
-
- // 1. 涓婁紶鍘熻棰戞枃浠�
- console.log('涓婁紶瑙嗛鏂囦欢...');
+ // 1. 涓婁紶瑙嗛鏂囦欢
const videoUploadResult = await uploadFile(videoFile);
- console.log('瑙嗛涓婁紶鎴愬姛:', videoUploadResult);
// 2. 鎻愬彇瑙嗛绗竴甯�
- console.log('鎻愬彇瑙嗛绗竴甯�...');
const thumbnailBlob = await extractVideoFrame(videoFile);
- console.log('瑙嗛甯ф彁鍙栨垚鍔燂紝澶у皬:', thumbnailBlob.size);
// 3. 鍒涘缓缂╃暐鍥炬枃浠跺璞�
const thumbnailFileName = generateThumbnailFileName(videoFile.name);
@@ -136,9 +184,7 @@
});
// 4. 涓婁紶缂╃暐鍥�
- console.log('涓婁紶缂╃暐鍥�...');
const thumbnailUploadResult = await uploadFile(thumbnailFile);
- console.log('缂╃暐鍥句笂浼犳垚鍔�:', thumbnailUploadResult);
// 5. 杩斿洖鍖呭惈瑙嗛鍜岀缉鐣ュ浘淇℃伅鐨勭粨鏋�
return {
@@ -151,4 +197,35 @@
console.error('瑙嗛澶勭悊澶辫触:', error);
throw new Error(`瑙嗛澶勭悊澶辫触: ${error.message}`);
}
+};
+
+// 鏂扮増淇濆瓨濯掍綋锛圫aveMediaV2锛夛細浣跨敤瀛楃涓� targetType 涓� MediaSaveInput
+// 娉ㄦ剰锛氱洰鍓嶅悗绔粎鏀寔 targetType: "player"锛堝鍛樺ご鍍� -> 6锛変笌 "activity_player"锛堟姤鍚嶈祫鏂� -> 5锛夈��
+// 瀛楁鍛藉悕涓庢棫鐗堜笉鍚岋細fileName 鏇夸唬 name锛涘彲閫� thumbPath锛沵ediaType: 1鍥剧墖銆�2瑙嗛銆�3闊抽銆�4鏂囨。銆�
+const SAVE_MEDIA_V2_MUTATION = `
+ mutation SaveMediaV2($input: MediaSaveInput!) {
+ saveMediaV2(input: $input) {
+ success
+ message
+ mediaId
+ }
+ }
+`;
+
+// 缁熶竴鐨� V2 淇濆瓨鎺ュ彛锛堣繑鍥� { success, message, mediaId }锛夛紝绀轰緥锛�
+// await saveMediaV2({ targetType: 'player', targetId: 123, path: 'avatar/xxx.jpg', fileName: 'avatar.jpg', fileExt: 'jpg', fileSize: 2048, mediaType: 1 })
+export const saveMediaV2 = async (input) => {
+ const res = await fetch(GRAPHQL_ENDPOINT, {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({
+ query: SAVE_MEDIA_V2_MUTATION,
+ variables: { input }
+ })
+ });
+ const result = await res.json();
+ if (result.errors) {
+ throw new Error(result.errors[0].message);
+ }
+ return result.data.saveMediaV2;
};
\ No newline at end of file
--
Gitblit v1.8.0