From 0c576c65a891d4433a0f2a0dd3398d38d5cff9a2 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Thu, 30 Apr 2020 17:03:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E4=B9=89=E6=AD=8C=E8=AF=8D=E5=AD=97?= =?UTF-8?q?=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/utils/music/kw/lyric.js | 3 ++- src/renderer/utils/music/tx/lyric.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/renderer/utils/music/kw/lyric.js b/src/renderer/utils/music/kw/lyric.js index 1bc244fc..a5753ebe 100644 --- a/src/renderer/utils/music/kw/lyric.js +++ b/src/renderer/utils/music/kw/lyric.js @@ -1,4 +1,5 @@ import { httpFetch } from '../../request' +import { decodeName } from '../../index' export default { formatTime(time) { @@ -12,7 +13,7 @@ export default { getLyric(songId) { const requestObj = httpFetch(`http://m.kuwo.cn/newh5/singles/songinfoandlrc?musicId=${songId}`) requestObj.promise = requestObj.promise.then(({ body }) => { - return this.transformLrc(body.data) + return decodeName(this.transformLrc(body.data)) }) return requestObj }, diff --git a/src/renderer/utils/music/tx/lyric.js b/src/renderer/utils/music/tx/lyric.js index f4d384ae..d86233ba 100644 --- a/src/renderer/utils/music/tx/lyric.js +++ b/src/renderer/utils/music/tx/lyric.js @@ -1,5 +1,5 @@ import { httpFetch } from '../../request' -import { b64DecodeUnicode } from '../../index' +import { b64DecodeUnicode, decodeName } from '../../index' export default { regexps: { @@ -12,7 +12,7 @@ export default { }, }) requestObj.promise = requestObj.promise.then(({ body }) => { - return b64DecodeUnicode(body.replace(this.regexps.matchLrc, '$1')) + return decodeName(b64DecodeUnicode(body.replace(this.regexps.matchLrc, '$1'))) }) return requestObj },