From 838355a5e94a21f7b9b634f9f6cbd17ae7a4adc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E7=8B=B8=E8=8A=B1=E5=96=B5?= Date: Thu, 3 Aug 2023 20:30:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DKGMusic=E6=AD=8C=E5=8D=95?= =?UTF-8?q?=E6=AD=8C=E6=9B=B2=E6=97=A0=E6=89=A9=E5=B1=95=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=20&=20=E4=BF=AE=E5=A4=8DQQMusic=E6=90=9C=E7=B4=A2=E6=AD=8C?= =?UTF-8?q?=E6=9B=B2=E6=97=A0=E6=89=A9=E5=B1=95=E4=BF=A1=E6=81=AF=20(#1509?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: QQMusic搜索歌曲扩展信息 * 修复KGMusic调用musicInfo时无括号中数据 * 修复KGMusic歌单歌曲括号中信息 * 修复 --------- Co-authored-by: lyswhut --- src/renderer/utils/musicSdk/kg/musicInfo.js | 28 +++++++++++------- src/renderer/utils/musicSdk/kg/songList.js | 29 ++++++++++++------- src/renderer/utils/musicSdk/tx/musicSearch.js | 2 +- 3 files changed, 37 insertions(+), 22 deletions(-) diff --git a/src/renderer/utils/musicSdk/kg/musicInfo.js b/src/renderer/utils/musicSdk/kg/musicInfo.js index 546ad8b4..f23862f9 100644 --- a/src/renderer/utils/musicSdk/kg/musicInfo.js +++ b/src/renderer/utils/musicSdk/kg/musicInfo.js @@ -3,14 +3,17 @@ import { createHttpFetch } from './util' const createGetMusicInfosTask = (hashs) => { let data = { - appid: 1001, - clienttime: 639437935, - clientver: 9020, - fields: 'album_info,author_name,audio_info,ori_audio_name', - is_publish: '1', - key: '0475af1457cd3363c7b45b871e94428a', - mid: '21511157a05844bd085308bc76ef3342', + area_code: '1', show_privilege: 1, + show_album_info: '1', + is_publish: '', + appid: 1005, + clientver: 11451, + mid: '1', + dfid: '-', + clienttime: Date.now(), + key: 'OIlwieks28dk2k092lksi2UIkp', + fields: 'album_info,author_name,audio_info,ori_audio_name,base,songname', } let list = hashs let tasks = [] @@ -19,12 +22,17 @@ const createGetMusicInfosTask = (hashs) => { if (list.length < 100) break list = list.slice(100) } - let url = 'http://kmr.service.kugou.com/v2/album_audio/audio' + let url = 'http://gateway.kugou.com/v3/album_audio/audio' return tasks.map(task => createHttpFetch(url, { method: 'POST', body: task, headers: { - 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1', + 'KG-THash': '13a3164', + 'KG-RC': '1', + 'KG-Fake': '0', + 'KG-RF': '00869891', + 'User-Agent': 'Android712-AndroidPhone-11451-376-0-FeeCacheUpdate-wifi', + 'x-router': 'kmr.service.kugou.com', }, }).then(data => data.map(s => s[0]))) } @@ -73,7 +81,7 @@ export const filterMusicInfoList = (rawList) => { } list.push({ singer: decodeName(item.author_name), - name: decodeName(item.ori_audio_name), + name: decodeName(item.songname), albumName: decodeName(item.album_info.album_name), albumId: item.album_info.album_id, songmid: item.audio_info.audio_id, diff --git a/src/renderer/utils/musicSdk/kg/songList.js b/src/renderer/utils/musicSdk/kg/songList.js index f06163dd..ec022fcf 100644 --- a/src/renderer/utils/musicSdk/kg/songList.js +++ b/src/renderer/utils/musicSdk/kg/songList.js @@ -282,15 +282,17 @@ export default { createTask(hashs) { let data = { - appid: 1001, - clienttime: 639437935, - clientver: 9020, - fields: - 'album_info,author_name,audio_info,ori_audio_name', - is_publish: '1', - key: '0475af1457cd3363c7b45b871e94428a', - mid: '21511157a05844bd085308bc76ef3342', + area_code: '1', show_privilege: 1, + show_album_info: '1', + is_publish: '', + appid: 1005, + clientver: 11451, + mid: '1', + dfid: '-', + clienttime: Date.now(), + key: 'OIlwieks28dk2k092lksi2UIkp', + fields: 'album_info,author_name,audio_info,ori_audio_name,base,songname', } let list = hashs let tasks = [] @@ -299,12 +301,17 @@ export default { if (list.length < 100) break list = list.slice(100) } - let url = 'http://kmr.service.kugou.com/v2/album_audio/audio' + let url = 'http://gateway.kugou.com/v2/album_audio/audio' return tasks.map(task => this.createHttp(url, { method: 'POST', body: task, headers: { - 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1', + 'KG-THash': '13a3164', + 'KG-RC': '1', + 'KG-Fake': '0', + 'KG-RF': '00869891', + 'User-Agent': 'Android712-AndroidPhone-11451-376-0-FeeCacheUpdate-wifi', + 'x-router': 'kmr.service.kugou.com', }, }).then(data => data.map(s => s[0]))) }, @@ -807,7 +814,7 @@ export default { } list.push({ singer: decodeName(item.author_name), - name: decodeName(item.ori_audio_name), + name: decodeName(item.songname), albumName: decodeName(item.album_info.album_name), albumId: item.album_info.album_id, songmid: item.audio_info.audio_id, diff --git a/src/renderer/utils/musicSdk/tx/musicSearch.js b/src/renderer/utils/musicSdk/tx/musicSearch.js index 2e011eca..a83554c8 100644 --- a/src/renderer/utils/musicSdk/tx/musicSearch.js +++ b/src/renderer/utils/musicSdk/tx/musicSearch.js @@ -95,7 +95,7 @@ export default { } list.push({ singer: formatSingerName(item.singer, 'name'), - name: item.name, + name: item.name + (item.title_extra ?? ''), albumName, albumId, source: 'tx',