Merge pull request #789 from Hunlongyu/dependabot/npm_and_yarn/ejs-3.1.8

Bump ejs from 3.1.3 to 3.1.8

docs/index.html

@@ -70,7 +70,7 @@
             <h1>ZY Player 资源播放器</h1>
             <h2>跨平台视频资源播放器, 简洁免费无广告.</h2>
             <a href="https://github.com/Hunlongyu/ZY-Player/releases" target="_blank" class="download-btn"><i class="icofont-home"></i></i> Github 下载</a>
-            <a href="https://www.lanzous.com/b04s6a3re" target="_blank" class="download-btn"><i class="icofont-cloud"></i> 蓝奏下载 (密码:95px)</a>
+            <a href="https://hly.lanzoul.com/b04s6a3re" target="_blank" class="download-btn"><i class="icofont-cloud"></i> 蓝奏下载 (密码:95px)</a>
           </div>
         </div>
         <div class="col-lg-6 d-lg-flex flex-lg-column align-items-stretch order-1 order-lg-2 hero-img" data-aos="fade-up">

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zy",
-  "version": "2.8.6",
+  "version": "2.8.8",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -19,7 +19,7 @@
   "dependencies": {
     "@electron/remote": "^2.0.8",
     "axios": "^0.21.2",
-    "bootstrap-vue": "^2.21.2",
+    "bootstrap-vue": "^2.22.0",
     "cheerio": "1.0.0-rc.6",
     "core-js": "^3.10.2",
     "dexie": "^3.2.2",
@@ -52,11 +52,11 @@
     "xgplayer-mp4": "^1.2.2"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.11",
+    "@vue/cli-plugin-babel": "~5.0.8",
-    "@vue/cli-plugin-vuex": "~4.5.11",
+    "@vue/cli-plugin-vuex": "~5.0.8",
-    "@vue/cli-service": "~4.5.11",
+    "@vue/cli-service": "~5.0.8",
     "babel-plugin-component": "^1.1.1",
-    "electron": "^16.0.0",
+    "electron": "^13.0.0",
     "electron-devtools-installer": "^3.1.1",
     "sass": "^1.30.0",
     "sass-loader": "^10.1.0",

src/App.vue

@@ -10,7 +10,6 @@
       <Setting v-show="view === 'Setting'" />
       <IPTV v-show="view === 'IPTV'" />
       <EditSites v-if="view === 'EditSites'"/>
-      <Recommendation v-show="view === 'Recommendation'" />
     </div>
     <transition name="slide">
       <Detail v-if="detail.show"/>

src/background.js

@@ -25,6 +25,7 @@ function createWindow () {
     resizable: true,
     webPreferences: {
       webSecurity: false,
+      enableRemoteModule: true,
       nodeIntegration: true,
       contextIsolation: false,
       allowRunningInsecureContent: false
@@ -67,7 +68,7 @@ function createWindow () {
 if (process.platform === 'darwin') {
   app.dock.show()
 }
-if (process.platform === 'Linux') {
+if (process.platform === 'linux') {
   app.disableHardwareAcceleration()
   app.commandLine.appendSwitch('--no-sandbox') // linux 关闭沙盒模式
 }

src/components/Aside.vue

@@ -14,13 +14,13 @@
         </g>
       </svg>
     </span>
-    <span :class="[view === 'Recommendation' ? 'active ': ''] + 'zy-svg'" @click="changeView('Recommendation')">
+    <!-- <span :class="[view === 'Recommendation' ? 'active ': ''] + 'zy-svg'" @click="changeView('Recommendation')">
       <svg role="img" xmlns="http://www.w3.org/2000/svg" width="48px" height="48px" viewBox="0 0 24 24" aria-labelledby="thumbUpIconTitle" stroke="#2329D6" stroke-width="1" stroke-linecap="square" stroke-linejoin="miter" fill="none" color="#2329D6">
       <title id="thumbUpIconTitle">影视推荐</title>
       <path d="M8,8.73984815 C8,8.26242561 8.17078432,7.80075162 8.4814868,7.43826541 L13.2723931,1.84887469 C13.7000127,1.34998522 14.4122932,1.20614658 15,1.5 C15.5737957,1.78689785 15.849314,2.45205792 15.6464466,3.06066017 L14,8 L18.6035746,8 C18.7235578,8 18.8432976,8.01079693 18.9613454,8.03226018 C20.0480981,8.22985158 20.7689058,9.27101818 20.5713144,10.3577709 L19.2985871,17.3577709 C19.1256814,18.3087523 18.2974196,19 17.3308473,19 L10,19 C8.8954305,19 8,18.1045695 8,17 L8,8.73984815 Z"/>
       <path d="M4,18 L4,9"/>
       </svg>
-    </span>
+    </span> -->
     <span :class="[view === 'Play' ? 'active ': ''] + 'zy-svg'" @click="changeView('Play')">
       <svg role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-labelledby="playIconTitle">
         <title id="playIconTitle">播放</title>

src/components/EditSites.vue

@@ -497,8 +497,7 @@ export default {
     resetSitesEvent () {
       let url = this.setting.sitesDataURL
       if (!url) {
-        // 如果没有设置源站文件链接,使用默认的gitee源
+        url = 'https://raw.iqiq.io/Hunlongyu/ZY-Player-Resources/main/Sites/20220713.json'
-        url = 'https://gitee.com/cuiocean/ZY-Player-Resources/raw/main/Sites/Sites.json'
       }
       zy.getDefaultSites(url).then(res => {
         if (res.length > 0) {

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.$message.warning('检测到视频源未能正常加载, 即将重置源.')
-          this.type = {}
+          this.getDefaultSites()
-          this.list = []
         } else {
           this.sites = res.filter(item => item.isActive)
           if (this.site === undefined || !this.sites.some(x => x.key === this.site.key)) {

src/components/Setting.vue

@@ -329,9 +329,14 @@ export default {
         if (!this.setting.sitesDataURL) this.resetDefaultSitesDataURL()
       })
     },
-    getDefaultSites () {
+    async getDefaultSites () {
-      zy.getDefaultSites(this.setting.sitesDataURL).then(res => {
+      const s = await setting.find()
-        if (res.length > 0) {
+      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()

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)
   }
 }

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='
   })
 })

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": [
     "电影",
     "电影片",

src/lib/site/tools.js

@@ -563,8 +563,7 @@ const zy = {
       })
     })
   },
-  getDefaultSites () {
+  getDefaultSites (url) {
-    const url = 'https://gitee.com/cuiocean/ZY-Player-Resources/raw/main/Sites/Sites.json'
     return new Promise((resolve, reject) => {
       axios.get(url).then(res => {
         resolve(res.data)