From a3a26e0deb9ba8bea0ba36e1754b8484a1171cb6 Mon Sep 17 00:00:00 2001
From: haiyangcui <cuiocean@gmail.com>
Date: Tue, 23 Feb 2021 22:51:40 +0100
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E7=A7=BBgetDefaultSites=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E5=88=B0tools.js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/EditSites.vue | 13 +++++--------
 src/components/Setting.vue   | 10 +++-------
 src/lib/site/tools.js        |  8 ++++++++
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/components/EditSites.vue b/src/components/EditSites.vue
index 6cf4ad7..5270e94 100644
--- a/src/components/EditSites.vue
+++ b/src/components/EditSites.vue
@@ -414,14 +414,11 @@ export default {
         // 如果没有设置源站文件链接,使用默认的gitee源
         url = 'https://gitee.com/cuiocean/ZY-Player-Resources/raw/main/Sites/Sites.json'
       }
-      const axios = require('axios')
-      axios.get(url).then(res => {
-        if (res.status === 200) {
-          if (res.data.length > 0) {
-            sites.clear().then(sites.bulkAdd(res.data))
-            this.$message.success('重置源成功')
-            this.getSites()
-          }
+      zy.getDefaultSites(url).then(res => {
+        if (res.length > 0) {
+          sites.clear().then(sites.bulkAdd(res))
+          this.$message.success('重置源成功')
+          this.getSites()
         }
       }).catch(error => {
         this.$message.error('导入云端源站失败. ' + error)
diff --git a/src/components/Setting.vue b/src/components/Setting.vue
index c7c379a..f7f186d 100644
--- a/src/components/Setting.vue
+++ b/src/components/Setting.vue
@@ -332,13 +332,9 @@ export default {
       })
     },
     getDefaultSites () {
-      this.getDefaultdeSitesDataURL()
-      const axios = require('axios')
-      axios.get(this.setting.sitesDataURL).then(res => {
-        if (res.status === 200) {
-          if (res.data.length > 0) {
-            sites.clear().then(sites.bulkAdd(res.data))
-          }
+      zy.getDefaultSites(this.setting.sitesDataURL).then(res => {
+        if (res.length > 0) {
+          sites.clear().then(sites.bulkAdd(res))
         }
       }).catch(error => {
         this.$message.error('获取云端源站失败. ' + error)
diff --git a/src/lib/site/tools.js b/src/lib/site/tools.js
index da360d9..e4bad14 100644
--- a/src/lib/site/tools.js
+++ b/src/lib/site/tools.js
@@ -500,6 +500,14 @@ const zy = {
       }).catch(err => { reject(err) })
     })
   },
+  getDefaultSites () {
+    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)
+      }).catch(err => { reject(err) })
+    })
+  },
   proxy () {
     return new Promise((resolve, reject) => {
       setting.find().then(db => {