From 9ab564951cc132d00558398d6db00115da6d70e5 Mon Sep 17 00:00:00 2001 From: Folltoshe Date: Thu, 6 Jul 2023 17:41:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dkw=E6=90=9C=E7=B4=A2=E8=81=94?= =?UTF-8?q?=E6=83=B3=E8=AF=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/utils/musicSdk/kw/tipSearch.js | 26 +++++++++++---------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/renderer/utils/musicSdk/kw/tipSearch.js b/src/renderer/utils/musicSdk/kw/tipSearch.js index 007478c6..338b6008 100644 --- a/src/renderer/utils/musicSdk/kw/tipSearch.js +++ b/src/renderer/utils/musicSdk/kw/tipSearch.js @@ -1,5 +1,6 @@ -import { decodeName } from '../../index' -import { tokenRequest } from './util' +// import { decodeName } from '../../index' +// import { tokenRequest } from './util' +import { httpFetch } from '../../request' export default { regExps: { @@ -7,24 +8,25 @@ export default { }, requestObj: null, async tipSearchBySong(str) { + // 报错403,加了referer还是有问题(直接换一个 + // this.requestObj = await tokenRequest(`http://www.kuwo.cn/api/www/search/searchKey?key=${encodeURIComponent(str)}`) + this.cancelTipSearch() - this.requestObj = await tokenRequest(`http://www.kuwo.cn/api/www/search/searchKey?key=${encodeURIComponent(str)}`) - return this.requestObj.promise.then(({ body }) => { - // console.log(body) - if (body.code !== 200) return Promise.reject(new Error('请求失败')) - return body + this.requestObj = httpFetch(`https://tips.kuwo.cn/t.s?corp=kuwo&newver=3&p2p=1¬race=0&c=mbox&w=${encodeURIComponent(str)}&encoding=utf8&rformat=json`, { + Referer: 'http://www.kuwo.cn/', + }) + return this.requestObj.promise.then(({ body, statusCode }) => { + if (statusCode != 200 || !body.WORDITEMS) return Promise.reject(new Error('请求失败')) + return body.WORDITEMS }) }, handleResult(rawData) { - return rawData.map(info => { - let matchResult = info.match(this.regExps.relWord) - return matchResult ? decodeName(matchResult[1]) : '' - }) + return rawData.map(item => item.RELWORD) }, cancelTipSearch() { if (this.requestObj && this.requestObj.cancelHttp) this.requestObj.cancelHttp() }, async search(str) { - return this.tipSearchBySong(str).then(result => this.handleResult(result.data)) + return this.tipSearchBySong(str).then(result => this.handleResult(result)) }, }