diff --git a/module/album.js b/module/album.js index b936e3b..ab9648e 100644 --- a/module/album.js +++ b/module/album.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/v1/album/${query.id}`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/album_detail.js b/module/album_detail.js index b31b93b..adb30dd 100644 --- a/module/album_detail.js +++ b/module/album_detail.js @@ -8,12 +8,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/vipmall/albumproduct/detail`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/album_detail_dynamic.js b/module/album_detail_dynamic.js index 01db650..9594c1a 100644 --- a/module/album_detail_dynamic.js +++ b/module/album_detail_dynamic.js @@ -8,12 +8,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/album/detail/dynamic`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/album_list.js b/module/album_list.js index 914e885..1f0c108 100644 --- a/module/album_list.js +++ b/module/album_list.js @@ -12,12 +12,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/vipmall/albumproduct/list`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/album_list_style.js b/module/album_list_style.js index 513d84d..37dc628 100644 --- a/module/album_list_style.js +++ b/module/album_list_style.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/vipmall/appalbum/album/style`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/album_new.js b/module/album_new.js index 945b5e3..a51b48f 100644 --- a/module/album_new.js +++ b/module/album_new.js @@ -7,11 +7,10 @@ module.exports = (query, request) => { total: true, area: query.area || 'ALL', //ALL:全部,ZH:华语,EA:欧美,KR:韩国,JP:日本 } - return request('POST', `https://music.163.com/weapi/album/new`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/album/new`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/album_newest.js b/module/album_newest.js index 4e1e055..4132606 100644 --- a/module/album_newest.js +++ b/module/album_newest.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/discovery/newAlbum`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/album_songsaleboard.js b/module/album_songsaleboard.js index ded7872..57780eb 100644 --- a/module/album_songsaleboard.js +++ b/module/album_songsaleboard.js @@ -15,12 +15,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/feealbum/songsaleboard/${type}/type`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/album_sub.js b/module/album_sub.js index d4ad4e7..da3830f 100644 --- a/module/album_sub.js +++ b/module/album_sub.js @@ -6,11 +6,10 @@ module.exports = (query, request) => { const data = { id: query.id, } - return request('POST', `https://music.163.com/api/album/${query.t}`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/album/${query.t}`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/album_sublist.js b/module/album_sublist.js index 75f8af5..4c395d1 100644 --- a/module/album_sublist.js +++ b/module/album_sublist.js @@ -7,11 +7,10 @@ module.exports = (query, request) => { offset: query.offset || 0, total: true, } - return request('POST', `https://music.163.com/weapi/album/sublist`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/album/sublist`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/artist_album.js b/module/artist_album.js index e710a99..6cb7dd7 100644 --- a/module/artist_album.js +++ b/module/artist_album.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/artist/albums/${query.id}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/artist_desc.js b/module/artist_desc.js index 425d2a3..f83eb71 100644 --- a/module/artist_desc.js +++ b/module/artist_desc.js @@ -9,12 +9,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/artist/introduction`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/artist_detail.js b/module/artist_detail.js index 8df9e3b..66c29fe 100644 --- a/module/artist_detail.js +++ b/module/artist_detail.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { { id: query.id, }, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/artist_fans.js b/module/artist_fans.js index 74b2199..4efd19c 100644 --- a/module/artist_fans.js +++ b/module/artist_fans.js @@ -7,11 +7,10 @@ module.exports = (query, request) => { limit: query.limit || 20, offset: query.offset || 0, } - return request('POST', `https://music.163.com/weapi/artist/fans/get`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/artist/fans/get`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/artist_follow_count.js b/module/artist_follow_count.js index ecdbd41..38fce3c 100644 --- a/module/artist_follow_count.js +++ b/module/artist_follow_count.js @@ -9,12 +9,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/artist/follow/count/get`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/artist_list.js b/module/artist_list.js index 7f944a5..a86ff99 100644 --- a/module/artist_list.js +++ b/module/artist_list.js @@ -29,11 +29,10 @@ module.exports = (query, request) => { type: query.type || '1', area: query.area, } - return request('POST', `https://music.163.com/api/v1/artist/list`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/v1/artist/list`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/artist_mv.js b/module/artist_mv.js index 151768f..4025d91 100644 --- a/module/artist_mv.js +++ b/module/artist_mv.js @@ -8,11 +8,10 @@ module.exports = (query, request) => { offset: query.offset, total: true, } - return request('POST', `https://music.163.com/weapi/artist/mvs`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/artist/mvs`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/artist_new_mv.js b/module/artist_new_mv.js index d024a87..69681aa 100644 --- a/module/artist_new_mv.js +++ b/module/artist_new_mv.js @@ -8,12 +8,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/sub/artist/new/works/mv/list`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/artist_new_song.js b/module/artist_new_song.js index 79853b0..8f7edd0 100644 --- a/module/artist_new_song.js +++ b/module/artist_new_song.js @@ -8,12 +8,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/sub/artist/new/works/song/list`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/artist_songs.js b/module/artist_songs.js index 8fbb95e..2b6e5ca 100644 --- a/module/artist_songs.js +++ b/module/artist_songs.js @@ -10,11 +10,10 @@ module.exports = (query, request) => { offset: query.offset || 0, limit: query.limit || 100, } - return request('POST', `https://music.163.com/api/v1/artist/songs`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/v1/artist/songs`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/artist_sub.js b/module/artist_sub.js index 899086c..2dc237e 100644 --- a/module/artist_sub.js +++ b/module/artist_sub.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/artist/${query.t}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/artist_sublist.js b/module/artist_sublist.js index 03a10c8..db97596 100644 --- a/module/artist_sublist.js +++ b/module/artist_sublist.js @@ -7,11 +7,10 @@ module.exports = (query, request) => { offset: query.offset || 0, total: true, } - return request('POST', `https://music.163.com/weapi/artist/sublist`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/artist/sublist`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/artist_top_song.js b/module/artist_top_song.js index 0c86cb6..fd4f139 100644 --- a/module/artist_top_song.js +++ b/module/artist_top_song.js @@ -4,11 +4,10 @@ module.exports = (query, request) => { const data = { id: query.id, } - return request('POST', `https://music.163.com/api/artist/top/song`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/artist/top/song`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/artist_video.js b/module/artist_video.js index 41c109f..046f6eb 100644 --- a/module/artist_video.js +++ b/module/artist_video.js @@ -15,12 +15,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/mlog/artist/video`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/artists.js b/module/artists.js index 3a3d02c..8664e1b 100644 --- a/module/artists.js +++ b/module/artists.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/v1/artist/${query.id}`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/avatar_upload.js b/module/avatar_upload.js index 4598de0..5a2ac61 100644 --- a/module/avatar_upload.js +++ b/module/avatar_upload.js @@ -8,13 +8,7 @@ module.exports = async (query, request) => { { imgid: uploadInfo.imgId, }, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) return { status: 200, diff --git a/module/calendar.js b/module/calendar.js index 9830445..59d3192 100644 --- a/module/calendar.js +++ b/module/calendar.js @@ -4,11 +4,10 @@ module.exports = (query, request) => { startTime: query.startTime || Date.now(), endTime: query.endTime || Date.now(), } - return request('POST', `https://music.163.com/api/mcalendar/detail`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/mcalendar/detail`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/captcha_sent.js b/module/captcha_sent.js index c8cb16f..2700f04 100644 --- a/module/captcha_sent.js +++ b/module/captcha_sent.js @@ -6,11 +6,10 @@ module.exports = (query, request) => { ctcode: query.ctcode || '86', cellphone: query.phone, } - return request('POST', `https://music.163.com/api/sms/captcha/sent`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/sms/captcha/sent`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/captcha_verify.js b/module/captcha_verify.js index 4afa664..e21f552 100644 --- a/module/captcha_verify.js +++ b/module/captcha_verify.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/sms/captcha/verify`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/check_music.js b/module/check_music.js index c1ab583..1b2f5e3 100644 --- a/module/check_music.js +++ b/module/check_music.js @@ -10,13 +10,7 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/song/enhance/player/url`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ).then((response) => { let playable = false if (response.body.code == 200) { diff --git a/module/cloud.js b/module/cloud.js index b22ae82..4b5a2f2 100644 --- a/module/cloud.js +++ b/module/cloud.js @@ -45,13 +45,7 @@ module.exports = async (query, request) => { songId: '0', version: 1, }, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) let artist = '' let album = '' @@ -111,12 +105,7 @@ module.exports = async (query, request) => { type: 'audio', md5: query.songFile.md5, }, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - }, + createOption(query, 'weapi'), ) if (res.body.needUpload) { @@ -137,13 +126,7 @@ module.exports = async (query, request) => { bitrate: String(bitrate), resourceId: tokenRes.body.result.resourceId, }, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) // console.log({ res2, privateCloud: res2.body.privateCloud }) // console.log(res.body.songId, 'songid') @@ -153,13 +136,7 @@ module.exports = async (query, request) => { { songid: res2.body.songId, }, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) // console.log({ res3 }) return { diff --git a/module/cloud_match.js b/module/cloud_match.js index 7d48f52..2ca5c5c 100644 --- a/module/cloud_match.js +++ b/module/cloud_match.js @@ -9,12 +9,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/cloud/user/song/match`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/comment.js b/module/comment.js index 9d6675d..0f7458a 100644 --- a/module/comment.js +++ b/module/comment.js @@ -27,12 +27,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/resource/comments/${query.t}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/comment_album.js b/module/comment_album.js index 9c1c77f..71ad420 100644 --- a/module/comment_album.js +++ b/module/comment_album.js @@ -14,12 +14,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/v1/resource/comments/R_AL_3_${query.id}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/comment_dj.js b/module/comment_dj.js index 03be542..a875de1 100644 --- a/module/comment_dj.js +++ b/module/comment_dj.js @@ -14,12 +14,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/v1/resource/comments/A_DJ_1_${query.id}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/comment_event.js b/module/comment_event.js index 6598827..7d2d3e6 100644 --- a/module/comment_event.js +++ b/module/comment_event.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/v1/resource/comments/${query.threadId}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/comment_floor.js b/module/comment_floor.js index c4e175a..e8fd246 100644 --- a/module/comment_floor.js +++ b/module/comment_floor.js @@ -12,12 +12,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/resource/comment/floor/get`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/comment_hot.js b/module/comment_hot.js index c18a786..e1c9c0e 100644 --- a/module/comment_hot.js +++ b/module/comment_hot.js @@ -16,12 +16,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/v1/resource/hotcomments/${query.type}${query.id}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/comment_like.js b/module/comment_like.js index d7d2790..c216cc7 100644 --- a/module/comment_like.js +++ b/module/comment_like.js @@ -18,12 +18,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/v1/comment/${query.t}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/comment_music.js b/module/comment_music.js index 5e0fb61..e937232 100644 --- a/module/comment_music.js +++ b/module/comment_music.js @@ -14,12 +14,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/v1/resource/comments/R_SO_4_${query.id}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/comment_mv.js b/module/comment_mv.js index f3b90bf..8161470 100644 --- a/module/comment_mv.js +++ b/module/comment_mv.js @@ -14,12 +14,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/v1/resource/comments/R_MV_5_${query.id}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/comment_playlist.js b/module/comment_playlist.js index cc8e42b..035c1bd 100644 --- a/module/comment_playlist.js +++ b/module/comment_playlist.js @@ -14,12 +14,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/v1/resource/comments/A_PL_0_${query.id}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/comment_video.js b/module/comment_video.js index e415ebe..5081f98 100644 --- a/module/comment_video.js +++ b/module/comment_video.js @@ -14,12 +14,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/v1/resource/comments/R_VI_62_${query.id}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/daily_signin.js b/module/daily_signin.js index 8d11453..d4abd39 100644 --- a/module/daily_signin.js +++ b/module/daily_signin.js @@ -12,11 +12,10 @@ module.exports = (query, request) => { const data = { type: query.type || 0, } - return request('POST', `https://music.163.com/weapi/point/dailyTask`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/point/dailyTask`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/digitalAlbum_detail.js b/module/digitalAlbum_detail.js index e7b86d0..fc38f1a 100644 --- a/module/digitalAlbum_detail.js +++ b/module/digitalAlbum_detail.js @@ -9,12 +9,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/vipmall/albumproduct/detail`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/digitalAlbum_ordering.js b/module/digitalAlbum_ordering.js index 546de11..0a41a66 100644 --- a/module/digitalAlbum_ordering.js +++ b/module/digitalAlbum_ordering.js @@ -18,12 +18,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/ordering/web/digital`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/digitalAlbum_purchased.js b/module/digitalAlbum_purchased.js index ccdb62f..d238603 100644 --- a/module/digitalAlbum_purchased.js +++ b/module/digitalAlbum_purchased.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/digitalAlbum/purchased`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/digitalAlbum_sales.js b/module/digitalAlbum_sales.js index 365bfa3..9ada39a 100644 --- a/module/digitalAlbum_sales.js +++ b/module/digitalAlbum_sales.js @@ -9,12 +9,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/vipmall/albumproduct/album/query/sales`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/djRadio_top.js b/module/djRadio_top.js index e25b605..dbc265c 100644 --- a/module/djRadio_top.js +++ b/module/djRadio_top.js @@ -11,11 +11,6 @@ module.exports = (query, request) => { 'POST', 'https://interface.music.163.com/weapi/expert/worksdata/works/top/get', data, - { - crypto: 'weapi', - cookie: query.cookie, - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/dj_banner.js b/module/dj_banner.js index eef9f68..8e9383b 100644 --- a/module/dj_banner.js +++ b/module/dj_banner.js @@ -8,12 +8,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/djradio/banner/get`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/dj_category_excludehot.js b/module/dj_category_excludehot.js index 170a190..c8b0e8e 100644 --- a/module/dj_category_excludehot.js +++ b/module/dj_category_excludehot.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/djradio/category/excludehot`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/dj_category_recommend.js b/module/dj_category_recommend.js index cf1601e..5835c58 100644 --- a/module/dj_category_recommend.js +++ b/module/dj_category_recommend.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/djradio/home/category/recommend`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/dj_catelist.js b/module/dj_catelist.js index 6191323..7d9e6b9 100644 --- a/module/dj_catelist.js +++ b/module/dj_catelist.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/djradio/category/get`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/dj_detail.js b/module/dj_detail.js index 7ba7780..c028ff3 100644 --- a/module/dj_detail.js +++ b/module/dj_detail.js @@ -5,11 +5,10 @@ module.exports = (query, request) => { const data = { id: query.rid, } - return request('POST', `https://music.163.com/api/djradio/v2/get`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/djradio/v2/get`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/dj_hot.js b/module/dj_hot.js index cef287b..976fc5c 100644 --- a/module/dj_hot.js +++ b/module/dj_hot.js @@ -6,11 +6,10 @@ module.exports = (query, request) => { limit: query.limit || 30, offset: query.offset || 0, } - return request('POST', `https://music.163.com/weapi/djradio/hot/v1`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/djradio/hot/v1`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/dj_paygift.js b/module/dj_paygift.js index 4744ac3..879cc61 100644 --- a/module/dj_paygift.js +++ b/module/dj_paygift.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/djradio/home/paygift/list?_nmclfl=1`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/dj_personalize_recommend.js b/module/dj_personalize_recommend.js index c0a814b..bb2f667 100644 --- a/module/dj_personalize_recommend.js +++ b/module/dj_personalize_recommend.js @@ -8,12 +8,6 @@ module.exports = (query, request) => { { limit: query.limit || 6, }, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/dj_program.js b/module/dj_program.js index bdc027f..b88d443 100644 --- a/module/dj_program.js +++ b/module/dj_program.js @@ -12,12 +12,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/dj/program/byradio`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/dj_program_detail.js b/module/dj_program_detail.js index b3c62a3..38d945f 100644 --- a/module/dj_program_detail.js +++ b/module/dj_program_detail.js @@ -5,11 +5,10 @@ module.exports = (query, request) => { const data = { id: query.id, } - return request('POST', `https://music.163.com/api/dj/program/detail`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/dj/program/detail`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/dj_program_toplist.js b/module/dj_program_toplist.js index 6d8c09f..5997a09 100644 --- a/module/dj_program_toplist.js +++ b/module/dj_program_toplist.js @@ -6,11 +6,10 @@ module.exports = (query, request) => { limit: query.limit || 100, offset: query.offset || 0, } - return request('POST', `https://music.163.com/api/program/toplist/v1`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/program/toplist/v1`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/dj_program_toplist_hours.js b/module/dj_program_toplist_hours.js index 0a14a37..eb4b3be 100644 --- a/module/dj_program_toplist_hours.js +++ b/module/dj_program_toplist_hours.js @@ -9,12 +9,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/djprogram/toplist/hours`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/dj_radio_hot.js b/module/dj_radio_hot.js index 84f6e8a..016c03b 100644 --- a/module/dj_radio_hot.js +++ b/module/dj_radio_hot.js @@ -7,11 +7,10 @@ module.exports = (query, request) => { limit: query.limit || 30, offset: query.offset || 0, } - return request('POST', `https://music.163.com/api/djradio/hot`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/djradio/hot`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/dj_recommend.js b/module/dj_recommend.js index f9c2ec2..6f03cdb 100644 --- a/module/dj_recommend.js +++ b/module/dj_recommend.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/djradio/recommend/v1`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/dj_recommend_type.js b/module/dj_recommend_type.js index 8465608..e5e99c3 100644 --- a/module/dj_recommend_type.js +++ b/module/dj_recommend_type.js @@ -32,12 +32,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/djradio/recommend`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/dj_sub.js b/module/dj_sub.js index f1aaa2e..48cdcac 100644 --- a/module/dj_sub.js +++ b/module/dj_sub.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/djradio/${query.t}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/dj_sublist.js b/module/dj_sublist.js index 35117f2..373f84f 100644 --- a/module/dj_sublist.js +++ b/module/dj_sublist.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/djradio/get/subed`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/dj_subscriber.js b/module/dj_subscriber.js index 070957e..b06c611 100644 --- a/module/dj_subscriber.js +++ b/module/dj_subscriber.js @@ -8,11 +8,10 @@ module.exports = (query, request) => { limit: query.limit || '20', total: 'true', } - return request('POST', `https://music.163.com/api/djradio/subscriber`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/djradio/subscriber`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/dj_today_perfered.js b/module/dj_today_perfered.js index 16624db..4e70fd8 100644 --- a/module/dj_today_perfered.js +++ b/module/dj_today_perfered.js @@ -9,12 +9,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/djradio/home/today/perfered`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/dj_toplist.js b/module/dj_toplist.js index ada222b..da4a631 100644 --- a/module/dj_toplist.js +++ b/module/dj_toplist.js @@ -10,11 +10,10 @@ module.exports = (query, request) => { offset: query.offset || 0, type: typeMap[query.type || 'new'] || '0', //0为新晋,1为热门 } - return request('POST', `https://music.163.com/api/djradio/toplist`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/djradio/toplist`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/dj_toplist_hours.js b/module/dj_toplist_hours.js index ec21cd9..42848f2 100644 --- a/module/dj_toplist_hours.js +++ b/module/dj_toplist_hours.js @@ -6,11 +6,10 @@ module.exports = (query, request) => { limit: query.limit || 100, // 不支持 offset } - return request('POST', `https://music.163.com/api/dj/toplist/hours`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/dj/toplist/hours`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/dj_toplist_newcomer.js b/module/dj_toplist_newcomer.js index 637ef7d..29a36bc 100644 --- a/module/dj_toplist_newcomer.js +++ b/module/dj_toplist_newcomer.js @@ -9,12 +9,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/dj/toplist/newcomer`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/dj_toplist_pay.js b/module/dj_toplist_pay.js index 7c9aefe..71c06c8 100644 --- a/module/dj_toplist_pay.js +++ b/module/dj_toplist_pay.js @@ -9,12 +9,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/djradio/toplist/pay`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/dj_toplist_popular.js b/module/dj_toplist_popular.js index 1b93efc..a356547 100644 --- a/module/dj_toplist_popular.js +++ b/module/dj_toplist_popular.js @@ -6,11 +6,10 @@ module.exports = (query, request) => { limit: query.limit || 100, // 不支持 offset } - return request('POST', `https://music.163.com/api/dj/toplist/popular`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/dj/toplist/popular`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/event.js b/module/event.js index f6e655e..8f69a3b 100644 --- a/module/event.js +++ b/module/event.js @@ -6,11 +6,10 @@ module.exports = (query, request) => { pagesize: query.pagesize || 20, lasttime: query.lasttime || -1, } - return request('POST', `https://music.163.com/weapi/v1/event/get`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/v1/event/get`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/event_del.js b/module/event_del.js index d7af930..e324019 100644 --- a/module/event_del.js +++ b/module/event_del.js @@ -5,11 +5,10 @@ module.exports = (query, request) => { const data = { id: query.evId, } - return request('POST', `https://music.163.com/eapi/event/delete`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/eapi/event/delete`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/event_forward.js b/module/event_forward.js index 50590c1..2a687a0 100644 --- a/module/event_forward.js +++ b/module/event_forward.js @@ -9,11 +9,10 @@ module.exports = (query, request) => { id: query.evId, eventUserId: query.uid, } - return request('POST', `https://music.163.com/weapi/event/forward`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/event/forward`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/fm_trash.js b/module/fm_trash.js index 6cdec12..009dd81 100644 --- a/module/fm_trash.js +++ b/module/fm_trash.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { query.id }&time=${query.time || 25}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/follow.js b/module/follow.js index 4fd02ee..2932d31 100644 --- a/module/follow.js +++ b/module/follow.js @@ -9,12 +9,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/user/${query.t}/${query.id}`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/get_userids.js b/module/get_userids.js index 20a4c7f..e59de62 100644 --- a/module/get_userids.js +++ b/module/get_userids.js @@ -3,11 +3,10 @@ module.exports = (query, request) => { const data = { nicknames: query.nicknames, } - return request('POST', `https://music.163.com/api/user/getUserIds`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/user/getUserIds`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/history_recommend_songs.js b/module/history_recommend_songs.js index 3be7982..3e06821 100644 --- a/module/history_recommend_songs.js +++ b/module/history_recommend_songs.js @@ -8,12 +8,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/discovery/recommend/songs/history/recent`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/history_recommend_songs_detail.js b/module/history_recommend_songs_detail.js index 464311e..dcf4f9a 100644 --- a/module/history_recommend_songs_detail.js +++ b/module/history_recommend_songs_detail.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/discovery/recommend/songs/history/detail`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/homepage_block_page.js b/module/homepage_block_page.js index 779bf73..d7f9e94 100644 --- a/module/homepage_block_page.js +++ b/module/homepage_block_page.js @@ -8,12 +8,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/homepage/block/page`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/hot_topic.js b/module/hot_topic.js index a117c39..137b8f6 100644 --- a/module/hot_topic.js +++ b/module/hot_topic.js @@ -6,11 +6,10 @@ module.exports = (query, request) => { limit: query.limit || 20, offset: query.offset || 0, } - return request('POST', `https://music.163.com/api/act/hot`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/act/hot`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/like.js b/module/like.js index 6a5124f..9229188 100644 --- a/module/like.js +++ b/module/like.js @@ -9,11 +9,10 @@ module.exports = (query, request) => { like: query.like, time: '3', } - return request('POST', `https://music.163.com/api/radio/like`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/radio/like`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/likelist.js b/module/likelist.js index 11c2f53..53fbfa7 100644 --- a/module/likelist.js +++ b/module/likelist.js @@ -5,11 +5,10 @@ module.exports = (query, request) => { const data = { uid: query.uid, } - return request('POST', `https://music.163.com/weapi/song/like/get`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/song/like/get`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/listentogether_status.js b/module/listentogether_status.js index a7560a2..1a37312 100644 --- a/module/listentogether_status.js +++ b/module/listentogether_status.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/listen/together/status/get`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/login.js b/module/login.js index abd8b77..dea81d6 100644 --- a/module/login.js +++ b/module/login.js @@ -10,12 +10,8 @@ module.exports = async (query, request) => { rememberLogin: 'true', } let result = await request('POST', `https://music.163.com/api/login`, data, { - crypto: 'weapi', + ...createOption(query, 'weapi'), uaType: 'pc', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, }) if (result.body.code === 502) { return { diff --git a/module/login_cellphone.js b/module/login_cellphone.js index 9be1761..8dd6aef 100644 --- a/module/login_cellphone.js +++ b/module/login_cellphone.js @@ -18,12 +18,8 @@ module.exports = async (query, request) => { `https://music.163.com/weapi/login/cellphone`, data, { - crypto: 'weapi', + ...createOption(query, 'weapi'), uaType: 'pc', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, }, ) diff --git a/module/login_qr_check.js b/module/login_qr_check.js index 8ae68e4..6ecc4ba 100644 --- a/module/login_qr_check.js +++ b/module/login_qr_check.js @@ -9,13 +9,7 @@ module.exports = async (query, request) => { 'POST', `https://music.163.com/weapi/login/qrcode/client/login`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) result = { status: 200, diff --git a/module/login_qr_key.js b/module/login_qr_key.js index 297713e..f769dc0 100644 --- a/module/login_qr_key.js +++ b/module/login_qr_key.js @@ -7,13 +7,7 @@ module.exports = async (query, request) => { 'POST', `https://music.163.com/weapi/login/qrcode/unikey`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) return { status: 200, diff --git a/module/login_refresh.js b/module/login_refresh.js index f8296c1..524445d 100644 --- a/module/login_refresh.js +++ b/module/login_refresh.js @@ -7,12 +7,8 @@ module.exports = async (query, request) => { `https://music.163.com/weapi/login/token/refresh`, {}, { - crypto: 'weapi', + ...createOption(query, 'weapi'), uaType: 'pc', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, }, ) if (result.body.code === 200) { diff --git a/module/login_status.js b/module/login_status.js index d508628..e7e39a1 100644 --- a/module/login_status.js +++ b/module/login_status.js @@ -5,13 +5,7 @@ module.exports = async (query, request) => { 'POST', `https://music.163.com/weapi/w/nuser/account/get`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) if (result.body.code === 200) { result = { diff --git a/module/logout.js b/module/logout.js index 39521b8..3e6817f 100644 --- a/module/logout.js +++ b/module/logout.js @@ -7,12 +7,8 @@ module.exports = (query, request) => { `https://music.163.com/weapi/logout`, {}, { - crypto: 'weapi', + ...createOption(query, 'weapi'), uaType: 'pc', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, }, ) } diff --git a/module/mlog_to_video.js b/module/mlog_to_video.js index 2be26bf..2a67051 100644 --- a/module/mlog_to_video.js +++ b/module/mlog_to_video.js @@ -9,12 +9,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/mlog/video/convert/id`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/mlog_url.js b/module/mlog_url.js index 5bdd3e4..662bf1f 100644 --- a/module/mlog_url.js +++ b/module/mlog_url.js @@ -7,11 +7,10 @@ module.exports = (query, request) => { resolution: query.res || 1080, type: 1, } - return request('POST', `https://music.163.com/weapi/mlog/detail/v1`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/mlog/detail/v1`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/msg_comments.js b/module/msg_comments.js index 69d5b19..d1d2da0 100644 --- a/module/msg_comments.js +++ b/module/msg_comments.js @@ -13,12 +13,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/v1/user/comments/${query.uid}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/msg_forwards.js b/module/msg_forwards.js index ca929ed..14fad0a 100644 --- a/module/msg_forwards.js +++ b/module/msg_forwards.js @@ -7,11 +7,10 @@ module.exports = (query, request) => { limit: query.limit || 30, total: 'true', } - return request('POST', `https://music.163.com/api/forwards/get`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/forwards/get`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/msg_notices.js b/module/msg_notices.js index 3c35978..08f32cd 100644 --- a/module/msg_notices.js +++ b/module/msg_notices.js @@ -6,11 +6,10 @@ module.exports = (query, request) => { limit: query.limit || 30, time: query.lasttime || -1, } - return request('POST', `https://music.163.com/api/msg/notices`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/msg/notices`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/msg_private.js b/module/msg_private.js index 6427c70..8ee1e70 100644 --- a/module/msg_private.js +++ b/module/msg_private.js @@ -7,11 +7,10 @@ module.exports = (query, request) => { limit: query.limit || 30, total: 'true', } - return request('POST', `https://music.163.com/api/msg/private/users`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/msg/private/users`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/msg_private_history.js b/module/msg_private_history.js index 66a09d7..bf3ec2a 100644 --- a/module/msg_private_history.js +++ b/module/msg_private_history.js @@ -12,12 +12,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/msg/private/history`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/msg_recentcontact.js b/module/msg_recentcontact.js index acfabf6..8a416e5 100644 --- a/module/msg_recentcontact.js +++ b/module/msg_recentcontact.js @@ -7,12 +7,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/msg/recentcontact/get`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/music_first_listen_info.js b/module/music_first_listen_info.js index 8184fc0..518113f 100644 --- a/module/music_first_listen_info.js +++ b/module/music_first_listen_info.js @@ -9,12 +9,6 @@ module.exports = (query, request) => { 'POST', `https://interface3.music.163.com/api/content/activity/music/first/listen/info`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/musician_cloudbean.js b/module/musician_cloudbean.js index e2ea195..c04eda7 100644 --- a/module/musician_cloudbean.js +++ b/module/musician_cloudbean.js @@ -3,11 +3,10 @@ const createOption = require('../util/option.js') module.exports = (query, request) => { const data = {} - return request('POST', `https://music.163.com/weapi/cloudbean/get`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/cloudbean/get`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/musician_cloudbean_obtain.js b/module/musician_cloudbean_obtain.js index 83bf57b..9168130 100644 --- a/module/musician_cloudbean_obtain.js +++ b/module/musician_cloudbean_obtain.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/nmusician/workbench/mission/reward/obtain/new`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/musician_data_overview.js b/module/musician_data_overview.js index da48a16..56e5bb7 100644 --- a/module/musician_data_overview.js +++ b/module/musician_data_overview.js @@ -7,12 +7,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/creator/musician/statistic/data/overview/get`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/musician_play_trend.js b/module/musician_play_trend.js index c906ed0..06928fc 100644 --- a/module/musician_play_trend.js +++ b/module/musician_play_trend.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/creator/musician/play/count/statistic/data/trend/get`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/musician_sign.js b/module/musician_sign.js index 54b241a..9ab28a7 100644 --- a/module/musician_sign.js +++ b/module/musician_sign.js @@ -7,12 +7,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/creator/user/access`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/musician_tasks.js b/module/musician_tasks.js index 47ce194..419c6f6 100644 --- a/module/musician_tasks.js +++ b/module/musician_tasks.js @@ -7,12 +7,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/nmusician/workbench/mission/cycle/list`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/musician_tasks_new.js b/module/musician_tasks_new.js index 0eab9ae..224c54b 100644 --- a/module/musician_tasks_new.js +++ b/module/musician_tasks_new.js @@ -7,12 +7,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/nmusician/workbench/mission/stage/list `, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/mv_all.js b/module/mv_all.js index 6a1ceb0..640c110 100644 --- a/module/mv_all.js +++ b/module/mv_all.js @@ -12,11 +12,10 @@ module.exports = (query, request) => { total: 'true', limit: query.limit || 30, } - return request('POST', `https://interface.music.163.com/api/mv/all`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://interface.music.163.com/api/mv/all`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/mv_detail.js b/module/mv_detail.js index 00e09f7..f097822 100644 --- a/module/mv_detail.js +++ b/module/mv_detail.js @@ -5,11 +5,10 @@ module.exports = (query, request) => { const data = { id: query.mvid, } - return request('POST', `https://music.163.com/api/v1/mv/detail`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/v1/mv/detail`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/mv_detail_info.js b/module/mv_detail_info.js index 5fe84f2..10909c6 100644 --- a/module/mv_detail_info.js +++ b/module/mv_detail_info.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/comment/commentthread/info`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/mv_exclusive_rcmd.js b/module/mv_exclusive_rcmd.js index 94d24e4..78c8481 100644 --- a/module/mv_exclusive_rcmd.js +++ b/module/mv_exclusive_rcmd.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://interface.music.163.com/api/mv/exclusive/rcmd`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/mv_first.js b/module/mv_first.js index c3c5335..02c102d 100644 --- a/module/mv_first.js +++ b/module/mv_first.js @@ -12,12 +12,6 @@ module.exports = (query, request) => { 'POST', `https://interface.music.163.com/weapi/mv/first`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/mv_sub.js b/module/mv_sub.js index ab24b30..3ed1ff8 100644 --- a/module/mv_sub.js +++ b/module/mv_sub.js @@ -7,11 +7,10 @@ module.exports = (query, request) => { mvId: query.mvid, mvIds: '["' + query.mvid + '"]', } - return request('POST', `https://music.163.com/weapi/mv/${query.t}`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/mv/${query.t}`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/mv_sublist.js b/module/mv_sublist.js index 0d9edec..88cafe2 100644 --- a/module/mv_sublist.js +++ b/module/mv_sublist.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/cloudvideo/allvideo/sublist`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/mv_url.js b/module/mv_url.js index be7194e..9ec165c 100644 --- a/module/mv_url.js +++ b/module/mv_url.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/song/enhance/play/mv/url`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/nickname_check.js b/module/nickname_check.js index b45ba8d..6f9c8db 100644 --- a/module/nickname_check.js +++ b/module/nickname_check.js @@ -7,12 +7,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/nickname/duplicated`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/personal_fm.js b/module/personal_fm.js index 74c32d0..82bbf56 100644 --- a/module/personal_fm.js +++ b/module/personal_fm.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/v1/radio/get`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/personal_fm_mode.js b/module/personal_fm_mode.js index 5f0ea51..c03bd2d 100644 --- a/module/personal_fm_mode.js +++ b/module/personal_fm_mode.js @@ -14,13 +14,6 @@ module.exports = (query, request) => { 'POST', `https://interface3.music.163.com/eapi/v1/radio/get`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - url: '/api/v1/radio/get', - }, + createOption(query, 'weapi'), ) } diff --git a/module/personalized.js b/module/personalized.js index c3f82ab..effcc00 100644 --- a/module/personalized.js +++ b/module/personalized.js @@ -12,12 +12,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/personalized/playlist`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/personalized_djprogram.js b/module/personalized_djprogram.js index b404e97..44b6644 100644 --- a/module/personalized_djprogram.js +++ b/module/personalized_djprogram.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/personalized/djprogram`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/personalized_mv.js b/module/personalized_mv.js index 84a91ac..899e47e 100644 --- a/module/personalized_mv.js +++ b/module/personalized_mv.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/personalized/mv`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/personalized_newsong.js b/module/personalized_newsong.js index 1558881..1f0c3a4 100644 --- a/module/personalized_newsong.js +++ b/module/personalized_newsong.js @@ -13,12 +13,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/personalized/newsong`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/personalized_privatecontent.js b/module/personalized_privatecontent.js index af018d8..873e835 100644 --- a/module/personalized_privatecontent.js +++ b/module/personalized_privatecontent.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/personalized/privatecontent`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/personalized_privatecontent_list.js b/module/personalized_privatecontent_list.js index 788d173..fe49769 100644 --- a/module/personalized_privatecontent_list.js +++ b/module/personalized_privatecontent_list.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/v2/privatecontent/list`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/pl_count.js b/module/pl_count.js index b6ab352..dad6b02 100644 --- a/module/pl_count.js +++ b/module/pl_count.js @@ -2,11 +2,10 @@ const createOption = require('../util/option.js') module.exports = (query, request) => { const data = {} - return request('POST', `https://music.163.com/weapi/pl/count`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/pl/count`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/playlist_catlist.js b/module/playlist_catlist.js index 30834d6..6cd47d9 100644 --- a/module/playlist_catlist.js +++ b/module/playlist_catlist.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/playlist/catalogue`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/playlist_cover_update.js b/module/playlist_cover_update.js index 89aa58a..5546d7b 100644 --- a/module/playlist_cover_update.js +++ b/module/playlist_cover_update.js @@ -18,13 +18,7 @@ module.exports = async (query, request) => { id: query.id, coverImgId: uploadInfo.imgId, }, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) return { status: 200, diff --git a/module/playlist_create.js b/module/playlist_create.js index 78b7afe..94ef778 100644 --- a/module/playlist_create.js +++ b/module/playlist_create.js @@ -9,11 +9,10 @@ module.exports = (query, request) => { privacy: query.privacy, //0 为普通歌单,10 为隐私歌单 type: query.type || 'NORMAL', // NORMAL|VIDEO|SHARED } - return request('POST', `https://music.163.com/api/playlist/create`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/playlist/create`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/playlist_delete.js b/module/playlist_delete.js index 99cd251..8913215 100644 --- a/module/playlist_delete.js +++ b/module/playlist_delete.js @@ -7,11 +7,10 @@ module.exports = (query, request) => { const data = { ids: '[' + query.id + ']', } - return request('POST', `https://music.163.com/weapi/playlist/remove`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/playlist/remove`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/playlist_highquality_tags.js b/module/playlist_highquality_tags.js index d7c24f4..f7a7391 100644 --- a/module/playlist_highquality_tags.js +++ b/module/playlist_highquality_tags.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/playlist/highquality/tags`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/playlist_hot.js b/module/playlist_hot.js index eca3ffc..f71b513 100644 --- a/module/playlist_hot.js +++ b/module/playlist_hot.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/playlist/hottags`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/playlist_mylike.js b/module/playlist_mylike.js index 71a9276..1cf24d8 100644 --- a/module/playlist_mylike.js +++ b/module/playlist_mylike.js @@ -8,12 +8,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/mlog/playlist/mylike/bytime/get`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/playlist_order_update.js b/module/playlist_order_update.js index 9385d64..b5e72a5 100644 --- a/module/playlist_order_update.js +++ b/module/playlist_order_update.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/playlist/order/update`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/playlist_subscribe.js b/module/playlist_subscribe.js index 9573f7b..8851a26 100644 --- a/module/playlist_subscribe.js +++ b/module/playlist_subscribe.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/playlist/${query.t}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/playlist_subscribers.js b/module/playlist_subscribers.js index 6b10d91..11df3c7 100644 --- a/module/playlist_subscribers.js +++ b/module/playlist_subscribers.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/playlist/subscribers`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/playlist_track_add.js b/module/playlist_track_add.js index 78d01b0..47ad495 100644 --- a/module/playlist_track_add.js +++ b/module/playlist_track_add.js @@ -13,11 +13,10 @@ module.exports = async (query, request) => { } console.log(data) - return request('POST', `https://music.163.com/api/playlist/track/add`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/playlist/track/add`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/playlist_track_all.js b/module/playlist_track_all.js index f16be4b..6758325 100644 --- a/module/playlist_track_all.js +++ b/module/playlist_track_all.js @@ -33,13 +33,7 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/v3/song/detail`, idsData, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) }) } diff --git a/module/playlist_track_delete.js b/module/playlist_track_delete.js index 230e14c..232014f 100644 --- a/module/playlist_track_delete.js +++ b/module/playlist_track_delete.js @@ -18,12 +18,6 @@ module.exports = async (query, request) => { 'POST', `https://music.163.com/api/playlist/track/delete`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/playlist_tracks.js b/module/playlist_tracks.js index ed467b6..667c56b 100644 --- a/module/playlist_tracks.js +++ b/module/playlist_tracks.js @@ -16,13 +16,7 @@ module.exports = async (query, request) => { 'POST', `https://music.163.com/weapi/playlist/manipulate/tracks`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) return { status: 200, @@ -41,13 +35,7 @@ module.exports = async (query, request) => { trackIds: JSON.stringify([...tracks, ...tracks]), imme: 'true', }, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } else { return { diff --git a/module/playlist_update.js b/module/playlist_update.js index 83148b4..a6778d1 100644 --- a/module/playlist_update.js +++ b/module/playlist_update.js @@ -11,11 +11,10 @@ module.exports = (query, request) => { '/api/playlist/tags/update': `{"id":${query.id},"tags":"${query.tags}"}`, '/api/playlist/update/name': `{"id":${query.id},"name":"${query.name}"}`, } - return request('POST', `https://music.163.com/weapi/batch`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/batch`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/playlist_update_playcount.js b/module/playlist_update_playcount.js index e816ae4..eeea60b 100644 --- a/module/playlist_update_playcount.js +++ b/module/playlist_update_playcount.js @@ -9,12 +9,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/playlist/update/playcount`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/playlist_video_recent.js b/module/playlist_video_recent.js index dc3515d..87d6303 100644 --- a/module/playlist_video_recent.js +++ b/module/playlist_video_recent.js @@ -5,12 +5,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/playlist/video/recent`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/playmode_intelligence_list.js b/module/playmode_intelligence_list.js index 1a14bf6..e1b463c 100644 --- a/module/playmode_intelligence_list.js +++ b/module/playmode_intelligence_list.js @@ -13,12 +13,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/playmode/intelligence/list`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/program_recommend.js b/module/program_recommend.js index 9e97a95..c082948 100644 --- a/module/program_recommend.js +++ b/module/program_recommend.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/program/recommend/v1`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/rebind.js b/module/rebind.js index 80d4c48..6133d49 100644 --- a/module/rebind.js +++ b/module/rebind.js @@ -12,12 +12,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/user/replaceCellphone`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/recommend_resource.js b/module/recommend_resource.js index 1c78f25..0307840 100644 --- a/module/recommend_resource.js +++ b/module/recommend_resource.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/v1/discovery/recommend/resource`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/recommend_songs.js b/module/recommend_songs.js index 35cf837..a30382b 100644 --- a/module/recommend_songs.js +++ b/module/recommend_songs.js @@ -8,12 +8,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/v3/discovery/recommend/songs`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/recommend_songs_dislike.js b/module/recommend_songs_dislike.js index 789573b..37f9347 100644 --- a/module/recommend_songs_dislike.js +++ b/module/recommend_songs_dislike.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/v2/discovery/recommend/dislike`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/record_recent_album.js b/module/record_recent_album.js index e76454e..9c5b03f 100644 --- a/module/record_recent_album.js +++ b/module/record_recent_album.js @@ -7,12 +7,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/play-record/album/list`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/record_recent_dj.js b/module/record_recent_dj.js index fb80513..8eabaef 100644 --- a/module/record_recent_dj.js +++ b/module/record_recent_dj.js @@ -7,12 +7,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/play-record/djradio/list`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/record_recent_playlist.js b/module/record_recent_playlist.js index 4c3ac99..3af0e50 100644 --- a/module/record_recent_playlist.js +++ b/module/record_recent_playlist.js @@ -7,12 +7,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/play-record/playlist/list`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/record_recent_song.js b/module/record_recent_song.js index cb38223..636d4fe 100644 --- a/module/record_recent_song.js +++ b/module/record_recent_song.js @@ -7,12 +7,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/play-record/song/list`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/record_recent_video.js b/module/record_recent_video.js index dbc7bb2..1d5cadb 100644 --- a/module/record_recent_video.js +++ b/module/record_recent_video.js @@ -7,12 +7,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/play-record/newvideo/list`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/record_recent_voice.js b/module/record_recent_voice.js index 05236dc..661da9f 100644 --- a/module/record_recent_voice.js +++ b/module/record_recent_voice.js @@ -7,12 +7,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/play-record/voice/list`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/register_anonimous.js b/module/register_anonimous.js index 903a31c..c21c336 100644 --- a/module/register_anonimous.js +++ b/module/register_anonimous.js @@ -41,13 +41,7 @@ module.exports = async (query, request) => { 'POST', `https://music.163.com/api/register/anonimous`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) if (result.body.code === 200) { result = { diff --git a/module/register_cellphone.js b/module/register_cellphone.js index 5083792..34a3c63 100644 --- a/module/register_cellphone.js +++ b/module/register_cellphone.js @@ -12,11 +12,10 @@ module.exports = (query, request) => { nickname: query.nickname, countrycode: query.countrycode || '86', } - return request('POST', `https://music.163.com/api/register/cellphone`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/register/cellphone`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/related_allvideo.js b/module/related_allvideo.js index feb2393..6421a33 100644 --- a/module/related_allvideo.js +++ b/module/related_allvideo.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/cloudvideo/v1/allvideo/rcmd`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/resource_like.js b/module/resource_like.js index 654e202..82287d7 100644 --- a/module/resource_like.js +++ b/module/resource_like.js @@ -15,12 +15,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/resource/${query.t}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/scrobble.js b/module/scrobble.js index 4e566a9..390bd87 100644 --- a/module/scrobble.js +++ b/module/scrobble.js @@ -20,11 +20,10 @@ module.exports = (query, request) => { ]), } - return request('POST', `https://music.163.com/weapi/feedback/weblog`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/feedback/weblog`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/search.js b/module/search.js index da99b42..451b5f9 100644 --- a/module/search.js +++ b/module/search.js @@ -9,13 +9,12 @@ module.exports = (query, request) => { limit: query.limit || 30, offset: query.offset || 0, } - return request('POST', `https://music.163.com/api/search/voice/get`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/search/voice/get`, + data, + createOption(query, 'weapi'), + ) } query.cookie.os = 'pc' const data = { @@ -24,11 +23,10 @@ module.exports = (query, request) => { limit: query.limit || 30, offset: query.offset || 0, } - return request('POST', `https://music.163.com/weapi/search/get`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/search/get`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/search_hot.js b/module/search_hot.js index cc561b3..95fc07c 100644 --- a/module/search_hot.js +++ b/module/search_hot.js @@ -6,11 +6,7 @@ module.exports = (query, request) => { type: 1111, } return request('POST', `https://music.163.com/weapi/search/hot`, data, { - crypto: 'weapi', + ...createOption(query, 'weapi'), uaType: 'mobile', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, }) } diff --git a/module/search_hot_detail.js b/module/search_hot_detail.js index 6c06183..7c74e9b 100644 --- a/module/search_hot_detail.js +++ b/module/search_hot_detail.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/hotsearchlist/get`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/search_multimatch.js b/module/search_multimatch.js index 0a54ba4..15549af 100644 --- a/module/search_multimatch.js +++ b/module/search_multimatch.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/search/suggest/multimatch`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/search_suggest.js b/module/search_suggest.js index 49a2dd8..53d4cd9 100644 --- a/module/search_suggest.js +++ b/module/search_suggest.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/search/suggest/` + type, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/send_playlist.js b/module/send_playlist.js index a345dec..406695e 100644 --- a/module/send_playlist.js +++ b/module/send_playlist.js @@ -8,11 +8,10 @@ module.exports = (query, request) => { msg: query.msg, userIds: '[' + query.user_ids + ']', } - return request('POST', `https://music.163.com/weapi/msg/private/send`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/msg/private/send`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/send_text.js b/module/send_text.js index acf860a..e49e7f5 100644 --- a/module/send_text.js +++ b/module/send_text.js @@ -7,11 +7,10 @@ module.exports = (query, request) => { msg: query.msg, userIds: '[' + query.user_ids + ']', } - return request('POST', `https://music.163.com/weapi/msg/private/send`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/msg/private/send`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/setting.js b/module/setting.js index ff5d019..fed7977 100644 --- a/module/setting.js +++ b/module/setting.js @@ -3,11 +3,10 @@ const createOption = require('../util/option.js') module.exports = (query, request) => { const data = {} - return request('POST', `https://music.163.com/api/user/setting`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/user/setting`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/share_resource.js b/module/share_resource.js index cdf21d0..543793c 100644 --- a/module/share_resource.js +++ b/module/share_resource.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/share/friends/resource`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/sign_happy_info.js b/module/sign_happy_info.js index 31c50f1..6311218 100644 --- a/module/sign_happy_info.js +++ b/module/sign_happy_info.js @@ -1,11 +1,10 @@ const createOption = require('../util/option.js') module.exports = (query, request) => { const data = {} - return request('POST', `https://music.163.com/api/sign/happy/info`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/sign/happy/info`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/signin_progress.js b/module/signin_progress.js index 045fefb..2d23db2 100644 --- a/module/signin_progress.js +++ b/module/signin_progress.js @@ -9,12 +9,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/act/modules/signin/v2/progress`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/simi_artist.js b/module/simi_artist.js index a8c1a74..57c810b 100644 --- a/module/simi_artist.js +++ b/module/simi_artist.js @@ -8,12 +8,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/discovery/simiArtist`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/simi_mv.js b/module/simi_mv.js index 44797b0..8318ae9 100644 --- a/module/simi_mv.js +++ b/module/simi_mv.js @@ -5,11 +5,10 @@ module.exports = (query, request) => { const data = { mvid: query.mvid, } - return request('POST', `https://music.163.com/weapi/discovery/simiMV`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/discovery/simiMV`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/simi_playlist.js b/module/simi_playlist.js index d6daf27..a2fd48e 100644 --- a/module/simi_playlist.js +++ b/module/simi_playlist.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/discovery/simiPlaylist`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/simi_song.js b/module/simi_song.js index 15df93c..1b7016e 100644 --- a/module/simi_song.js +++ b/module/simi_song.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/v1/discovery/simiSong`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/simi_user.js b/module/simi_user.js index cf4f39a..effcc6c 100644 --- a/module/simi_user.js +++ b/module/simi_user.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/discovery/simiUser`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/song_detail.js b/module/song_detail.js index 39fb4ad..70e2c17 100644 --- a/module/song_detail.js +++ b/module/song_detail.js @@ -6,11 +6,10 @@ module.exports = (query, request) => { const data = { c: '[' + query.ids.map((id) => '{"id":' + id + '}').join(',') + ']', } - return request('POST', `https://music.163.com/api/v3/song/detail`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/v3/song/detail`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/song_order_update.js b/module/song_order_update.js index e87edf6..85b7cf5 100644 --- a/module/song_order_update.js +++ b/module/song_order_update.js @@ -12,13 +12,6 @@ module.exports = (query, request) => { 'POST', `http://interface.music.163.com/api/playlist/manipulate/tracks`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - url: '/api/playlist/desc/update', - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/song_purchased.js b/module/song_purchased.js index ff7f103..1229eed 100644 --- a/module/song_purchased.js +++ b/module/song_purchased.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/single/mybought/song/list`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/style_album.js b/module/style_album.js index 843931b..d48d364 100644 --- a/module/style_album.js +++ b/module/style_album.js @@ -12,12 +12,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/style-tag/home/album`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/style_artist.js b/module/style_artist.js index ee61d1c..bdca224 100644 --- a/module/style_artist.js +++ b/module/style_artist.js @@ -12,12 +12,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/style-tag/home/artist`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/style_detail.js b/module/style_detail.js index 8b252ae..8c1097c 100644 --- a/module/style_detail.js +++ b/module/style_detail.js @@ -9,12 +9,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/style-tag/home/head`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/style_list.js b/module/style_list.js index 9b68c5e..01328ce 100644 --- a/module/style_list.js +++ b/module/style_list.js @@ -3,11 +3,10 @@ const createOption = require('../util/option.js') module.exports = (query, request) => { const data = {} - return request('POST', `https://music.163.com/api/tag/list/get`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/tag/list/get`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/style_playlist.js b/module/style_playlist.js index b277c12..a41b6f1 100644 --- a/module/style_playlist.js +++ b/module/style_playlist.js @@ -12,12 +12,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/style-tag/home/playlist`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/style_preference.js b/module/style_preference.js index d4fcfa7..84f6959 100644 --- a/module/style_preference.js +++ b/module/style_preference.js @@ -7,12 +7,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/tag/my/preference/get`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/style_song.js b/module/style_song.js index 037f319..0172fab 100644 --- a/module/style_song.js +++ b/module/style_song.js @@ -12,12 +12,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/style-tag/home/song`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/top_album.js b/module/top_album.js index 4018a26..fd5579d 100644 --- a/module/top_album.js +++ b/module/top_album.js @@ -18,12 +18,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/discovery/new/albums/area`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/top_artists.js b/module/top_artists.js index 22d6798..281c104 100644 --- a/module/top_artists.js +++ b/module/top_artists.js @@ -7,11 +7,10 @@ module.exports = (query, request) => { offset: query.offset || 0, total: true, } - return request('POST', `https://music.163.com/weapi/artist/top`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/artist/top`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/top_list.js b/module/top_list.js index 80350b7..5617e89 100644 --- a/module/top_list.js +++ b/module/top_list.js @@ -22,12 +22,6 @@ module.exports = (query, request) => { 'POST', `https://interface3.music.163.com/api/playlist/v4/detail`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/top_mv.js b/module/top_mv.js index 8fc42d2..d104534 100644 --- a/module/top_mv.js +++ b/module/top_mv.js @@ -8,11 +8,10 @@ module.exports = (query, request) => { offset: query.offset || 0, total: true, } - return request('POST', `https://music.163.com/weapi/mv/toplist`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/mv/toplist`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/top_playlist.js b/module/top_playlist.js index 23ead22..5e69114 100644 --- a/module/top_playlist.js +++ b/module/top_playlist.js @@ -13,13 +13,7 @@ module.exports = async (query, request) => { 'POST', `https://music.163.com/weapi/playlist/list`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) const result = JSON.stringify(res).replace( /avatarImgId_str/g, diff --git a/module/top_playlist_highquality.js b/module/top_playlist_highquality.js index eb5507c..ccc331b 100644 --- a/module/top_playlist_highquality.js +++ b/module/top_playlist_highquality.js @@ -12,12 +12,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/playlist/highquality/list`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/top_song.js b/module/top_song.js index 1a18755..57e57a7 100644 --- a/module/top_song.js +++ b/module/top_song.js @@ -12,12 +12,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/v1/discovery/new/songs`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/topic_detail.js b/module/topic_detail.js index b3d64d0..af6ee3f 100644 --- a/module/topic_detail.js +++ b/module/topic_detail.js @@ -3,11 +3,10 @@ module.exports = (query, request) => { const data = { actid: query.actid, } - return request('POST', `https://music.163.com/api/act/detail`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/act/detail`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/topic_detail_event_hot.js b/module/topic_detail_event_hot.js index 022364f..9fe2273 100644 --- a/module/topic_detail_event_hot.js +++ b/module/topic_detail_event_hot.js @@ -3,11 +3,10 @@ module.exports = (query, request) => { const data = { actid: query.actid, } - return request('POST', `https://music.163.com/api/act/event/hot`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/act/event/hot`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/topic_sublist.js b/module/topic_sublist.js index 34ddff4..6dc103c 100644 --- a/module/topic_sublist.js +++ b/module/topic_sublist.js @@ -7,11 +7,10 @@ module.exports = (query, request) => { offset: query.offset || 0, total: true, } - return request('POST', `https://music.163.com/api/topic/sublist`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/topic/sublist`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/toplist_artist.js b/module/toplist_artist.js index 648b73d..d2462b7 100644 --- a/module/toplist_artist.js +++ b/module/toplist_artist.js @@ -8,11 +8,10 @@ module.exports = (query, request) => { offset: 0, total: true, } - return request('POST', `https://music.163.com/weapi/toplist/artist`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/toplist/artist`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/toplist_detail.js b/module/toplist_detail.js index 8965f94..f9a37ef 100644 --- a/module/toplist_detail.js +++ b/module/toplist_detail.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/toplist/detail`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/ugc_detail.js b/module/ugc_detail.js index 446c435..c5f3f86 100644 --- a/module/ugc_detail.js +++ b/module/ugc_detail.js @@ -13,11 +13,10 @@ module.exports = (query, request) => { //曲库纠错 ARTIST:1 ALBUM:2 SONG:3 MV:4 LYRIC:5 TLYRIC:6 //曲库补充 ALBUM:101 MV:103 } - return request('POST', `https://music.163.com/weapi/rep/ugc/detail`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/rep/ugc/detail`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/user_account.js b/module/user_account.js index 2d116fe..daf506a 100644 --- a/module/user_account.js +++ b/module/user_account.js @@ -1,11 +1,10 @@ const createOption = require('../util/option.js') module.exports = (query, request) => { const data = {} - return request('POST', `https://music.163.com/api/nuser/account/get`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/nuser/account/get`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/user_audio.js b/module/user_audio.js index 73b8416..55a1386 100644 --- a/module/user_audio.js +++ b/module/user_audio.js @@ -9,12 +9,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/djradio/get/byuser`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/user_binding.js b/module/user_binding.js index 6437cca..8f72a46 100644 --- a/module/user_binding.js +++ b/module/user_binding.js @@ -5,12 +5,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/v1/user/bindings/${query.uid}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/user_bindingcellphone.js b/module/user_bindingcellphone.js index b724164..287e225 100644 --- a/module/user_bindingcellphone.js +++ b/module/user_bindingcellphone.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/user/bindingCellphone`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/user_cloud.js b/module/user_cloud.js index 587506e..88e4d59 100644 --- a/module/user_cloud.js +++ b/module/user_cloud.js @@ -6,11 +6,10 @@ module.exports = (query, request) => { limit: query.limit || 30, offset: query.offset || 0, } - return request('POST', `https://music.163.com/api/v1/cloud/get`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/v1/cloud/get`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/user_cloud_del.js b/module/user_cloud_del.js index 77bff38..d3f1d37 100644 --- a/module/user_cloud_del.js +++ b/module/user_cloud_del.js @@ -5,11 +5,10 @@ module.exports = (query, request) => { const data = { songIds: [query.id], } - return request('POST', `https://music.163.com/weapi/cloud/del`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/cloud/del`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/user_cloud_detail.js b/module/user_cloud_detail.js index 74388dd..a35d7f5 100644 --- a/module/user_cloud_detail.js +++ b/module/user_cloud_detail.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/v1/cloud/get/byids`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/user_comment_history.js b/module/user_comment_history.js index 43568ad..da6b922 100644 --- a/module/user_comment_history.js +++ b/module/user_comment_history.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/comment/user/comment/history`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/user_detail.js b/module/user_detail.js index 02b20fe..8b10d6d 100644 --- a/module/user_detail.js +++ b/module/user_detail.js @@ -6,13 +6,7 @@ module.exports = async (query, request) => { 'POST', `https://music.163.com/weapi/v1/user/detail/${query.uid}`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) const result = JSON.stringify(res).replace( /avatarImgId_str/g, diff --git a/module/user_dj.js b/module/user_dj.js index 60e9ca1..6b630bd 100644 --- a/module/user_dj.js +++ b/module/user_dj.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/dj/program/${query.uid}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/user_follows.js b/module/user_follows.js index 392a354..cd77c87 100644 --- a/module/user_follows.js +++ b/module/user_follows.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/user/getfollows/${query.uid}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/user_level.js b/module/user_level.js index 3f764c1..8aadef2 100644 --- a/module/user_level.js +++ b/module/user_level.js @@ -3,11 +3,10 @@ const createOption = require('../util/option.js') module.exports = (query, request) => { const data = {} - return request('POST', `https://music.163.com/weapi/user/level`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/user/level`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/user_playlist.js b/module/user_playlist.js index f5ab637..93c6a71 100644 --- a/module/user_playlist.js +++ b/module/user_playlist.js @@ -8,11 +8,10 @@ module.exports = (query, request) => { offset: query.offset || 0, includeVideo: true, } - return request('POST', `https://music.163.com/api/user/playlist`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/user/playlist`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/user_record.js b/module/user_record.js index b49fb12..bed9cac 100644 --- a/module/user_record.js +++ b/module/user_record.js @@ -6,11 +6,10 @@ module.exports = (query, request) => { uid: query.uid, type: query.type || 0, // 1: 最近一周, 0: 所有时间 } - return request('POST', `https://music.163.com/weapi/v1/play/record`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/weapi/v1/play/record`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/user_replacephone.js b/module/user_replacephone.js index 6838195..2daf6c4 100644 --- a/module/user_replacephone.js +++ b/module/user_replacephone.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/user/replaceCellphone`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/user_subcount.js b/module/user_subcount.js index ddb8fc3..7d3f9a4 100644 --- a/module/user_subcount.js +++ b/module/user_subcount.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/subcount`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/user_update.js b/module/user_update.js index d9b4365..edfde9d 100644 --- a/module/user_update.js +++ b/module/user_update.js @@ -15,12 +15,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/user/profile/update`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/verify_getQr.js b/module/verify_getQr.js index 0c3c89f..ca62876 100644 --- a/module/verify_getQr.js +++ b/module/verify_getQr.js @@ -16,13 +16,7 @@ module.exports = async (query, request) => { 'POST', `https://music.163.com/weapi/frontrisk/verify/getqrcode`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) const result = `https://st.music.163.com/encrypt-pages?qrCode=${ res.body.data.qrCode diff --git a/module/verify_qrcodestatus.js b/module/verify_qrcodestatus.js index 008e6d5..92294fa 100644 --- a/module/verify_qrcodestatus.js +++ b/module/verify_qrcodestatus.js @@ -7,13 +7,7 @@ module.exports = async (query, request) => { 'POST', `https://music.163.com/weapi/frontrisk/verify/qrcodestatus`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) return res } diff --git a/module/video_category_list.js b/module/video_category_list.js index 29b99f4..91ace5f 100644 --- a/module/video_category_list.js +++ b/module/video_category_list.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/cloudvideo/category/list`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/video_detail.js b/module/video_detail.js index 81ae4f9..f01e9ef 100644 --- a/module/video_detail.js +++ b/module/video_detail.js @@ -9,12 +9,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/cloudvideo/v1/video/detail`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/video_detail_info.js b/module/video_detail_info.js index a9c1f43..a7f086d 100644 --- a/module/video_detail_info.js +++ b/module/video_detail_info.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/comment/commentthread/info`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/video_group.js b/module/video_group.js index 3b7455f..5f21396 100644 --- a/module/video_group.js +++ b/module/video_group.js @@ -12,12 +12,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/videotimeline/videogroup/otherclient/get`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/video_group_list.js b/module/video_group_list.js index ef4f9d5..9cc4c7c 100644 --- a/module/video_group_list.js +++ b/module/video_group_list.js @@ -7,12 +7,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/cloudvideo/group/list`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/video_sub.js b/module/video_sub.js index 523e289..26ef9f2 100644 --- a/module/video_sub.js +++ b/module/video_sub.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/cloudvideo/video/${query.t}`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/video_timeline_all.js b/module/video_timeline_all.js index 661a984..23ff536 100644 --- a/module/video_timeline_all.js +++ b/module/video_timeline_all.js @@ -13,12 +13,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/videotimeline/otherclient/get`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/video_timeline_recommend.js b/module/video_timeline_recommend.js index ecb1d34..a22e013 100644 --- a/module/video_timeline_recommend.js +++ b/module/video_timeline_recommend.js @@ -9,11 +9,10 @@ module.exports = (query, request) => { needUrl: '1', resolution: '480', } - return request('POST', `https://music.163.com/api/videotimeline/get`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/videotimeline/get`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/video_url.js b/module/video_url.js index 7c747e2..ecc5091 100644 --- a/module/video_url.js +++ b/module/video_url.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/cloudvideo/playurl`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/vip_growthpoint.js b/module/vip_growthpoint.js index 1932da0..2091a4e 100644 --- a/module/vip_growthpoint.js +++ b/module/vip_growthpoint.js @@ -7,12 +7,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/vipnewcenter/app/level/growhpoint/basic`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/vip_growthpoint_details.js b/module/vip_growthpoint_details.js index aa439ef..0fbbbde 100644 --- a/module/vip_growthpoint_details.js +++ b/module/vip_growthpoint_details.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/vipnewcenter/app/level/growth/details`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/vip_growthpoint_get.js b/module/vip_growthpoint_get.js index b5b06b9..fc97a7a 100644 --- a/module/vip_growthpoint_get.js +++ b/module/vip_growthpoint_get.js @@ -9,12 +9,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/vipnewcenter/app/level/task/reward/get`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/vip_info.js b/module/vip_info.js index 01c188e..42dfa4d 100644 --- a/module/vip_info.js +++ b/module/vip_info.js @@ -8,12 +8,6 @@ module.exports = (query, request) => { { userId: query.uid || '', }, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/vip_info_v2.js b/module/vip_info_v2.js index f3c3673..717d970 100644 --- a/module/vip_info_v2.js +++ b/module/vip_info_v2.js @@ -8,12 +8,6 @@ module.exports = (query, request) => { { userId: query.uid || '', }, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/vip_tasks.js b/module/vip_tasks.js index 8ba8baa..bdbbf21 100644 --- a/module/vip_tasks.js +++ b/module/vip_tasks.js @@ -7,12 +7,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/vipnewcenter/app/level/task/list`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/vip_timemachine.js b/module/vip_timemachine.js index ebf140c..fc86a74 100644 --- a/module/vip_timemachine.js +++ b/module/vip_timemachine.js @@ -13,12 +13,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/vipmusic/newrecord/weekflow`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/voice_delete.js b/module/voice_delete.js index 7d26cea..f41aeab 100644 --- a/module/voice_delete.js +++ b/module/voice_delete.js @@ -7,12 +7,6 @@ module.exports = (query, request) => { 'POST', 'https://interface.music.163.com/api/content/voice/delete', data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/voice_detail.js b/module/voice_detail.js index 002229e..e66a3ff 100644 --- a/module/voice_detail.js +++ b/module/voice_detail.js @@ -7,12 +7,6 @@ module.exports = (query, request) => { 'POST', `https://interface.music.163.com/weapi/voice/workbench/voice/detail`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/voice_upload.js b/module/voice_upload.js index 04ef6e6..f2f4ee5 100644 --- a/module/voice_upload.js +++ b/module/voice_upload.js @@ -48,12 +48,7 @@ module.exports = async (query, request) => { nos_product: 0, type: 'other', }, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - }, + createOption(query, 'weapi'), ) const objectKey = tokenRes.body.result.objectKey.replace('/', '%2F') @@ -146,10 +141,7 @@ module.exports = async (query, request) => { ]), }, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, + ...createOption(query, 'weapi'), headers: { 'x-nos-token': tokenRes.body.result.token, }, @@ -181,10 +173,7 @@ module.exports = async (query, request) => { ]), }, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, + ...createOption(query, 'weapi'), headers: { 'x-nos-token': tokenRes.body.result.token, }, diff --git a/module/voicelist_detail.js b/module/voicelist_detail.js index 73488f3..1bbb420 100644 --- a/module/voicelist_detail.js +++ b/module/voicelist_detail.js @@ -7,12 +7,6 @@ module.exports = (query, request) => { 'POST', `https://interface.music.163.com/weapi/voice/workbench/voicelist/detail`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/voicelist_list.js b/module/voicelist_list.js index c196d4a..0462270 100644 --- a/module/voicelist_list.js +++ b/module/voicelist_list.js @@ -9,12 +9,6 @@ module.exports = (query, request) => { 'POST', `https://interface.music.163.com/weapi/voice/workbench/voices/by/voicelist`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/voicelist_list_search.js b/module/voicelist_list_search.js index 09cf97d..1d847fc 100644 --- a/module/voicelist_list_search.js +++ b/module/voicelist_list_search.js @@ -14,12 +14,6 @@ module.exports = (query, request) => { 'POST', 'https://interface.music.163.com/api/voice/workbench/voice/list', data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/voicelist_search.js b/module/voicelist_search.js index 99e8fdd..3d16a90 100644 --- a/module/voicelist_search.js +++ b/module/voicelist_search.js @@ -10,12 +10,6 @@ module.exports = (query, request) => { 'POST', `https://interface.music.163.com/weapi/voice/workbench/voicelist/search`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/voicelist_trans.js b/module/voicelist_trans.js index e747d14..bff37ab 100644 --- a/module/voicelist_trans.js +++ b/module/voicelist_trans.js @@ -11,12 +11,6 @@ module.exports = (query, request) => { 'POST', `https://interface.music.163.com/api/voice/workbench/radio/program/trans`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/weblog.js b/module/weblog.js index 7c84c96..01871aa 100644 --- a/module/weblog.js +++ b/module/weblog.js @@ -6,12 +6,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/feedback/weblog`, query.data || {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/yunbei.js b/module/yunbei.js index 8c28069..d05e979 100644 --- a/module/yunbei.js +++ b/module/yunbei.js @@ -2,11 +2,10 @@ const createOption = require('../util/option.js') module.exports = (query, request) => { const data = {} // /api/point/today/get - return request('POST', `https://music.163.com/api/point/signed/get`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/point/signed/get`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/yunbei_info.js b/module/yunbei_info.js index 38845d8..c2d5689 100644 --- a/module/yunbei_info.js +++ b/module/yunbei_info.js @@ -1,11 +1,10 @@ const createOption = require('../util/option.js') module.exports = (query, request) => { const data = {} - return request('POST', `https://music.163.com/api/v1/user/info`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/v1/user/info`, + data, + createOption(query, 'weapi'), + ) } diff --git a/module/yunbei_rcmd_song.js b/module/yunbei_rcmd_song.js index 32138ea..c4b6e3d 100644 --- a/module/yunbei_rcmd_song.js +++ b/module/yunbei_rcmd_song.js @@ -13,12 +13,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/yunbei/rcmd/song/submit`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/yunbei_rcmd_song_history.js b/module/yunbei_rcmd_song_history.js index d7b4461..3bde0ab 100644 --- a/module/yunbei_rcmd_song_history.js +++ b/module/yunbei_rcmd_song_history.js @@ -12,12 +12,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/weapi/yunbei/rcmd/song/history/list`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/yunbei_sign.js b/module/yunbei_sign.js index b37b1ee..5bcc7f6 100644 --- a/module/yunbei_sign.js +++ b/module/yunbei_sign.js @@ -5,12 +5,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/pointmall/user/sign`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/yunbei_task_finish.js b/module/yunbei_task_finish.js index 3e0eee0..7eaad7c 100644 --- a/module/yunbei_task_finish.js +++ b/module/yunbei_task_finish.js @@ -8,12 +8,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/usertool/task/point/receive`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/yunbei_tasks.js b/module/yunbei_tasks.js index 256eca3..d846819 100644 --- a/module/yunbei_tasks.js +++ b/module/yunbei_tasks.js @@ -5,12 +5,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/usertool/task/list/all`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/yunbei_tasks_todo.js b/module/yunbei_tasks_todo.js index 1a155cb..5326414 100644 --- a/module/yunbei_tasks_todo.js +++ b/module/yunbei_tasks_todo.js @@ -5,12 +5,6 @@ module.exports = (query, request) => { 'POST', `https://music.163.com/api/usertool/task/todo/query`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }, + createOption(query, 'weapi'), ) } diff --git a/module/yunbei_today.js b/module/yunbei_today.js index 07129b0..14a906c 100644 --- a/module/yunbei_today.js +++ b/module/yunbei_today.js @@ -1,11 +1,10 @@ const createOption = require('../util/option.js') module.exports = (query, request) => { const data = {} - return request('POST', `https://music.163.com/api/point/today/get`, data, { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - realIP: query.realIP, - }) + return request( + 'POST', + `https://music.163.com/api/point/today/get`, + data, + createOption(query, 'weapi'), + ) } diff --git a/plugins/songUpload.js b/plugins/songUpload.js index c5a39b4..f23c58f 100644 --- a/plugins/songUpload.js +++ b/plugins/songUpload.js @@ -26,12 +26,7 @@ module.exports = async (query, request) => { type: 'audio', md5: query.songFile.md5, }, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - }, + createOption(query, 'weapi'), ) // 上传 diff --git a/plugins/upload.js b/plugins/upload.js index 398aa95..cf38095 100644 --- a/plugins/upload.js +++ b/plugins/upload.js @@ -15,12 +15,7 @@ module.exports = async (query, request) => { 'POST', `https://music.163.com/weapi/nos/token/alloc`, data, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - }, + createOption(query, 'weapi'), ) // 上传图片 const res2 = await axios({ @@ -40,12 +35,7 @@ module.exports = async (query, request) => { 'GET', `https://music.163.com/upload/img/op?id=${res.body.result.docId}&op=${imgX}y${imgY}y${imgSize}y${imgSize}`, {}, - { - crypto: 'weapi', - cookie: query.cookie, - ua: query.ua || '', - proxy: query.proxy, - }, + createOption(query, 'weapi'), ) return {