From 972760175247ac7c514628cce7a60947586fe397 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Tue, 3 Sep 2019 17:02:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=8E=A5=E5=8F=A3=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/components/core/Player.vue | 4 ++-- src/renderer/utils/music/bd/api-test.js | 12 ++++++------ src/renderer/utils/music/kg/api-test.js | 12 ++++++------ src/renderer/utils/music/kw/api-test.js | 4 ++-- src/renderer/utils/music/wy/api-test.js | 12 ++++++------ 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue index 300d3ff9..6ce8070b 100644 --- a/src/renderer/components/core/Player.vue +++ b/src/renderer/components/core/Player.vue @@ -414,8 +414,8 @@ export default { this.lyric.lrc.setLyric(this.musicInfo.lrc) if (this.isPlay && (this.musicInfo.url || this.listId == 'download')) this.lyric.lrc.play(this.audio.currentTime * 1000) }) - .catch(err => { - this.status = err.message + .catch(() => { + this.status = '歌词获取失败' }) }, handleRemoveMusic() { diff --git a/src/renderer/utils/music/bd/api-test.js b/src/renderer/utils/music/bd/api-test.js index c9c1be9d..07c6e559 100644 --- a/src/renderer/utils/music/bd/api-test.js +++ b/src/renderer/utils/music/bd/api-test.js @@ -4,35 +4,35 @@ import { headers, timeout } from '../options' const api_test = { getMusicUrl(songInfo, type) { - const requestObj = httpFatch(`http://45.32.53.128:3000/baidu/url?id=${songInfo.songmid}&quality=${type.replace(/k$/, '')}`, { + const requestObj = httpFatch(`http://test.tempmusic.tk/url/bd/${songInfo.songmid}/${type}`, { method: 'get', timeout, headers, }) requestObj.promise = requestObj.promise.then(({ body }) => { - return body.code === 200 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(requestMsg.fail)) + return body.code === 0 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(requestMsg.fail)) }) return requestObj }, getPic(songInfo, size = '500') { - const requestObj = httpFatch(`http://45.32.53.128:3000/baidu/pic?id=${songInfo.songmid}&imageSize=${size}`, { + const requestObj = httpFatch(`http://test.tempmusic.tk/pic/bd/${songInfo.songmid}/${size}`, { method: 'get', timeout, headers, }) requestObj.promise = requestObj.promise.then(({ body }) => { - return body.code === 200 ? Promise.resolve(body.data) : Promise.reject(new Error(requestMsg.fail)) + return body.code === 0 ? Promise.resolve(body.data) : Promise.reject(new Error(requestMsg.fail)) }) return requestObj }, getLyric(songInfo) { - const requestObj = httpFatch(`http://45.32.53.128:3000/baidu/lrc?id=${songInfo.songmid}`, { + const requestObj = httpFatch(`http://test.tempmusic.tk/lrc/bd/${songInfo.songmid}`, { method: 'get', timeout, headers, }) requestObj.promise = requestObj.promise.then(({ body }) => { - return body ? Promise.resolve(body) : Promise.reject(new Error(requestMsg.fail)) + return body.code === 0 ? Promise.resolve(body.data) : Promise.reject(new Error(requestMsg.fail)) }) return requestObj }, diff --git a/src/renderer/utils/music/kg/api-test.js b/src/renderer/utils/music/kg/api-test.js index d4b6e55c..910836f6 100644 --- a/src/renderer/utils/music/kg/api-test.js +++ b/src/renderer/utils/music/kg/api-test.js @@ -4,35 +4,35 @@ import { headers, timeout } from '../options' const api_test = { getMusicUrl(songInfo, type) { - const requestObj = httpFatch(`http://45.32.53.128:3000/kugou/url?id=${songInfo._types[type].hash}&quality=${type.replace(/k$/, '')}`, { + const requestObj = httpFatch(`http://test.tempmusic.tk/url/kg/${songInfo._types[type].hash}/${type}`, { method: 'get', timeout, headers, }) requestObj.promise = requestObj.promise.then(({ body }) => { - return body.code === 200 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(requestMsg.fail)) + return body.code === 0 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(requestMsg.fail)) }) return requestObj }, getPic(songInfo) { - const requestObj = httpFatch(`http://45.32.53.128:3000/kugou/pic?id=${songInfo.hash}`, { + const requestObj = httpFatch(`http://test.tempmusic.tk/pic/kg/${songInfo.hash}`, { method: 'get', timeout, headers, }) requestObj.promise = requestObj.promise.then(({ body }) => { - return body.code === 200 ? Promise.resolve(body.data) : Promise.reject(new Error(requestMsg.fail)) + return body.code === 0 ? Promise.resolve(body.data) : Promise.reject(new Error(requestMsg.fail)) }) return requestObj }, getLyric(songInfo) { - const requestObj = httpFatch(`http://45.32.53.128:3000/kugou/lrc?id=${songInfo.hash}`, { + const requestObj = httpFatch(`http://test.tempmusic.tk/lrc/kg/${songInfo.hash}`, { method: 'get', timeout, headers, }) requestObj.promise = requestObj.promise.then(({ body }) => { - return body ? Promise.resolve(body) : Promise.reject(new Error(requestMsg.fail)) + return body.code === 0 ? Promise.resolve(body.data) : Promise.reject(new Error(requestMsg.fail)) }) return requestObj }, diff --git a/src/renderer/utils/music/kw/api-test.js b/src/renderer/utils/music/kw/api-test.js index a49ec881..a9538be4 100644 --- a/src/renderer/utils/music/kw/api-test.js +++ b/src/renderer/utils/music/kw/api-test.js @@ -15,13 +15,13 @@ const api_test = { // return requestObj // }, getMusicUrl(songInfo, type) { - const requestObj = httpFatch(`http://45.32.53.128:3000/kuwo/url?id=${songInfo.songmid}&quality=${type.replace(/k$/, '')}`, { + const requestObj = httpFatch(`http://test.tempmusic.tk/url/kw/${songInfo.songmid}/${type}`, { method: 'get', timeout, headers, }) requestObj.promise = requestObj.promise.then(({ body }) => { - return body.code === 200 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(requestMsg.fail)) + return body.code === 0 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(requestMsg.fail)) }) return requestObj }, diff --git a/src/renderer/utils/music/wy/api-test.js b/src/renderer/utils/music/wy/api-test.js index 967f895a..9e36c129 100644 --- a/src/renderer/utils/music/wy/api-test.js +++ b/src/renderer/utils/music/wy/api-test.js @@ -4,35 +4,35 @@ import { headers, timeout } from '../options' const api_test = { getMusicUrl(songInfo, type) { - const requestObj = httpFatch(`http://45.32.53.128:3000/netease/url?id=${songInfo.songmid}&quality=${type.replace(/k$/, '')}`, { + const requestObj = httpFatch(`http://test.tempmusic.tk/url/wy/${songInfo.songmid}/${type}`, { method: 'get', timeout, headers, }) requestObj.promise = requestObj.promise.then(({ body }) => { - return body.code === 200 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(requestMsg.fail)) + return body.code === 0 ? Promise.resolve({ type, url: body.data }) : Promise.reject(new Error(requestMsg.fail)) }) return requestObj }, getPic(songInfo) { - const requestObj = httpFatch(`http://45.32.53.128:3000/netease/pic?id=${songInfo.songmid}`, { + const requestObj = httpFatch(`http://test.tempmusic.tk/pic/wy/${songInfo.songmid}`, { method: 'get', timeout, headers, }) requestObj.promise = requestObj.promise.then(({ body }) => { - return body.code === 200 ? Promise.resolve(body.data) : Promise.reject(new Error(requestMsg.fail)) + return body.code === 0 ? Promise.resolve(body.data) : Promise.reject(new Error(requestMsg.fail)) }) return requestObj }, getLyric(songInfo) { - const requestObj = httpFatch(`http://45.32.53.128:3000/netease/lrc?id=${songInfo.songmid}`, { + const requestObj = httpFatch(`http://test.tempmusic.tk/lrc/wy/${songInfo.songmid}`, { method: 'get', timeout, headers, }) requestObj.promise = requestObj.promise.then(({ body }) => { - return body ? Promise.resolve(body) : Promise.reject(new Error(requestMsg.fail)) + return body.code === 0 ? Promise.resolve(body.data) : Promise.reject(new Error(requestMsg.fail)) }) return requestObj },