From c48a31fd637146d16d1613f197c51419e6d848c4 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Thu, 20 Mar 2025 09:22:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20kw=20=E6=AD=8C=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=89=93=E5=BC=80=E5=A4=B1=E8=B4=A5=E5=92=8C?= =?UTF-8?q?=20kg=20=E7=83=AD=E9=97=A8=E8=AF=84=E8=AE=BA=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 +-- publish/changeLog.md | 2 ++ src/renderer/utils/musicSdk/kg/comment.js | 16 +++++++++------- src/renderer/utils/musicSdk/kw/songList.js | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 03593c63..6ffda482 100644 --- a/package.json +++ b/package.json @@ -218,6 +218,5 @@ "node-gyp-build": "latest", "micromatch": "latest", "http-cache-semantics": "latest" - }, - "packageManager": "pnpm@9.15.5+sha512.845196026aab1cc3f098a0474b64dfbab2afe7a1b4e91dd86895d8e4aa32a7a6d03049e2d0ad770bbe4de023a7122fb68c1a1d6e0d033c7076085f9d5d4800d4" + } } diff --git a/publish/changeLog.md b/publish/changeLog.md index ae1b901c..cc15cddf 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -10,6 +10,8 @@ - 修复 tx 歌单搜索名字、描述出现乱码的问题(#2250) - 修复本地 FLAC 文件内嵌歌词无法读取的问题 - 修复潜在播放暂停的问题 +- 修复 kw 歌单详情出现打开失败的问题(#2317) +- 修复 kg 热门评论无法获取的问题 ### 优化 diff --git a/src/renderer/utils/musicSdk/kg/comment.js b/src/renderer/utils/musicSdk/kg/comment.js index f9e3e519..9c1f6df7 100644 --- a/src/renderer/utils/musicSdk/kg/comment.js +++ b/src/renderer/utils/musicSdk/kg/comment.js @@ -1,7 +1,7 @@ import { httpFetch } from '../../request' import { decodeName, dateFormat2 } from '../../index' import { signatureParams } from './util' -import { getMusicInfoRaw } from './musicInfo' +// import { getMusicInfoRaw } from './musicInfo' export default { _requestObj: null, @@ -9,11 +9,12 @@ export default { async getComment({ hash }, page = 1, limit = 20) { if (this._requestObj) this._requestObj.cancelHttp() - const res_id = (await getMusicInfoRaw(hash)).classification?.[0]?.res_id - if (!res_id) throw new Error('获取评论失败') + // const res_id = (await getMusicInfoRaw(hash)).classification?.[0]?.res_id + // if (!res_id) throw new Error('获取评论失败') let timestamp = Date.now() - const params = `appid=1005&clienttime=${timestamp}&clienttoken=0&clientver=11409&code=fc4be23b4e972707f36b8a828a93ba8a&dfid=0&extdata=${hash}&kugouid=0&mid=16249512204336365674023395779019&mixsongid=${res_id}&p=${page}&pagesize=${limit}&uuid=0&ver=10` + const params = `dfid=0&mid=16249512204336365674023395779019&clienttime=${timestamp}&uuid=0&extdata=${hash}&appid=1005&code=fc4be23b4e972707f36b8a828a93ba8a&schash=${hash}&clientver=11409&p=${page}&clienttoken=&pagesize=${limit}&ver=10&kugouid=0` + // const params = `appid=1005&clienttime=${timestamp}&clienttoken=0&clientver=11409&code=fc4be23b4e972707f36b8a828a93ba8a&dfid=0&extdata=${hash}&kugouid=0&mid=16249512204336365674023395779019&mixsongid=${res_id}&p=${page}&pagesize=${limit}&uuid=0&ver=10` const _requestObj = httpFetch(`http://m.comment.service.kugou.com/r/v1/rank/newest?${params}&signature=${signatureParams(params)}`, { headers: { 'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36 Edg/107.0.1418.24', @@ -29,10 +30,11 @@ export default { // console.log(songmid) if (this._requestObj2) this._requestObj2.cancelHttp() let timestamp = Date.now() - const params = `appid=1005&clienttime=${timestamp}&clienttoken=0&clientver=11409&code=fc4be23b4e972707f36b8a828a93ba8a&dfid=0&extdata=${hash}&kugouid=0&mid=16249512204336365674023395779019&mixsongid=0&p=${page}&pagesize=${limit}&uuid=0&ver=10` - const _requestObj2 = httpFetch(`http://m.comment.service.kugou.com/v1/weightlist?${params}&signature=${signatureParams(params)}`, { + const params = `dfid=0&mid=16249512204336365674023395779019&clienttime=${timestamp}&uuid=0&extdata=${hash}&appid=1005&code=fc4be23b4e972707f36b8a828a93ba8a&schash=${hash}&clientver=11409&p=${page}&clienttoken=&pagesize=${limit}&ver=10&kugouid=0` + // https://github.com/GitHub-ZC/wp_MusicApi/blob/bf9307dd138dc8ac6c4f7de29361209d4f5b665f/routes/v1/kugou/comment.js#L53 + const _requestObj2 = httpFetch(`http://m.comment.service.kugou.com/r/v1/rank/topliked?${params}&signature=${signatureParams(params)}`, { headers: { - 'User-Agent': 'Android712-AndroidPhone-8983-18-0-COMMENT-wifi', + 'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36 Edg/107.0.1418.24', }, }) const { body, statusCode } = await _requestObj2.promise diff --git a/src/renderer/utils/musicSdk/kw/songList.js b/src/renderer/utils/musicSdk/kw/songList.js index 2a075636..84185613 100644 --- a/src/renderer/utils/musicSdk/kw/songList.js +++ b/src/renderer/utils/musicSdk/kw/songList.js @@ -8,7 +8,7 @@ export default { _requestObj_hotTags: null, _requestObj_list: null, limit_list: 36, - limit_song: 10000, + limit_song: 1000, successCode: 200, sortList: [ {