From 31f765277a91c0fb2388c93bc11023021d85d6d2 Mon Sep 17 00:00:00 2001 From: Megghy Date: Tue, 18 Mar 2025 22:58:19 +0800 Subject: [PATCH] fix hubs url --- src/data/constants.ts | 62 ++++++++++++------- src/store/useRTC.ts | 2 - .../SimpleSongListTemplate.vue | 3 +- 3 files changed, 42 insertions(+), 25 deletions(-) diff --git a/src/data/constants.ts b/src/data/constants.ts index f7130af..05debe2 100644 --- a/src/data/constants.ts +++ b/src/data/constants.ts @@ -2,7 +2,9 @@ import DefaultIndexTemplateVue from '@/views/view/indexTemplate/DefaultIndexTemp import { defineAsyncComponent, ref } from 'vue' const debugAPI = - import.meta.env.VITE_API == 'dev' ? import.meta.env.VITE_DEBUG_DEV_API : import.meta.env.VITE_DEBUG_RELEASE_API + import.meta.env.VITE_API == 'dev' + ? import.meta.env.VITE_DEBUG_DEV_API + : import.meta.env.VITE_DEBUG_RELEASE_API const releseAPI = `https://vtsuru.suki.club/` const failoverAPI = `https://failover-api.vtsuru.suki.club/` @@ -15,14 +17,21 @@ export const THINGS_URL = FILE_BASE_URL + '/things/' export const apiFail = ref(false) export const BASE_URL = { - toString: () => (process.env.NODE_ENV === 'development' ? debugAPI : apiFail.value ? failoverAPI : releseAPI), + toString: () => + process.env.NODE_ENV === 'development' + ? debugAPI + : apiFail.value + ? failoverAPI + : releseAPI } export const BASE_API_URL = BASE_URL.toString() + 'api/' export const FETCH_API = 'https://fetch.vtsuru.live/' -export const BASE_HUB_URL = { - toString: () => - (process.env.NODE_ENV === 'development' ? debugAPI : apiFail.value ? failoverAPI : releseAPI) + 'hub/', -} +export const BASE_HUB_URL = + (process.env.NODE_ENV === 'development' + ? debugAPI + : apiFail.value + ? failoverAPI + : releseAPI) + 'hub/' export const TURNSTILE_KEY = '0x4AAAAAAAETUSAKbds019h0' @@ -32,49 +41,60 @@ export const USER_API_URL = BASE_API_URL + 'user/' export const ACCOUNT_API_URL = BASE_API_URL + 'account/' export const BILI_API_URL = BASE_API_URL + 'bili/' export const SONG_API_URL = BASE_API_URL + 'song-list/' -export const NOTIFACTION_API_URL = BASE_API_URL + 'notification/' +export const NOTIFACTION_API_URL = BASE_API_URL + 'notification/' export const QUESTION_API_URL = BASE_API_URL + 'qa/' export const LOTTERY_API_URL = BASE_API_URL + 'lottery/' export const HISTORY_API_URL = BASE_API_URL + 'history/' export const SCHEDULE_API_URL = BASE_API_URL + 'schedule/' export const VIDEO_COLLECT_API_URL = BASE_API_URL + 'video-collect/' export const OPEN_LIVE_API_URL = BASE_API_URL + 'open-live/' -export const SONG_REQUEST_API_URL = BASE_API_URL + 'live-request/' +export const SONG_REQUEST_API_URL = BASE_API_URL + 'live-request/' export const QUEUE_API_URL = BASE_API_URL + 'queue/' -export const EVENT_API_URL = BASE_API_URL + 'event/' -export const LIVE_API_URL = BASE_API_URL + 'live/' -export const FEEDBACK_API_URL = BASE_API_URL + 'feedback/' -export const MUSIC_REQUEST_API_URL = BASE_API_URL + 'music-request/' +export const EVENT_API_URL = BASE_API_URL + 'event/' +export const LIVE_API_URL = BASE_API_URL + 'live/' +export const FEEDBACK_API_URL = BASE_API_URL + 'feedback/' +export const MUSIC_REQUEST_API_URL = BASE_API_URL + 'music-request/' export const VTSURU_API_URL = BASE_API_URL + 'vtsuru/' export const POINT_API_URL = BASE_API_URL + 'point/' export const BILI_AUTH_API_URL = BASE_API_URL + 'bili-auth/' export const FORUM_API_URL = BASE_API_URL + 'forum/' -export const USER_INDEX_API_URL = BASE_API_URL + 'user-index/' +export const USER_INDEX_API_URL = BASE_API_URL + 'user-index/' export const ScheduleTemplateMap = { '': { name: '默认', - compoent: defineAsyncComponent(() => import('@/views/view/scheduleTemplate/DefaultScheduleTemplate.vue')), + compoent: defineAsyncComponent( + () => import('@/views/view/scheduleTemplate/DefaultScheduleTemplate.vue') + ) }, pinky: { name: '粉粉', - compoent: defineAsyncComponent(() => import('@/views/view/scheduleTemplate/PinkySchedule.vue')), - }, + compoent: defineAsyncComponent( + () => import('@/views/view/scheduleTemplate/PinkySchedule.vue') + ) + } } as { [key: string]: { name: string; compoent: any } } export const SongListTemplateMap = { '': { name: '默认', - compoent: defineAsyncComponent(() => import('@/views/view/songListTemplate/DefaultSongListTemplate.vue')), + compoent: defineAsyncComponent( + () => import('@/views/view/songListTemplate/DefaultSongListTemplate.vue') + ) }, simple: { name: '简单', - compoent: defineAsyncComponent(() => import('@/views/view/songListTemplate/SimpleSongListTemplate.vue')), + compoent: defineAsyncComponent( + () => import('@/views/view/songListTemplate/SimpleSongListTemplate.vue') + ) }, traditional: { name: '传统', - compoent: defineAsyncComponent(() => import('@/views/view/songListTemplate/TraditionalSongListTemplate.vue')), - }, + compoent: defineAsyncComponent( + () => + import('@/views/view/songListTemplate/TraditionalSongListTemplate.vue') + ) + } } as { [key: string]: { name: string; compoent: any } } export const IndexTemplateMap = { - '': { name: '默认', compoent: DefaultIndexTemplateVue }, + '': { name: '默认', compoent: DefaultIndexTemplateVue } } as { [key: string]: { name: string; compoent: any } } diff --git a/src/store/useRTC.ts b/src/store/useRTC.ts index 50fe0cc..c86b6de 100644 --- a/src/store/useRTC.ts +++ b/src/store/useRTC.ts @@ -4,9 +4,7 @@ import { MasterRTCClient, SlaveRTCClient } from '@/data/RTCClient' -import { Router24Regular } from '@vicons/fluent' import { useStorage } from '@vueuse/core' -import { nonFunctionArgSeparator } from 'html2canvas/dist/types/css/syntax/parser' import { acceptHMRUpdate, defineStore } from 'pinia' import { ref } from 'vue' import { useRoute } from 'vue-router' diff --git a/src/views/view/songListTemplate/SimpleSongListTemplate.vue b/src/views/view/songListTemplate/SimpleSongListTemplate.vue index addab2d..781231a 100644 --- a/src/views/view/songListTemplate/SimpleSongListTemplate.vue +++ b/src/views/view/songListTemplate/SimpleSongListTemplate.vue @@ -127,8 +127,7 @@ function loadMore() { }) " placeholder="选择歌手" clearable /> - +