github
/
lx-music-desktop
mirror of https://github.com/lyswhut/lx-music-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

修复mg源搜索失效的问题

pull/590/head
lyswhut 2021-06-19 13:26:58 +08:00
parent 507f66b3b6
commit 1963b3ee71
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
publish/changeLog.md
View File

@ -7,6 +7,10 @@
- 优化网络请求，尝试去解决无法连接服务器的问题 - 优化网络请求，尝试去解决无法连接服务器的问题
### 修复
- 修复mg源搜索失效的问题
### 变更 ### 变更
- 添加歌曲到列表时从原来的底部改为顶部，若想要恢复原来的行为则可以去更改“添加歌曲到列表时的位置”设置项 - 添加歌曲到列表时从原来的底部改为顶部，若想要恢复原来的行为则可以去更改“添加歌曲到列表时的位置”设置项

21
src/renderer/utils/music/mg/musicSearch.js
View File

@ -7,20 +7,21 @@ import { sizeFormate } from '../../index'
let searchRequest let searchRequest
export default { export default {
limit: 30, limit: 20,
total: 0, total: 0,
page: 0, page: 0,
allPage: 1, allPage: 1,
musicSearch(str, page, limit) { musicSearch(str, page, limit) {
if (searchRequest && searchRequest.cancelHttp) searchRequest.cancelHttp() if (searchRequest && searchRequest.cancelHttp) searchRequest.cancelHttp()
searchRequest = httpFetch(`http://jadeite.migu.cn:7090/music_search/v2/search/searchAll?sid=4f87090d01c84984a11976b828e2b02c18946be88a6b4c47bcdc92fbd40762db&isCorrect=1&isCopyright=1&searchSwitch=%7B%22song%22%3A1%2C%22album%22%3A0%2C%22singer%22%3A0%2C%22tagSong%22%3A1%2C%22mvSong%22%3A0%2C%22bestShow%22%3A1%2C%22songlist%22%3A0%2C%22lyricSong%22%3A0%7D&pageSize=${limit}&text=${encodeURIComponent(str)}&pageNo=${page}&sort=0`, { searchRequest = httpFetch(`http://pd.musicapp.migu.cn/MIGUM2.0/v1.0/content/search_all.do?ua=Android_migu&version=5.0.1&text=${encodeURIComponent(str)}&pageNo=${page}&pageSize=${limit}&searchSwitch=%7B%22song%22%3A1%2C%22album%22%3A0%2C%22singer%22%3A0%2C%22tagSong%22%3A0%2C%22mvSong%22%3A0%2C%22songlist%22%3A0%2C%22bestShow%22%3A1%7D`, {
// searchRequest = httpFetch(`http://jadeite.migu.cn:7090/music_search/v2/search/searchAll?sid=4f87090d01c84984a11976b828e2b02c18946be88a6b4c47bcdc92fbd40762db&isCorrect=1&isCopyright=1&searchSwitch=%7B%22song%22%3A1%2C%22album%22%3A0%2C%22singer%22%3A0%2C%22tagSong%22%3A1%2C%22mvSong%22%3A0%2C%22bestShow%22%3A1%2C%22songlist%22%3A0%2C%22lyricSong%22%3A0%7D&pageSize=${limit}&text=${encodeURIComponent(str)}&pageNo=${page}&sort=0`, {
headers: { headers: {
sign: 'c3b7ae985e2206e97f1b2de8f88691e2', // sign: 'c3b7ae985e2206e97f1b2de8f88691e2',
timestamp: 1578225871982, // timestamp: 1578225871982,
appId: 'yyapp2', // appId: 'yyapp2',
mode: 'android', // mode: 'android',
ua: 'Android_migu', // ua: 'Android_migu',
version: '6.9.4', // version: '6.9.4',
osVersion: 'android 7.0', osVersion: 'android 7.0',
'User-Agent': 'okhttp/3.9.1', 'User-Agent': 'okhttp/3.9.1',
}, },
@ -104,9 +105,9 @@ export default {
return this.musicSearch(str, page, limit).then(result => { return this.musicSearch(str, page, limit).then(result => {
// console.log(result) // console.log(result)
if (!result || result.code !== '000000') return Promise.reject(new Error(result ? result.info : '搜索失败')) if (!result || result.code !== '000000') return Promise.reject(new Error(result ? result.info : '搜索失败'))
const songResultData = result.songResultData || { resultList: [], totalCount: 0 } const songResultData = result.songResultData || { result: [], totalCount: 0 }
let list = this.handleResult(songResultData.resultList.flat()) let list = this.handleResult(songResultData.result)
if (list == null) return this.search(str, page, { limit }, retryNum) if (list == null) return this.search(str, page, { limit }, retryNum)
this.total = parseInt(songResultData.totalCount) this.total = parseInt(songResultData.totalCount)