From b84fb38a7d20bf01ecdf44344174958329678252 Mon Sep 17 00:00:00 2001 From: Nzix Date: Sun, 30 Sep 2018 21:31:01 +0800 Subject: [PATCH] fix copy faults --- module/check_music.js | 17 +++++++++-------- module/mv_first.js | 4 ++-- module/resource_like.js | 2 +- module/search_suggest.js | 2 +- module/user_audio.js | 2 +- util/request.js | 9 +++++---- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/module/check_music.js b/module/check_music.js index a1f04f2..fc53e47 100644 --- a/module/check_music.js +++ b/module/check_music.js @@ -39,15 +39,16 @@ module.exports = (query, request) => { {crypto: 'weapi', cookie: query.cookie, proxy: query.proxy} ) .then(response => { - let body = JSON.parse(response.body) - if (body.code == 200) { - if (body.data[0].code == 200){ - response.body = JSON.stringify({success: true, message: 'ok'}) + if (response.body.code == 200) { + if (response.body.data[0].code == 200){ + response.body = {success: true, message: 'ok'} return response } } - response.code = 404 - response.body = JSON.stringify({success: false, message: '亲爱的,暂无版权'}) - return Promise.reject(response) + else{ + response.code = 404 + response.body = {success: false, message: '亲爱的,暂无版权'} + return Promise.reject(response) + } }) -} +} \ No newline at end of file diff --git a/module/mv_first.js b/module/mv_first.js index 9df6874..79103ec 100644 --- a/module/mv_first.js +++ b/module/mv_first.js @@ -22,8 +22,8 @@ module.exports = (query, request) => { const data = { - // 'offset': req.query.offset || 0, - limit: req.query.limit || 30, + // 'offset': query.offset || 0, + limit: query.limit || 30, total: true } return request( diff --git a/module/resource_like.js b/module/resource_like.js index ee83bb9..9e8a9df 100644 --- a/module/resource_like.js +++ b/module/resource_like.js @@ -21,7 +21,7 @@ module.exports = (query, request) => { query.t = (query.t == 1 ? "like" : "unlike") const data = { - threadId: req.query.id + threadId: query.id } return request( 'POST', `http://music.163.com/weapi/resource/${query.t}`, data, diff --git a/module/search_suggest.js b/module/search_suggest.js index 7d19c76..c734693 100644 --- a/module/search_suggest.js +++ b/module/search_suggest.js @@ -21,7 +21,7 @@ module.exports = (query, request) => { const data = { - s: req.query.keywords || '' + s: query.keywords || '' } return request( 'POST', `http://music.163.com/weapi/search/suggest/web`, data, diff --git a/module/user_audio.js b/module/user_audio.js index 1a92864..879cbfc 100644 --- a/module/user_audio.js +++ b/module/user_audio.js @@ -25,7 +25,7 @@ module.exports = (query, request) => { const data = { - userId: req.query.uid + userId: query.uid } return request( 'POST', `http://music.163.com/weapi/djradio/get/byuser`, data, diff --git a/util/request.js b/util/request.js index 7b65d77..1467340 100644 --- a/util/request.js +++ b/util/request.js @@ -48,8 +48,8 @@ function createRequest(method, url, data, options){ if(url.indexOf('music.163.com') != -1) headers['Referer'] = 'http://music.163.com' const answer = { - code: 500, - body: {code: 500}, + code: 502, + body: {code: 502}, cookie: [] } @@ -57,7 +57,7 @@ function createRequest(method, url, data, options){ {method: method, url: url, headers: headers, body: queryString.stringify(data), proxy: options.proxy}, (err, res, body) => { if(err){ - answer.body = {code: 500, msg: err.stack} + answer.body = {code: 502, msg: err.stack} reject(answer) } else{ @@ -70,9 +70,10 @@ function createRequest(method, url, data, options){ answer.body = body answer.code = res.statusCode } + answer.code = (answer.code < 100 || answer.code > 600) ? 400 : answer.code if(answer.code == 200) resolve(answer) - else + else reject(answer) } } -- GitLab