diff --git a/src/App.vue b/src/App.vue index f7ebd91..dc7f56a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -10,7 +10,6 @@ - diff --git a/src/components/Aside.vue b/src/components/Aside.vue index 6bd54b7..6143739 100644 --- a/src/components/Aside.vue +++ b/src/components/Aside.vue @@ -14,13 +14,13 @@ - + 播放 diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue index 6f10f97..60ca8d8 100644 --- a/src/components/EditSites.vue +++ b/src/components/EditSites.vue @@ -497,8 +497,7 @@ export default { resetSitesEvent () { let url = this.setting.sitesDataURL if (!url) { - // 如果没有设置源站文件链接,使用默认的gitee源 - url = 'https://gitee.com/cuiocean/ZY-Player-Resources/raw/main/Sites/Sites.json' + url = 'https://raw.iqiq.io/Hunlongyu/ZY-Player-Resources/main/Sites/20220713.json' } zy.getDefaultSites(url).then(res => { if (res.length > 0) { diff --git a/src/components/Film.vue b/src/components/Film.vue index 59822cb..8993c63 100644 --- a/src/components/Film.vue +++ b/src/components/Film.vue @@ -872,12 +872,34 @@ export default { this.showFind = false } }, + async getDefaultSites () { + const s = await setting.find() + zy.getDefaultSites(s.sitesDataURL).then(res => { + if (res && typeof res === 'string') { + const json = JSON.parse(res) + sites.clear().then(sites.bulkAdd(json)) + } + if (res && typeof res === 'object') { + sites.clear().then(sites.bulkAdd(res)) + } + sites.all().then(res => { + if (res) { + this.sites = res.filter(item => item.isActive) + if (this.site === undefined || !this.sites.some(x => x.key === this.site.key)) { + this.site = this.sites[0] + this.selectedSiteName = this.sites[0].name + } + } + }) + }).catch(error => { + this.$message.error('获取云端源站失败. ' + error) + }) + }, getAllSites () { sites.all().then(res => { if (res.length <= 0) { - this.site = {} - this.type = {} - this.list = [] + this.$message.warning('检测到视频源未能正常加载, 即将重置源.') + this.getDefaultSites() } else { this.sites = res.filter(item => item.isActive) if (this.site === undefined || !this.sites.some(x => x.key === this.site.key)) { diff --git a/src/components/Setting.vue b/src/components/Setting.vue index c693e52..bc9a27c 100644 --- a/src/components/Setting.vue +++ b/src/components/Setting.vue @@ -329,9 +329,14 @@ export default { if (!this.setting.sitesDataURL) this.resetDefaultSitesDataURL() }) }, - getDefaultSites () { - zy.getDefaultSites(this.setting.sitesDataURL).then(res => { - if (res.length > 0) { + async getDefaultSites () { + const s = await setting.find() + zy.getDefaultSites(s.sitesDataURL).then(res => { + if (res && typeof res === 'string') { + const json = JSON.parse(res) + sites.clear().then(sites.bulkAdd(json)) + } + if (res && typeof res === 'object') { sites.clear().then(sites.bulkAdd(res)) } }).catch(error => { @@ -590,7 +595,7 @@ export default { } }, created () { - this.getSites() + // this.getSites() this.getSetting() this.getShortcut() this.checkUpdate() diff --git a/src/components/register.js b/src/components/register.js index f6194ab..981282c 100644 --- a/src/components/register.js +++ b/src/components/register.js @@ -10,7 +10,7 @@ import Share from './Share' import History from './History' import EditSites from './EditSites' import IPTV from './IPTV' -import Recommendation from './Recommendation' +// import Recommendation from './Recommendation' export default { registerComponents () { Vue.component('Aside', Aside) @@ -24,6 +24,6 @@ export default { Vue.component('History', History) Vue.component('EditSites', EditSites) Vue.component('IPTV', IPTV) - Vue.component('Recommendation', Recommendation) + // Vue.component('Recommendation', Recommendation) } } diff --git a/src/lib/dexie/dexie.js b/src/lib/dexie/dexie.js index cb97154..e5b852b 100644 --- a/src/lib/dexie/dexie.js +++ b/src/lib/dexie/dexie.js @@ -96,7 +96,7 @@ db.version(11).stores({ 'windowPositionAndSize, pauseWhenMinimize, sitesDataURL, defaultParseURL' }).upgrade(trans => { trans.setting.toCollection().modify(setting => { - setting.sitesDataURL = 'https://gitee.com/cuiocean/ZY-Player-Resources/raw/main/Sites/Sites.json' + setting.sitesDataURL = 'https://raw.iqiq.io/Hunlongyu/ZY-Player-Resources/main/Sites/20220713.json' setting.defaultParseURL = 'https://jx.bpba.cc/?v=' }) }) diff --git a/src/lib/dexie/iniData/iniSetting.json b/src/lib/dexie/iniData/iniSetting.json index ad12525..557b799 100644 --- a/src/lib/dexie/iniData/iniSetting.json +++ b/src/lib/dexie/iniData/iniSetting.json @@ -24,7 +24,7 @@ "autocleanWhenIptvCheck": false, "autoChangeSourceWhenIptvStalling": true, "shortcutModified": false, - "sitesDataURL": "https://gitee.com/cuiocean/ZY-Player-Resources/raw/main/Sites/Sites.json", + "sitesDataURL": "https://raw.iqiq.io/Hunlongyu/ZY-Player-Resources/main/Sites/20220713.json", "rootClassFilter": [ "电影", "电影片", diff --git a/src/lib/site/tools.js b/src/lib/site/tools.js index 66d0f25..ae19ef0 100644 --- a/src/lib/site/tools.js +++ b/src/lib/site/tools.js @@ -563,8 +563,7 @@ const zy = { }) }) }, - getDefaultSites () { - const url = 'https://gitee.com/cuiocean/ZY-Player-Resources/raw/main/Sites/Sites.json' + getDefaultSites (url) { return new Promise((resolve, reject) => { axios.get(url).then(res => { resolve(res.data)