diff --git a/LICENSE b/LICENSE index 638a26fd..5bffae44 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ -The MIT License (MIT) +MIT License Copyright (c) 2013-2022 Binaryify +Copyright (c) 2026 MT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -9,13 +10,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/generateConfig.js b/generateConfig.js index d60e224c..a6408147 100644 --- a/generateConfig.js +++ b/generateConfig.js @@ -1,13 +1,14 @@ const fs = require('fs') const path = require('path') -const { register_anonimous } = require('./main') +const register_anonimous = require('./module/(auth)/register_anonimous') const { cookieToJson, generateRandomChineseIP } = require('./util/index') +const request = require('./util/request') const tmpPath = require('os').tmpdir() async function generateConfig() { global.cnIp = generateRandomChineseIP() try { - const res = await register_anonimous() + const res = await register_anonimous({}, request) const cookie = res.body.cookie if (cookie) { const cookieObj = cookieToJson(cookie) diff --git a/module/digitalAlbum_detail.js b/module/(album)/(digitalAlbum)/digitalAlbum_detail.js similarity index 78% rename from module/digitalAlbum_detail.js rename to module/(album)/(digitalAlbum)/digitalAlbum_detail.js index b9acf740..c1891a7f 100644 --- a/module/digitalAlbum_detail.js +++ b/module/(album)/(digitalAlbum)/digitalAlbum_detail.js @@ -1,6 +1,6 @@ // 数字专辑详情 -const createOption = require('../util/option.js') +const createOption = require('../../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/digitalAlbum_ordering.js b/module/(album)/(digitalAlbum)/digitalAlbum_ordering.js similarity index 88% rename from module/digitalAlbum_ordering.js rename to module/(album)/(digitalAlbum)/digitalAlbum_ordering.js index 7ac833b7..f5761cdd 100644 --- a/module/digitalAlbum_ordering.js +++ b/module/(album)/(digitalAlbum)/digitalAlbum_ordering.js @@ -1,6 +1,6 @@ // 购买数字专辑 -const createOption = require('../util/option.js') +const createOption = require('../../../util/option.js') module.exports = (query, request) => { const data = { business: 'Album', diff --git a/module/digitalAlbum_purchased.js b/module/(album)/(digitalAlbum)/digitalAlbum_purchased.js similarity index 82% rename from module/digitalAlbum_purchased.js rename to module/(album)/(digitalAlbum)/digitalAlbum_purchased.js index f738505a..ce331e0d 100644 --- a/module/digitalAlbum_purchased.js +++ b/module/(album)/(digitalAlbum)/digitalAlbum_purchased.js @@ -1,6 +1,6 @@ // 我的数字专辑 -const createOption = require('../util/option.js') +const createOption = require('../../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 30, diff --git a/module/digitalAlbum_sales.js b/module/(album)/(digitalAlbum)/digitalAlbum_sales.js similarity index 80% rename from module/digitalAlbum_sales.js rename to module/(album)/(digitalAlbum)/digitalAlbum_sales.js index 2f333830..ce2f7e64 100644 --- a/module/digitalAlbum_sales.js +++ b/module/(album)/(digitalAlbum)/digitalAlbum_sales.js @@ -1,6 +1,6 @@ // 数字专辑销量 -const createOption = require('../util/option.js') +const createOption = require('../../../util/option.js') module.exports = (query, request) => { const data = { albumIds: query.ids, diff --git a/module/album.js b/module/(album)/album.js similarity index 72% rename from module/album.js rename to module/(album)/album.js index 81198c9c..17f23076 100644 --- a/module/album.js +++ b/module/(album)/album.js @@ -1,6 +1,6 @@ // 专辑内容 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request(`/api/v1/album/${query.id}`, {}, createOption(query, 'weapi')) } diff --git a/module/album_detail.js b/module/(album)/album_detail.js similarity index 79% rename from module/album_detail.js rename to module/(album)/album_detail.js index d6e6c01f..22ee0592 100644 --- a/module/album_detail.js +++ b/module/(album)/album_detail.js @@ -1,5 +1,5 @@ // 数字专辑详情 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/album_detail_dynamic.js b/module/(album)/album_detail_dynamic.js similarity index 79% rename from module/album_detail_dynamic.js rename to module/(album)/album_detail_dynamic.js index a7510457..4f1635cf 100644 --- a/module/album_detail_dynamic.js +++ b/module/(album)/album_detail_dynamic.js @@ -1,5 +1,5 @@ // 专辑动态信息 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/album_list.js b/module/(album)/album_list.js similarity index 87% rename from module/album_list.js rename to module/(album)/album_list.js index 5bd86f06..33dd7044 100644 --- a/module/album_list.js +++ b/module/(album)/album_list.js @@ -1,5 +1,5 @@ // 数字专辑-新碟上架 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 30, diff --git a/module/album_list_style.js b/module/(album)/album_list_style.js similarity index 86% rename from module/album_list_style.js rename to module/(album)/album_list_style.js index 45602065..b7815d24 100644 --- a/module/album_list_style.js +++ b/module/(album)/album_list_style.js @@ -1,5 +1,5 @@ // 数字专辑-语种风格馆 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 10, diff --git a/module/album_new.js b/module/(album)/album_new.js similarity index 85% rename from module/album_new.js rename to module/(album)/album_new.js index 69d5e09c..ce3b4240 100644 --- a/module/album_new.js +++ b/module/(album)/album_new.js @@ -1,5 +1,5 @@ // 全部新碟 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 30, diff --git a/module/album_newest.js b/module/(album)/album_newest.js similarity index 71% rename from module/album_newest.js rename to module/(album)/album_newest.js index c6810323..7118cec1 100644 --- a/module/album_newest.js +++ b/module/(album)/album_newest.js @@ -1,6 +1,6 @@ // 最新专辑 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request(`/api/discovery/newAlbum`, {}, createOption(query, 'weapi')) } diff --git a/module/album_privilege.js b/module/(album)/album_privilege.js similarity index 77% rename from module/album_privilege.js rename to module/(album)/album_privilege.js index 537780eb..ab71ec7b 100644 --- a/module/album_privilege.js +++ b/module/(album)/album_privilege.js @@ -1,6 +1,6 @@ // 获取专辑歌曲的音质 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/album_songsaleboard.js b/module/(album)/album_songsaleboard.js similarity index 89% rename from module/album_songsaleboard.js rename to module/(album)/album_songsaleboard.js index 07dea016..ffe141eb 100644 --- a/module/album_songsaleboard.js +++ b/module/(album)/album_songsaleboard.js @@ -1,5 +1,5 @@ // 数字专辑&数字单曲-榜单 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { let data = { albumType: query.albumType || 0, //0为数字专辑,1为数字单曲 diff --git a/module/album_sub.js b/module/(album)/album_sub.js similarity index 81% rename from module/album_sub.js rename to module/(album)/album_sub.js index e6d9aeb1..fc850757 100644 --- a/module/album_sub.js +++ b/module/(album)/album_sub.js @@ -1,6 +1,6 @@ // 收藏/取消收藏专辑 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { query.t = query.t == 1 ? 'sub' : 'unsub' const data = { diff --git a/module/album_sublist.js b/module/(album)/album_sublist.js similarity index 81% rename from module/album_sublist.js rename to module/(album)/album_sublist.js index 112cbaed..e5c5d975 100644 --- a/module/album_sublist.js +++ b/module/(album)/album_sublist.js @@ -1,6 +1,6 @@ // 已收藏专辑列表 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 25, diff --git a/module/artist_album.js b/module/(artist)/artist_album.js similarity index 83% rename from module/artist_album.js rename to module/(artist)/artist_album.js index 2077ad37..07611e95 100644 --- a/module/artist_album.js +++ b/module/(artist)/artist_album.js @@ -1,6 +1,6 @@ // 歌手专辑列表 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 30, diff --git a/module/artist_desc.js b/module/(artist)/artist_desc.js similarity index 60% rename from module/artist_desc.js rename to module/(artist)/artist_desc.js index dcf560c6..4c46104a 100644 --- a/module/artist_desc.js +++ b/module/(artist)/artist_desc.js @@ -1,9 +1,7 @@ // 歌手介绍 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { - const data = { - id: query.id, - } + const data = { id: query.id, } return request(`/api/artist/introduction`, data, createOption(query, 'weapi')) } diff --git a/module/artist_detail.js b/module/(artist)/artist_detail.js similarity index 74% rename from module/artist_detail.js rename to module/(artist)/artist_detail.js index 9d59a862..72666bc0 100644 --- a/module/artist_detail.js +++ b/module/(artist)/artist_detail.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/artist/head/info/get`, diff --git a/module/artist_detail_dynamic.js b/module/(artist)/artist_detail_dynamic.js similarity index 76% rename from module/artist_detail_dynamic.js rename to module/(artist)/artist_detail_dynamic.js index 6cc50504..608f2bb6 100644 --- a/module/artist_detail_dynamic.js +++ b/module/(artist)/artist_detail_dynamic.js @@ -1,6 +1,6 @@ // 歌手动态信息 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/artist_fans.js b/module/(artist)/artist_fans.js similarity index 81% rename from module/artist_fans.js rename to module/(artist)/artist_fans.js index a9ae59e5..cab5ed76 100644 --- a/module/artist_fans.js +++ b/module/(artist)/artist_fans.js @@ -1,6 +1,6 @@ // 歌手粉丝 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/artist_follow_count.js b/module/(artist)/artist_follow_count.js similarity index 79% rename from module/artist_follow_count.js rename to module/(artist)/artist_follow_count.js index c1529231..371ee6af 100644 --- a/module/artist_follow_count.js +++ b/module/(artist)/artist_follow_count.js @@ -1,6 +1,6 @@ // 歌手粉丝数量 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/artist_list.js b/module/(artist)/artist_list.js similarity index 91% rename from module/artist_list.js rename to module/(artist)/artist_list.js index 1bba50d7..52b48178 100644 --- a/module/artist_list.js +++ b/module/(artist)/artist_list.js @@ -1,6 +1,6 @@ // 歌手分类 -/* +/* type 取值 1:男歌手 2:女歌手 @@ -17,7 +17,7 @@ initial 取值 a-z/A-Z */ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { initial: isNaN(query.initial) diff --git a/module/artist_mv.js b/module/(artist)/artist_mv.js similarity index 82% rename from module/artist_mv.js rename to module/(artist)/artist_mv.js index 32e9118c..747c6ebc 100644 --- a/module/artist_mv.js +++ b/module/(artist)/artist_mv.js @@ -1,6 +1,6 @@ // 歌手相关MV -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { artistId: query.id, diff --git a/module/artist_new_mv.js b/module/(artist)/artist_new_mv.js similarity index 82% rename from module/artist_new_mv.js rename to module/(artist)/artist_new_mv.js index 4f83ad64..4f0c4049 100644 --- a/module/artist_new_mv.js +++ b/module/(artist)/artist_new_mv.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 20, diff --git a/module/artist_new_song.js b/module/(artist)/artist_new_song.js similarity index 82% rename from module/artist_new_song.js rename to module/(artist)/artist_new_song.js index daafb03b..736eb78a 100644 --- a/module/artist_new_song.js +++ b/module/(artist)/artist_new_song.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 20, diff --git a/module/artist_songs.js b/module/(artist)/artist_songs.js similarity index 84% rename from module/artist_songs.js rename to module/(artist)/artist_songs.js index 5d32bf95..047e37f9 100644 --- a/module/artist_songs.js +++ b/module/(artist)/artist_songs.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/artist_sub.js b/module/(artist)/artist_sub.js similarity index 83% rename from module/artist_sub.js rename to module/(artist)/artist_sub.js index 68d523d3..bddd44a1 100644 --- a/module/artist_sub.js +++ b/module/(artist)/artist_sub.js @@ -1,6 +1,6 @@ // 收藏与取消收藏歌手 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { query.t = query.t == 1 ? 'sub' : 'unsub' const data = { diff --git a/module/artist_sublist.js b/module/(artist)/artist_sublist.js similarity index 81% rename from module/artist_sublist.js rename to module/(artist)/artist_sublist.js index 7de56fe0..5ac8d2d0 100644 --- a/module/artist_sublist.js +++ b/module/(artist)/artist_sublist.js @@ -1,6 +1,6 @@ // 关注歌手列表 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 25, diff --git a/module/artist_top_song.js b/module/(artist)/artist_top_song.js similarity index 77% rename from module/artist_top_song.js rename to module/(artist)/artist_top_song.js index 12f5755c..0ab3feaa 100644 --- a/module/artist_top_song.js +++ b/module/(artist)/artist_top_song.js @@ -1,5 +1,5 @@ // 歌手热门 50 首歌曲 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/artist_video.js b/module/(artist)/artist_video.js similarity index 86% rename from module/artist_video.js rename to module/(artist)/artist_video.js index 7113422a..31b3f0ae 100644 --- a/module/artist_video.js +++ b/module/(artist)/artist_video.js @@ -1,6 +1,6 @@ // 歌手相关视频 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { artistId: query.id, diff --git a/module/artists.js b/module/(artist)/artists.js similarity index 72% rename from module/artists.js rename to module/(artist)/artists.js index e403fe85..1a4a0315 100644 --- a/module/artists.js +++ b/module/(artist)/artists.js @@ -1,6 +1,6 @@ // 歌手单曲 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request(`/api/v1/artist/${query.id}`, {}, createOption(query, 'weapi')) } diff --git a/module/captcha_sent.js b/module/(auth)/captcha_sent.js similarity index 83% rename from module/captcha_sent.js rename to module/(auth)/captcha_sent.js index fdf7231b..fc53f333 100644 --- a/module/captcha_sent.js +++ b/module/(auth)/captcha_sent.js @@ -1,6 +1,6 @@ // 发送验证码 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { ctcode: query.ctcode || '86', diff --git a/module/captcha_verify.js b/module/(auth)/captcha_verify.js similarity index 82% rename from module/captcha_verify.js rename to module/(auth)/captcha_verify.js index 403bec2f..89100fdb 100644 --- a/module/captcha_verify.js +++ b/module/(auth)/captcha_verify.js @@ -1,6 +1,6 @@ // 校验验证码 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { ctcode: query.ctcode || '86', diff --git a/module/cellphone_existence_check.js b/module/(auth)/cellphone_existence_check.js similarity index 82% rename from module/cellphone_existence_check.js rename to module/(auth)/cellphone_existence_check.js index 5d43126d..2e1f916d 100644 --- a/module/cellphone_existence_check.js +++ b/module/(auth)/cellphone_existence_check.js @@ -1,6 +1,6 @@ // 检测手机号码是否已注册 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { cellphone: query.phone, diff --git a/module/rebind.js b/module/(auth)/rebind.js similarity index 84% rename from module/rebind.js rename to module/(auth)/rebind.js index 117d2dcf..9eb12529 100644 --- a/module/rebind.js +++ b/module/(auth)/rebind.js @@ -1,6 +1,6 @@ // 更换手机 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { captcha: query.captcha, diff --git a/module/register_anonimous.js b/module/(auth)/register_anonimous.js similarity index 92% rename from module/register_anonimous.js rename to module/(auth)/register_anonimous.js index 48c773ca..342c707c 100644 --- a/module/register_anonimous.js +++ b/module/(auth)/register_anonimous.js @@ -3,8 +3,8 @@ const path = require('path') const fs = require('fs') const ID_XOR_KEY_1 = '3go8&$8*3*3h0k(2)2' -const createOption = require('../util/option.js') -const { generateDeviceId } = require('../util/index') +const createOption = require('../../util/option.js') +const { generateDeviceId } = require('../../util/index') // function getRandomFromList(list) { // return list[Math.floor(Math.random() * list.length)] diff --git a/module/register_cellphone.js b/module/(auth)/register_cellphone.js similarity index 88% rename from module/register_cellphone.js rename to module/(auth)/register_cellphone.js index 967672cf..d90f4667 100644 --- a/module/register_cellphone.js +++ b/module/(auth)/register_cellphone.js @@ -1,7 +1,7 @@ // 注册账号 const CryptoJS = require('crypto-js') -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { captcha: query.captcha, diff --git a/module/sign_happy_info.js b/module/(auth)/sign_happy_info.js similarity index 71% rename from module/sign_happy_info.js rename to module/(auth)/sign_happy_info.js index 7e4def1a..1724b9d2 100644 --- a/module/sign_happy_info.js +++ b/module/(auth)/sign_happy_info.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request(`/api/sign/happy/info`, data, createOption(query, 'weapi')) diff --git a/module/signin_progress.js b/module/(auth)/signin_progress.js similarity index 82% rename from module/signin_progress.js rename to module/(auth)/signin_progress.js index 12eae394..87ada3c8 100644 --- a/module/signin_progress.js +++ b/module/(auth)/signin_progress.js @@ -1,6 +1,6 @@ // 签到进度 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { moduleId: query.moduleId || '1207signin-1207signin', diff --git a/module/verify_getQr.js b/module/(auth)/verify_getQr.js similarity index 94% rename from module/verify_getQr.js rename to module/(auth)/verify_getQr.js index a1a88986..3b5aaecd 100644 --- a/module/verify_getQr.js +++ b/module/(auth)/verify_getQr.js @@ -1,5 +1,5 @@ const QRCode = require('qrcode') -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { const data = { verifyConfigId: query.vid, diff --git a/module/verify_qrcodestatus.js b/module/(auth)/verify_qrcodestatus.js similarity index 80% rename from module/verify_qrcodestatus.js rename to module/(auth)/verify_qrcodestatus.js index e51c3159..e4538685 100644 --- a/module/verify_qrcodestatus.js +++ b/module/(auth)/verify_qrcodestatus.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { const data = { qrCode: query.qr, diff --git a/module/broadcast_category_region_get.js b/module/(boardcast)/broadcast_category_region_get.js similarity index 79% rename from module/broadcast_category_region_get.js rename to module/(boardcast)/broadcast_category_region_get.js index a0922983..dbb37c3d 100644 --- a/module/broadcast_category_region_get.js +++ b/module/(boardcast)/broadcast_category_region_get.js @@ -1,6 +1,6 @@ // 广播电台 - 分类/地区信息 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/broadcast_channel_collect_list.js b/module/(boardcast)/broadcast_channel_collect_list.js similarity index 85% rename from module/broadcast_channel_collect_list.js rename to module/(boardcast)/broadcast_channel_collect_list.js index 2d6eb0d5..55f55500 100644 --- a/module/broadcast_channel_collect_list.js +++ b/module/(boardcast)/broadcast_channel_collect_list.js @@ -1,6 +1,6 @@ // 广播电台 - 我的收藏 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { contentType: 'BROADCAST', diff --git a/module/broadcast_channel_currentinfo.js b/module/(boardcast)/broadcast_channel_currentinfo.js similarity index 80% rename from module/broadcast_channel_currentinfo.js rename to module/(boardcast)/broadcast_channel_currentinfo.js index 06a4c902..bc2d0513 100644 --- a/module/broadcast_channel_currentinfo.js +++ b/module/(boardcast)/broadcast_channel_currentinfo.js @@ -1,6 +1,6 @@ // 广播电台 - 电台信息 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { channelId: query.id, diff --git a/module/broadcast_channel_list.js b/module/(boardcast)/broadcast_channel_list.js similarity index 86% rename from module/broadcast_channel_list.js rename to module/(boardcast)/broadcast_channel_list.js index c5353d65..4c0a4e08 100644 --- a/module/broadcast_channel_list.js +++ b/module/(boardcast)/broadcast_channel_list.js @@ -1,6 +1,6 @@ // 广播电台 - 全部电台 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { categoryId: query.categoryId || '0', diff --git a/module/broadcast_sub.js b/module/(boardcast)/broadcast_sub.js similarity index 85% rename from module/broadcast_sub.js rename to module/(boardcast)/broadcast_sub.js index 606093f8..54619775 100644 --- a/module/broadcast_sub.js +++ b/module/(boardcast)/broadcast_sub.js @@ -1,6 +1,6 @@ // 广播电台 - 收藏/取消收藏电台 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { query.t = query.t == 1 ? 'false' : 'true' const data = { diff --git a/module/cloud.js b/module/(cloud)/cloud.js similarity index 95% rename from module/cloud.js rename to module/(cloud)/cloud.js index f3c93c84..f3be091e 100644 --- a/module/cloud.js +++ b/module/(cloud)/cloud.js @@ -1,6 +1,6 @@ -const uploadPlugin = require('../plugins/songUpload') -const createOption = require('../util/option.js') -const logger = require('../util/logger.js') +const uploadPlugin = require('../../plugins/songUpload') +const createOption = require('../../util/option.js') +const logger = require('../../util/logger.js') const { isTempFile, getFileSize, @@ -8,7 +8,7 @@ const { cleanupTempFile, getFileExtension, sanitizeFilename, -} = require('../util/fileHelper') +} = require('../../util/fileHelper') let mm module.exports = async (query, request) => { diff --git a/module/cloud_import.js b/module/(cloud)/cloud_import.js similarity index 95% rename from module/cloud_import.js rename to module/(cloud)/cloud_import.js index f84e6c66..442edc9d 100644 --- a/module/cloud_import.js +++ b/module/(cloud)/cloud_import.js @@ -1,5 +1,5 @@ // 云盘导入歌曲 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { query.id = query.id || -2 query.artist = query.artist || '未知' diff --git a/module/cloud_lyric_get.js b/module/(cloud)/cloud_lyric_get.js similarity index 81% rename from module/cloud_lyric_get.js rename to module/(cloud)/cloud_lyric_get.js index b4d83e3d..35f14750 100644 --- a/module/cloud_lyric_get.js +++ b/module/(cloud)/cloud_lyric_get.js @@ -1,5 +1,5 @@ // 获取云盘歌词 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { userId: query.uid, diff --git a/module/cloud_match.js b/module/(cloud)/cloud_match.js similarity index 81% rename from module/cloud_match.js rename to module/(cloud)/cloud_match.js index 981d131e..9d90cba3 100644 --- a/module/cloud_match.js +++ b/module/(cloud)/cloud_match.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { userId: query.uid, diff --git a/module/cloud_upload_complete.js b/module/(cloud)/cloud_upload_complete.js similarity index 96% rename from module/cloud_upload_complete.js rename to module/(cloud)/cloud_upload_complete.js index d105dffc..3dae3120 100644 --- a/module/cloud_upload_complete.js +++ b/module/(cloud)/cloud_upload_complete.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { const { diff --git a/module/cloud_upload_token.js b/module/(cloud)/cloud_upload_token.js similarity index 97% rename from module/cloud_upload_token.js rename to module/(cloud)/cloud_upload_token.js index 6e7f3d96..055f509a 100644 --- a/module/cloud_upload_token.js +++ b/module/(cloud)/cloud_upload_token.js @@ -1,5 +1,5 @@ const { default: axios } = require('axios') -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { const { md5, fileSize, filename, bitrate = 999000 } = query diff --git a/module/cloudsearch.js b/module/(cloud)/cloudsearch.js similarity index 87% rename from module/cloudsearch.js rename to module/(cloud)/cloudsearch.js index e06217c8..0c8766bc 100644 --- a/module/cloudsearch.js +++ b/module/(cloud)/cloudsearch.js @@ -1,6 +1,6 @@ // 搜索 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { s: query.keywords, diff --git a/module/comment.js b/module/(comment)/comment.js similarity index 84% rename from module/comment.js rename to module/(comment)/comment.js index 8fa6eb4c..9e1230f9 100644 --- a/module/comment.js +++ b/module/(comment)/comment.js @@ -1,7 +1,7 @@ -const { resourceTypeMap } = require('../util/config.json') +const { resourceTypeMap } = require('../../util/config.json') // 发送与删除评论 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { query.t = { 1: 'add', diff --git a/module/comment_add.js b/module/(comment)/comment_add.js similarity index 86% rename from module/comment_add.js rename to module/(comment)/comment_add.js index 4d1244ce..82048eee 100644 --- a/module/comment_add.js +++ b/module/(comment)/comment_add.js @@ -1,6 +1,6 @@ // 对某一首歌曲发表评论 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { threadId: 'R_SO_4_' + query.id, diff --git a/module/comment_album.js b/module/(comment)/comment_album.js similarity index 85% rename from module/comment_album.js rename to module/(comment)/comment_album.js index 2e02b1e0..ef34eee0 100644 --- a/module/comment_album.js +++ b/module/(comment)/comment_album.js @@ -1,6 +1,6 @@ // 专辑评论 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { rid: query.id, diff --git a/module/comment_delete.js b/module/(comment)/comment_delete.js similarity index 80% rename from module/comment_delete.js rename to module/(comment)/comment_delete.js index 9eb182a9..49f6561b 100644 --- a/module/comment_delete.js +++ b/module/(comment)/comment_delete.js @@ -1,6 +1,6 @@ // 删除评论 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { commentId: query.cid, diff --git a/module/comment_dj.js b/module/(comment)/comment_dj.js similarity index 85% rename from module/comment_dj.js rename to module/(comment)/comment_dj.js index d82334b4..0182b75d 100644 --- a/module/comment_dj.js +++ b/module/(comment)/comment_dj.js @@ -1,6 +1,6 @@ // 电台评论 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { rid: query.id, diff --git a/module/comment_event.js b/module/(comment)/comment_event.js similarity index 84% rename from module/comment_event.js rename to module/(comment)/comment_event.js index 20e71bb0..5281110b 100644 --- a/module/comment_event.js +++ b/module/(comment)/comment_event.js @@ -1,6 +1,6 @@ // 获取动态评论 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 20, diff --git a/module/comment_floor.js b/module/(comment)/comment_floor.js similarity index 75% rename from module/comment_floor.js rename to module/(comment)/comment_floor.js index b9c4d2cb..91719982 100644 --- a/module/comment_floor.js +++ b/module/(comment)/comment_floor.js @@ -1,5 +1,5 @@ -const { resourceTypeMap } = require('../util/config.json') -const createOption = require('../util/option.js') +const { resourceTypeMap } = require('../../util/config.json') +const createOption = require('../../util/option.js') module.exports = (query, request) => { query.type = resourceTypeMap[query.type] const data = { diff --git a/module/comment_hot.js b/module/(comment)/comment_hot.js similarity index 75% rename from module/comment_hot.js rename to module/(comment)/comment_hot.js index c14ec390..07627436 100644 --- a/module/comment_hot.js +++ b/module/(comment)/comment_hot.js @@ -1,7 +1,7 @@ -const { resourceTypeMap } = require('../util/config.json') +const { resourceTypeMap } = require('../../util/config.json') // 热门评论 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { query.type = resourceTypeMap[query.type] const data = { diff --git a/module/comment_hug_list.js b/module/(comment)/comment_hug_list.js similarity index 80% rename from module/comment_hug_list.js rename to module/(comment)/comment_hug_list.js index 524ba9f9..66dd57c7 100644 --- a/module/comment_hug_list.js +++ b/module/(comment)/comment_hug_list.js @@ -1,5 +1,5 @@ -const { resourceTypeMap } = require('../util/config.json') -const createOption = require('../util/option.js') +const { resourceTypeMap } = require('../../util/config.json') +const createOption = require('../../util/option.js') module.exports = (query, request) => { query.type = resourceTypeMap[query.type || 0] const threadId = query.type + query.sid diff --git a/module/comment_info_list.js b/module/(comment)/comment_info_list.js similarity index 87% rename from module/comment_info_list.js rename to module/(comment)/comment_info_list.js index 2c25d99a..7ca07106 100644 --- a/module/comment_info_list.js +++ b/module/(comment)/comment_info_list.js @@ -1,8 +1,8 @@ // 评论统计数据 // type: 0=歌曲 1=MV 2=歌单 3=专辑 4=电台节目 5=视频 6=动态 7=电台 // ids: 资源 ID 列表,多个用逗号分隔,如 "123,456" -const { resourceTypeMap } = require('../util/config.json') -const createOption = require('../util/option.js') +const { resourceTypeMap } = require('../../util/config.json') +const createOption = require('../../util/option.js') // 从 resourceTypeMap 的前缀值中提取网易云内部资源类型编号 // 例如 "R_SO_4_" -> "4", "A_DR_14_" -> "14" diff --git a/module/comment_like.js b/module/(comment)/comment_like.js similarity index 78% rename from module/comment_like.js rename to module/(comment)/comment_like.js index e89c0bb2..51861c5d 100644 --- a/module/comment_like.js +++ b/module/(comment)/comment_like.js @@ -1,7 +1,7 @@ -const { resourceTypeMap } = require('../util/config.json') +const { resourceTypeMap } = require('../../util/config.json') // 点赞与取消点赞评论 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { query.t = query.t == 1 ? 'like' : 'unlike' query.type = resourceTypeMap[query.type] diff --git a/module/comment_music.js b/module/(comment)/comment_music.js similarity index 85% rename from module/comment_music.js rename to module/(comment)/comment_music.js index 567e0523..ffbc0d2b 100644 --- a/module/comment_music.js +++ b/module/(comment)/comment_music.js @@ -1,6 +1,6 @@ // 歌曲评论 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { rid: query.id, diff --git a/module/comment_mv.js b/module/(comment)/comment_mv.js similarity index 85% rename from module/comment_mv.js rename to module/(comment)/comment_mv.js index ddee04f8..7a77c103 100644 --- a/module/comment_mv.js +++ b/module/(comment)/comment_mv.js @@ -1,6 +1,6 @@ // MV评论 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { rid: query.id, diff --git a/module/comment_new.js b/module/(comment)/comment_new.js similarity index 88% rename from module/comment_new.js rename to module/(comment)/comment_new.js index a0f7e988..2e38e332 100644 --- a/module/comment_new.js +++ b/module/(comment)/comment_new.js @@ -1,7 +1,7 @@ -const { resourceTypeMap } = require('../util/config.json') +const { resourceTypeMap } = require('../../util/config.json') // 评论 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { query.type = resourceTypeMap[query.type] const threadId = query.type + query.id diff --git a/module/comment_playlist.js b/module/(comment)/comment_playlist.js similarity index 85% rename from module/comment_playlist.js rename to module/(comment)/comment_playlist.js index 52078ac7..e1aefbbb 100644 --- a/module/comment_playlist.js +++ b/module/(comment)/comment_playlist.js @@ -1,6 +1,6 @@ // 歌单评论 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { rid: query.id, diff --git a/module/comment_reply.js b/module/(comment)/comment_reply.js similarity index 84% rename from module/comment_reply.js rename to module/(comment)/comment_reply.js index d64e0120..2fa9ebda 100644 --- a/module/comment_reply.js +++ b/module/(comment)/comment_reply.js @@ -1,6 +1,6 @@ // 回复评论 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { threadId: query.id, diff --git a/module/comment_video.js b/module/(comment)/comment_video.js similarity index 85% rename from module/comment_video.js rename to module/(comment)/comment_video.js index bf54c57a..a75dfe7d 100644 --- a/module/comment_video.js +++ b/module/(comment)/comment_video.js @@ -1,6 +1,6 @@ // 视频评论 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { rid: query.id, diff --git a/module/hug_comment.js b/module/(comment)/hug_comment.js similarity index 74% rename from module/hug_comment.js rename to module/(comment)/hug_comment.js index df8d52cb..5128e633 100644 --- a/module/hug_comment.js +++ b/module/(comment)/hug_comment.js @@ -1,5 +1,5 @@ -const { resourceTypeMap } = require('../util/config.json') -const createOption = require('../util/option.js') +const { resourceTypeMap } = require('../../util/config.json') +const createOption = require('../../util/option.js') module.exports = (query, request) => { query.type = resourceTypeMap[query.type || 0] const threadId = query.type + query.sid diff --git a/module/djRadio_top.js b/module/(dj)/djRadio_top.js similarity index 90% rename from module/djRadio_top.js rename to module/(dj)/djRadio_top.js index b738632b..3fb1299b 100644 --- a/module/djRadio_top.js +++ b/module/(dj)/djRadio_top.js @@ -1,5 +1,5 @@ //电台排行榜获取 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { djRadioId: query.djRadioId || null, // 电台id diff --git a/module/dj_banner.js b/module/(dj)/dj_banner.js similarity index 71% rename from module/dj_banner.js rename to module/(dj)/dj_banner.js index bf5d49ba..1a19bcba 100644 --- a/module/dj_banner.js +++ b/module/(dj)/dj_banner.js @@ -1,6 +1,6 @@ // 电台banner -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request(`/api/djradio/banner/get`, {}, createOption(query, 'weapi')) } diff --git a/module/dj_category_excludehot.js b/module/(dj)/dj_category_excludehot.js similarity index 76% rename from module/dj_category_excludehot.js rename to module/(dj)/dj_category_excludehot.js index 8eb76bca..d06986d5 100644 --- a/module/dj_category_excludehot.js +++ b/module/(dj)/dj_category_excludehot.js @@ -1,6 +1,6 @@ // 电台非热门类型 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/djradio/category/excludehot`, diff --git a/module/dj_category_recommend.js b/module/(dj)/dj_category_recommend.js similarity index 76% rename from module/dj_category_recommend.js rename to module/(dj)/dj_category_recommend.js index 8b4b4fd7..d7f47138 100644 --- a/module/dj_category_recommend.js +++ b/module/(dj)/dj_category_recommend.js @@ -1,6 +1,6 @@ // 电台推荐类型 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/djradio/home/category/recommend`, diff --git a/module/dj_catelist.js b/module/(dj)/dj_catelist.js similarity index 73% rename from module/dj_catelist.js rename to module/(dj)/dj_catelist.js index bc9f9b19..81b9b3ca 100644 --- a/module/dj_catelist.js +++ b/module/(dj)/dj_catelist.js @@ -1,6 +1,6 @@ // 电台分类列表 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request(`/api/djradio/category/get`, {}, createOption(query, 'weapi')) } diff --git a/module/dj_detail.js b/module/(dj)/dj_detail.js similarity index 76% rename from module/dj_detail.js rename to module/(dj)/dj_detail.js index 6b67d526..ac198645 100644 --- a/module/dj_detail.js +++ b/module/(dj)/dj_detail.js @@ -1,6 +1,6 @@ // 电台详情 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.rid, diff --git a/module/dj_difm_all_style_channel.js b/module/(dj)/dj_difm_all_style_channel.js similarity index 79% rename from module/dj_difm_all_style_channel.js rename to module/(dj)/dj_difm_all_style_channel.js index d7b0caa1..b91be641 100644 --- a/module/dj_difm_all_style_channel.js +++ b/module/(dj)/dj_difm_all_style_channel.js @@ -1,6 +1,6 @@ // DIFM电台 - 分类 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { sources: query.sources || '[0]', diff --git a/module/dj_difm_channel_subscribe.js b/module/(dj)/dj_difm_channel_subscribe.js similarity index 78% rename from module/dj_difm_channel_subscribe.js rename to module/(dj)/dj_difm_channel_subscribe.js index 8dcf8845..7c7fb0f1 100644 --- a/module/dj_difm_channel_subscribe.js +++ b/module/(dj)/dj_difm_channel_subscribe.js @@ -1,6 +1,6 @@ // DIFM电台 - 收藏频道 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/dj_difm_channel_unsubscribe.js b/module/(dj)/dj_difm_channel_unsubscribe.js similarity index 78% rename from module/dj_difm_channel_unsubscribe.js rename to module/(dj)/dj_difm_channel_unsubscribe.js index a34b27b4..802523b3 100644 --- a/module/dj_difm_channel_unsubscribe.js +++ b/module/(dj)/dj_difm_channel_unsubscribe.js @@ -1,6 +1,6 @@ // DIFM电台 - 取消收藏频道 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/dj_difm_playing_tracks_list.js b/module/(dj)/dj_difm_playing_tracks_list.js similarity index 83% rename from module/dj_difm_playing_tracks_list.js rename to module/(dj)/dj_difm_playing_tracks_list.js index e0fe61cf..e9bff976 100644 --- a/module/dj_difm_playing_tracks_list.js +++ b/module/(dj)/dj_difm_playing_tracks_list.js @@ -1,6 +1,6 @@ // DIFM电台 - 播放列表 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 5, diff --git a/module/dj_difm_subscribe_channels_get.js b/module/(dj)/dj_difm_subscribe_channels_get.js similarity index 81% rename from module/dj_difm_subscribe_channels_get.js rename to module/(dj)/dj_difm_subscribe_channels_get.js index 6a928d6a..965dda0d 100644 --- a/module/dj_difm_subscribe_channels_get.js +++ b/module/(dj)/dj_difm_subscribe_channels_get.js @@ -1,6 +1,6 @@ // DIFM电台 - 收藏列表 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { sources: query.sources || '[0]', diff --git a/module/dj_hot.js b/module/(dj)/dj_hot.js similarity index 80% rename from module/dj_hot.js rename to module/(dj)/dj_hot.js index a9024587..29f755b8 100644 --- a/module/dj_hot.js +++ b/module/(dj)/dj_hot.js @@ -1,6 +1,6 @@ // 热门电台 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 30, diff --git a/module/dj_paygift.js b/module/(dj)/dj_paygift.js similarity index 83% rename from module/dj_paygift.js rename to module/(dj)/dj_paygift.js index 183ce79b..49dc2a5b 100644 --- a/module/dj_paygift.js +++ b/module/(dj)/dj_paygift.js @@ -1,6 +1,6 @@ // 付费电台 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 30, diff --git a/module/dj_personalize_recommend.js b/module/(dj)/dj_personalize_recommend.js similarity index 79% rename from module/dj_personalize_recommend.js rename to module/(dj)/dj_personalize_recommend.js index 84a69122..46075e43 100644 --- a/module/dj_personalize_recommend.js +++ b/module/(dj)/dj_personalize_recommend.js @@ -1,6 +1,6 @@ // 电台个性推荐 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/djradio/personalize/rcmd`, diff --git a/module/dj_program.js b/module/(dj)/dj_program.js similarity index 74% rename from module/dj_program.js rename to module/(dj)/dj_program.js index f4df99ea..32b73d60 100644 --- a/module/dj_program.js +++ b/module/(dj)/dj_program.js @@ -1,6 +1,6 @@ // 电台节目列表 -const { toBoolean } = require('../util') -const createOption = require('../util/option.js') +const { toBoolean } = require('../../util') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { radioId: query.rid, diff --git a/module/dj_program_detail.js b/module/(dj)/dj_program_detail.js similarity index 77% rename from module/dj_program_detail.js rename to module/(dj)/dj_program_detail.js index 17f52fea..8bf60c89 100644 --- a/module/dj_program_detail.js +++ b/module/(dj)/dj_program_detail.js @@ -1,6 +1,6 @@ // 电台节目详情 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/dj_program_toplist.js b/module/(dj)/dj_program_toplist.js similarity index 80% rename from module/dj_program_toplist.js rename to module/(dj)/dj_program_toplist.js index fdaa1a6f..df0f3e44 100644 --- a/module/dj_program_toplist.js +++ b/module/(dj)/dj_program_toplist.js @@ -1,6 +1,6 @@ // 电台节目榜 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 100, diff --git a/module/dj_program_toplist_hours.js b/module/(dj)/dj_program_toplist_hours.js similarity index 82% rename from module/dj_program_toplist_hours.js rename to module/(dj)/dj_program_toplist_hours.js index 5052cf49..84278e2d 100644 --- a/module/dj_program_toplist_hours.js +++ b/module/(dj)/dj_program_toplist_hours.js @@ -1,5 +1,5 @@ // 电台24小时节目榜 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 100, diff --git a/module/dj_radio_hot.js b/module/(dj)/dj_radio_hot.js similarity index 82% rename from module/dj_radio_hot.js rename to module/(dj)/dj_radio_hot.js index e70e562c..a83a8d66 100644 --- a/module/dj_radio_hot.js +++ b/module/(dj)/dj_radio_hot.js @@ -1,6 +1,6 @@ // 类别热门电台 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { cateId: query.cateId, diff --git a/module/dj_recommend.js b/module/(dj)/dj_recommend.js similarity index 72% rename from module/dj_recommend.js rename to module/(dj)/dj_recommend.js index 779765e7..7311144d 100644 --- a/module/dj_recommend.js +++ b/module/(dj)/dj_recommend.js @@ -1,6 +1,6 @@ // 精选电台 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request(`/api/djradio/recommend/v1`, {}, createOption(query, 'weapi')) } diff --git a/module/dj_recommend_type.js b/module/(dj)/dj_recommend_type.js similarity index 91% rename from module/dj_recommend_type.js rename to module/(dj)/dj_recommend_type.js index 82f37182..96c8a59d 100644 --- a/module/dj_recommend_type.js +++ b/module/(dj)/dj_recommend_type.js @@ -23,7 +23,7 @@ 旅途|城市 12 */ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { cateId: query.type, diff --git a/module/dj_sub.js b/module/(dj)/dj_sub.js similarity index 81% rename from module/dj_sub.js rename to module/(dj)/dj_sub.js index 940a7917..0683638e 100644 --- a/module/dj_sub.js +++ b/module/(dj)/dj_sub.js @@ -1,6 +1,6 @@ // 订阅与取消电台 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { query.t = query.t == 1 ? 'sub' : 'unsub' const data = { diff --git a/module/dj_sublist.js b/module/(dj)/dj_sublist.js similarity index 82% rename from module/dj_sublist.js rename to module/(dj)/dj_sublist.js index ec9fa54b..8b340bd9 100644 --- a/module/dj_sublist.js +++ b/module/(dj)/dj_sublist.js @@ -1,6 +1,6 @@ // 订阅电台列表 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 30, diff --git a/module/dj_subscriber.js b/module/(dj)/dj_subscriber.js similarity index 82% rename from module/dj_subscriber.js rename to module/(dj)/dj_subscriber.js index d3e17b55..cb6beffe 100644 --- a/module/dj_subscriber.js +++ b/module/(dj)/dj_subscriber.js @@ -1,6 +1,6 @@ // 电台详情 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { time: query.time || '-1', diff --git a/module/dj_today_perfered.js b/module/(dj)/dj_today_perfered.js similarity index 80% rename from module/dj_today_perfered.js rename to module/(dj)/dj_today_perfered.js index 4f852995..fe10e87b 100644 --- a/module/dj_today_perfered.js +++ b/module/(dj)/dj_today_perfered.js @@ -1,6 +1,6 @@ // 电台今日优选 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { page: query.page || 0, diff --git a/module/dj_toplist.js b/module/(dj)/dj_toplist.js similarity index 86% rename from module/dj_toplist.js rename to module/(dj)/dj_toplist.js index 2fad40ac..ebecb586 100644 --- a/module/dj_toplist.js +++ b/module/(dj)/dj_toplist.js @@ -3,7 +3,7 @@ const typeMap = { new: 0, hot: 1, } -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 100, diff --git a/module/dj_toplist_hours.js b/module/(dj)/dj_toplist_hours.js similarity index 80% rename from module/dj_toplist_hours.js rename to module/(dj)/dj_toplist_hours.js index be193f4c..5cac383f 100644 --- a/module/dj_toplist_hours.js +++ b/module/(dj)/dj_toplist_hours.js @@ -1,6 +1,6 @@ // 电台24小时主播榜 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 100, diff --git a/module/dj_toplist_newcomer.js b/module/(dj)/dj_toplist_newcomer.js similarity index 80% rename from module/dj_toplist_newcomer.js rename to module/(dj)/dj_toplist_newcomer.js index 822664a4..cd283071 100644 --- a/module/dj_toplist_newcomer.js +++ b/module/(dj)/dj_toplist_newcomer.js @@ -1,5 +1,5 @@ // 电台新人榜 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 100, diff --git a/module/dj_toplist_pay.js b/module/(dj)/dj_toplist_pay.js similarity index 80% rename from module/dj_toplist_pay.js rename to module/(dj)/dj_toplist_pay.js index dead30f7..c015e912 100644 --- a/module/dj_toplist_pay.js +++ b/module/(dj)/dj_toplist_pay.js @@ -1,5 +1,5 @@ // 付费精品 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 100, diff --git a/module/dj_toplist_popular.js b/module/(dj)/dj_toplist_popular.js similarity index 80% rename from module/dj_toplist_popular.js rename to module/(dj)/dj_toplist_popular.js index 52008184..4fbecd9f 100644 --- a/module/dj_toplist_popular.js +++ b/module/(dj)/dj_toplist_popular.js @@ -1,6 +1,6 @@ // 电台最热主播榜 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 100, diff --git a/module/event.js b/module/(event)/event.js similarity index 81% rename from module/event.js rename to module/(event)/event.js index 37466312..ec332cbe 100644 --- a/module/event.js +++ b/module/(event)/event.js @@ -1,6 +1,6 @@ // 获取动态列表 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { pagesize: query.pagesize || 20, diff --git a/module/event_del.js b/module/(event)/event_del.js similarity index 76% rename from module/event_del.js rename to module/(event)/event_del.js index 5f114758..ead447e4 100644 --- a/module/event_del.js +++ b/module/(event)/event_del.js @@ -1,6 +1,6 @@ // 删除动态 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.evId, diff --git a/module/event_forward.js b/module/(event)/event_forward.js similarity index 81% rename from module/event_forward.js rename to module/(event)/event_forward.js index 8e1f1e40..811c4dac 100644 --- a/module/event_forward.js +++ b/module/(event)/event_forward.js @@ -1,6 +1,6 @@ // 转发动态 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { forwards: query.forwards, diff --git a/module/fanscenter_basicinfo_age_get.js b/module/(fancenter)/fanscenter_basicinfo_age_get.js similarity index 75% rename from module/fanscenter_basicinfo_age_get.js rename to module/(fancenter)/fanscenter_basicinfo_age_get.js index 111d30a6..ad204cce 100644 --- a/module/fanscenter_basicinfo_age_get.js +++ b/module/(fancenter)/fanscenter_basicinfo_age_get.js @@ -1,5 +1,5 @@ // 粉丝年龄比例 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request(`/api/fanscenter/basicinfo/age/get`, data, createOption(query)) diff --git a/module/fanscenter_basicinfo_gender_get.js b/module/(fancenter)/fanscenter_basicinfo_gender_get.js similarity index 77% rename from module/fanscenter_basicinfo_gender_get.js rename to module/(fancenter)/fanscenter_basicinfo_gender_get.js index 7f2643c8..f1a22491 100644 --- a/module/fanscenter_basicinfo_gender_get.js +++ b/module/(fancenter)/fanscenter_basicinfo_gender_get.js @@ -1,5 +1,5 @@ // 粉丝性别比例 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/fanscenter_basicinfo_province_get.js b/module/(fancenter)/fanscenter_basicinfo_province_get.js similarity index 77% rename from module/fanscenter_basicinfo_province_get.js rename to module/(fancenter)/fanscenter_basicinfo_province_get.js index 8c3ac372..06788144 100644 --- a/module/fanscenter_basicinfo_province_get.js +++ b/module/(fancenter)/fanscenter_basicinfo_province_get.js @@ -1,5 +1,5 @@ // 粉丝省份比例 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/fanscenter_overview_get.js b/module/(fancenter)/fanscenter_overview_get.js similarity index 74% rename from module/fanscenter_overview_get.js rename to module/(fancenter)/fanscenter_overview_get.js index 6af55256..249d91ea 100644 --- a/module/fanscenter_overview_get.js +++ b/module/(fancenter)/fanscenter_overview_get.js @@ -1,5 +1,5 @@ // 粉丝数量 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request(`/api/fanscenter/overview/get`, data, createOption(query)) diff --git a/module/fanscenter_trend_list.js b/module/(fancenter)/fanscenter_trend_list.js similarity index 85% rename from module/fanscenter_trend_list.js rename to module/(fancenter)/fanscenter_trend_list.js index 7b294957..4a96b891 100644 --- a/module/fanscenter_trend_list.js +++ b/module/(fancenter)/fanscenter_trend_list.js @@ -1,5 +1,5 @@ // 粉丝来源 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { startTime: query.startTime || Date.now() - 7 * 24 * 3600 * 1000, diff --git a/module/listen_data_realtime_report.js b/module/(listen_data)/listen_data_realtime_report.js similarity index 82% rename from module/listen_data_realtime_report.js rename to module/(listen_data)/listen_data_realtime_report.js index e415ca93..737f1c02 100644 --- a/module/listen_data_realtime_report.js +++ b/module/(listen_data)/listen_data_realtime_report.js @@ -1,5 +1,5 @@ // 听歌足迹 - 本周/本月收听时长 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/content/activity/listen/data/realtime/report`, diff --git a/module/listen_data_report.js b/module/(listen_data)/listen_data_report.js similarity index 85% rename from module/listen_data_report.js rename to module/(listen_data)/listen_data_report.js index 21aef525..1fd89526 100644 --- a/module/listen_data_report.js +++ b/module/(listen_data)/listen_data_report.js @@ -1,5 +1,5 @@ // 听歌足迹 - 周/月/年收听报告 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/content/activity/listen/data/report`, diff --git a/module/listen_data_today_song.js b/module/(listen_data)/listen_data_today_song.js similarity index 78% rename from module/listen_data_today_song.js rename to module/(listen_data)/listen_data_today_song.js index 9c2f7e68..c245d168 100644 --- a/module/listen_data_today_song.js +++ b/module/(listen_data)/listen_data_today_song.js @@ -1,5 +1,5 @@ // 听歌足迹 - 今日收听 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/content/activity/listen/data/today/song/play/rank`, diff --git a/module/listen_data_total.js b/module/(listen_data)/listen_data_total.js similarity index 76% rename from module/listen_data_total.js rename to module/(listen_data)/listen_data_total.js index 83472ba2..7e2d60e6 100644 --- a/module/listen_data_total.js +++ b/module/(listen_data)/listen_data_total.js @@ -1,5 +1,5 @@ // 听歌足迹 - 总收听时长 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/content/activity/listen/data/total`, diff --git a/module/listen_data_year_report.js b/module/(listen_data)/listen_data_year_report.js similarity index 77% rename from module/listen_data_year_report.js rename to module/(listen_data)/listen_data_year_report.js index ba32cb97..922eb4cc 100644 --- a/module/listen_data_year_report.js +++ b/module/(listen_data)/listen_data_year_report.js @@ -1,5 +1,5 @@ // 听歌足迹 - 年度听歌足迹 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/content/activity/listen/data/year/report`, diff --git a/module/listentogether_accept.js b/module/(listen_together)/listentogether_accept.js similarity index 82% rename from module/listentogether_accept.js rename to module/(listen_together)/listentogether_accept.js index 5a986d75..c2e4e854 100644 --- a/module/listentogether_accept.js +++ b/module/(listen_together)/listentogether_accept.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { refer: 'inbox_invite', diff --git a/module/listentogether_end.js b/module/(listen_together)/listentogether_end.js similarity index 78% rename from module/listentogether_end.js rename to module/(listen_together)/listentogether_end.js index 348757c6..8b900f0e 100644 --- a/module/listentogether_end.js +++ b/module/(listen_together)/listentogether_end.js @@ -1,6 +1,6 @@ // 一起听 结束房间 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { roomId: query.roomId, diff --git a/module/listentogether_heatbeat.js b/module/(listen_together)/listentogether_heatbeat.js similarity index 84% rename from module/listentogether_heatbeat.js rename to module/(listen_together)/listentogether_heatbeat.js index e319847a..70821d6d 100644 --- a/module/listentogether_heatbeat.js +++ b/module/(listen_together)/listentogether_heatbeat.js @@ -1,6 +1,6 @@ // 一起听 发送心跳 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { roomId: query.roomId, diff --git a/module/listentogether_play_command.js b/module/(listen_together)/listentogether_play_command.js similarity index 90% rename from module/listentogether_play_command.js rename to module/(listen_together)/listentogether_play_command.js index 6706744c..fbf5ce89 100644 --- a/module/listentogether_play_command.js +++ b/module/(listen_together)/listentogether_play_command.js @@ -1,6 +1,6 @@ // 一起听 发送播放状态 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { roomId: query.roomId, diff --git a/module/listentogether_room_check.js b/module/(listen_together)/listentogether_room_check.js similarity index 78% rename from module/listentogether_room_check.js rename to module/(listen_together)/listentogether_room_check.js index 065c6d36..acb32589 100644 --- a/module/listentogether_room_check.js +++ b/module/(listen_together)/listentogether_room_check.js @@ -1,6 +1,6 @@ // 一起听 房间情况 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { roomId: query.roomId, diff --git a/module/listentogether_room_create.js b/module/(listen_together)/listentogether_room_create.js similarity index 78% rename from module/listentogether_room_create.js rename to module/(listen_together)/listentogether_room_create.js index 5265a0b4..31d994c0 100644 --- a/module/listentogether_room_create.js +++ b/module/(listen_together)/listentogether_room_create.js @@ -1,6 +1,6 @@ // 一起听创建房间 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { refer: 'songplay_more', diff --git a/module/listentogether_status.js b/module/(listen_together)/listentogether_status.js similarity index 75% rename from module/listentogether_status.js rename to module/(listen_together)/listentogether_status.js index d233a968..b5aa005b 100644 --- a/module/listentogether_status.js +++ b/module/(listen_together)/listentogether_status.js @@ -1,6 +1,6 @@ // 一起听状态 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/listen/together/status/get`, diff --git a/module/listentogether_sync_list_command.js b/module/(listen_together)/listentogether_sync_list_command.js similarity index 91% rename from module/listentogether_sync_list_command.js rename to module/(listen_together)/listentogether_sync_list_command.js index a05533aa..799bf6aa 100644 --- a/module/listentogether_sync_list_command.js +++ b/module/(listen_together)/listentogether_sync_list_command.js @@ -1,6 +1,6 @@ // 一起听 更新播放列表 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { roomId: query.roomId, diff --git a/module/listentogether_sync_playlist_get.js b/module/(listen_together)/listentogether_sync_playlist_get.js similarity index 80% rename from module/listentogether_sync_playlist_get.js rename to module/(listen_together)/listentogether_sync_playlist_get.js index 58258466..610c9b6b 100644 --- a/module/listentogether_sync_playlist_get.js +++ b/module/(listen_together)/listentogether_sync_playlist_get.js @@ -1,6 +1,6 @@ // 一起听 当前列表获取 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { roomId: query.roomId, diff --git a/module/login.js b/module/(login)/login.js similarity index 94% rename from module/login.js rename to module/(login)/login.js index ed46db4f..8a90e580 100644 --- a/module/login.js +++ b/module/(login)/login.js @@ -2,7 +2,7 @@ const CryptoJS = require('crypto-js') -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { const data = { type: '0', diff --git a/module/login_cellphone.js b/module/(login)/login_cellphone.js similarity index 94% rename from module/login_cellphone.js rename to module/(login)/login_cellphone.js index c1d8d452..3458f8b2 100644 --- a/module/login_cellphone.js +++ b/module/(login)/login_cellphone.js @@ -2,7 +2,7 @@ const CryptoJS = require('crypto-js') -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { const data = { type: '1', diff --git a/module/login_qr_check.js b/module/(login)/login_qr_check.js similarity index 90% rename from module/login_qr_check.js rename to module/(login)/login_qr_check.js index 1f34cb09..1d784d06 100644 --- a/module/login_qr_check.js +++ b/module/(login)/login_qr_check.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { const data = { key: query.key, diff --git a/module/login_qr_create.js b/module/(login)/login_qr_create.js similarity index 92% rename from module/login_qr_create.js rename to module/(login)/login_qr_create.js index d94cbece..1b425624 100644 --- a/module/login_qr_create.js +++ b/module/(login)/login_qr_create.js @@ -1,5 +1,5 @@ const QRCode = require('qrcode') -const { generateChainId } = require('../util/index') +const { generateChainId } = require('../../util/index') module.exports = (query) => { return new Promise(async (resolve) => { diff --git a/module/login_qr_key.js b/module/(login)/login_qr_key.js similarity index 85% rename from module/login_qr_key.js rename to module/(login)/login_qr_key.js index 4ef36484..665a32ff 100644 --- a/module/login_qr_key.js +++ b/module/(login)/login_qr_key.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { const data = { type: 3, diff --git a/module/login_refresh.js b/module/(login)/login_refresh.js similarity index 87% rename from module/login_refresh.js rename to module/(login)/login_refresh.js index 9c8f1f4a..b73644d4 100644 --- a/module/login_refresh.js +++ b/module/(login)/login_refresh.js @@ -1,6 +1,6 @@ // 登录刷新 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { let result = await request( `/api/login/token/refresh`, diff --git a/module/login_status.js b/module/(login)/login_status.js similarity index 87% rename from module/login_status.js rename to module/(login)/login_status.js index 3984966e..3eb4e635 100644 --- a/module/login_status.js +++ b/module/(login)/login_status.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { const data = {} let result = await request( diff --git a/module/logout.js b/module/(login)/logout.js similarity index 68% rename from module/logout.js rename to module/(login)/logout.js index 9f5b3ddf..3146e6da 100644 --- a/module/logout.js +++ b/module/(login)/logout.js @@ -1,6 +1,6 @@ // 退出登录 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request(`/api/logout`, {}, createOption(query)) } diff --git a/module/mlog_music_rcmd.js b/module/(mlog)/mlog_music_rcmd.js similarity index 84% rename from module/mlog_music_rcmd.js rename to module/(mlog)/mlog_music_rcmd.js index 2228e0af..bfeab213 100644 --- a/module/mlog_music_rcmd.js +++ b/module/(mlog)/mlog_music_rcmd.js @@ -1,6 +1,6 @@ // 歌曲相关视频 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.mvid || 0, diff --git a/module/mlog_to_video.js b/module/(mlog)/mlog_to_video.js similarity index 80% rename from module/mlog_to_video.js rename to module/(mlog)/mlog_to_video.js index 69d3fb6d..e1d5644e 100644 --- a/module/mlog_to_video.js +++ b/module/(mlog)/mlog_to_video.js @@ -1,6 +1,6 @@ // 将mlog id转为video id -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { mlogId: query.id, diff --git a/module/mlog_url.js b/module/(mlog)/mlog_url.js similarity index 80% rename from module/mlog_url.js rename to module/(mlog)/mlog_url.js index efca19ab..0d15c8a9 100644 --- a/module/mlog_url.js +++ b/module/(mlog)/mlog_url.js @@ -1,6 +1,6 @@ // mlog链接 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/msg_comments.js b/module/(msg)/msg_comments.js similarity index 84% rename from module/msg_comments.js rename to module/(msg)/msg_comments.js index 15d57b2b..e3cc544e 100644 --- a/module/msg_comments.js +++ b/module/(msg)/msg_comments.js @@ -1,6 +1,6 @@ // 评论 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { beforeTime: query.before || '-1', diff --git a/module/msg_forwards.js b/module/(msg)/msg_forwards.js similarity index 80% rename from module/msg_forwards.js rename to module/(msg)/msg_forwards.js index 2ec1786d..ac23be37 100644 --- a/module/msg_forwards.js +++ b/module/(msg)/msg_forwards.js @@ -1,6 +1,6 @@ // @我 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { offset: query.offset || 0, diff --git a/module/msg_notices.js b/module/(msg)/msg_notices.js similarity index 79% rename from module/msg_notices.js rename to module/(msg)/msg_notices.js index 72c80cbc..ffe21644 100644 --- a/module/msg_notices.js +++ b/module/(msg)/msg_notices.js @@ -1,6 +1,6 @@ // 通知 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 30, diff --git a/module/msg_private.js b/module/(msg)/msg_private.js similarity index 81% rename from module/msg_private.js rename to module/(msg)/msg_private.js index 090f8887..51661992 100644 --- a/module/msg_private.js +++ b/module/(msg)/msg_private.js @@ -1,6 +1,6 @@ // 私信 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { offset: query.offset || 0, diff --git a/module/msg_private_history.js b/module/(msg)/msg_private_history.js similarity index 83% rename from module/msg_private_history.js rename to module/(msg)/msg_private_history.js index f5877f36..18613557 100644 --- a/module/msg_private_history.js +++ b/module/(msg)/msg_private_history.js @@ -1,6 +1,6 @@ // 私信内容 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { userId: query.uid, diff --git a/module/msg_recentcontact.js b/module/(msg)/msg_recentcontact.js similarity index 76% rename from module/msg_recentcontact.js rename to module/(msg)/msg_recentcontact.js index b12a4f86..ac31a64e 100644 --- a/module/msg_recentcontact.js +++ b/module/(msg)/msg_recentcontact.js @@ -1,6 +1,6 @@ // 最近联系 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/music_first_listen_info.js b/module/(musician)/music_first_listen_info.js similarity index 79% rename from module/music_first_listen_info.js rename to module/(musician)/music_first_listen_info.js index 67377b72..3b9b10be 100644 --- a/module/music_first_listen_info.js +++ b/module/(musician)/music_first_listen_info.js @@ -1,6 +1,6 @@ // 回忆坐标 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { songId: query.id, diff --git a/module/musician_cloudbean.js b/module/(musician)/musician_cloudbean.js similarity index 74% rename from module/musician_cloudbean.js rename to module/(musician)/musician_cloudbean.js index f4a36ce8..585b4dfd 100644 --- a/module/musician_cloudbean.js +++ b/module/(musician)/musician_cloudbean.js @@ -1,6 +1,6 @@ // 账号云豆数 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request(`/api/cloudbean/get`, data, createOption(query, 'weapi')) diff --git a/module/musician_cloudbean_obtain.js b/module/(musician)/musician_cloudbean_obtain.js similarity index 82% rename from module/musician_cloudbean_obtain.js rename to module/(musician)/musician_cloudbean_obtain.js index 97f996ef..f3ff5914 100644 --- a/module/musician_cloudbean_obtain.js +++ b/module/(musician)/musician_cloudbean_obtain.js @@ -1,6 +1,6 @@ // 领取云豆 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { userMissionId: query.id, diff --git a/module/musician_data_overview.js b/module/(musician)/musician_data_overview.js similarity index 79% rename from module/musician_data_overview.js rename to module/(musician)/musician_data_overview.js index fabc34ac..9e4a28ec 100644 --- a/module/musician_data_overview.js +++ b/module/(musician)/musician_data_overview.js @@ -1,6 +1,6 @@ // 音乐人数据概况 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/musician_play_trend.js b/module/(musician)/musician_play_trend.js similarity index 84% rename from module/musician_play_trend.js rename to module/(musician)/musician_play_trend.js index 3649518a..50b785f8 100644 --- a/module/musician_play_trend.js +++ b/module/(musician)/musician_play_trend.js @@ -1,6 +1,6 @@ // 音乐人歌曲播放趋势 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { startTime: query.startTime, diff --git a/module/musician_sign.js b/module/(musician)/musician_sign.js similarity index 75% rename from module/musician_sign.js rename to module/(musician)/musician_sign.js index 58373229..b0ac4819 100644 --- a/module/musician_sign.js +++ b/module/(musician)/musician_sign.js @@ -1,6 +1,6 @@ // 音乐人签到 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request(`/api/creator/user/access`, data, createOption(query, 'weapi')) diff --git a/module/musician_tasks.js b/module/(musician)/musician_tasks.js similarity index 79% rename from module/musician_tasks.js rename to module/(musician)/musician_tasks.js index 9b0609c7..42cc3d7b 100644 --- a/module/musician_tasks.js +++ b/module/(musician)/musician_tasks.js @@ -1,6 +1,6 @@ // 获取音乐人任务 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/musician_tasks_new.js b/module/(musician)/musician_tasks_new.js similarity index 79% rename from module/musician_tasks_new.js rename to module/(musician)/musician_tasks_new.js index f0f45efc..7f1e3202 100644 --- a/module/musician_tasks_new.js +++ b/module/(musician)/musician_tasks_new.js @@ -1,6 +1,6 @@ // 获取音乐人任务 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/musician_vip_tasks.js b/module/(musician)/musician_vip_tasks.js similarity index 79% rename from module/musician_vip_tasks.js rename to module/(musician)/musician_vip_tasks.js index 80828ce9..6066bc4a 100644 --- a/module/musician_vip_tasks.js +++ b/module/(musician)/musician_vip_tasks.js @@ -1,6 +1,6 @@ // 获取音乐人任务 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/mv_all.js b/module/(mv)/mv_all.js similarity index 87% rename from module/mv_all.js rename to module/(mv)/mv_all.js index 9775d8a0..e415a696 100644 --- a/module/mv_all.js +++ b/module/(mv)/mv_all.js @@ -1,6 +1,6 @@ // 全部MV -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { tags: JSON.stringify({ diff --git a/module/mv_detail.js b/module/(mv)/mv_detail.js similarity index 76% rename from module/mv_detail.js rename to module/(mv)/mv_detail.js index 4ced0ed6..3077548d 100644 --- a/module/mv_detail.js +++ b/module/(mv)/mv_detail.js @@ -1,6 +1,6 @@ // MV详情 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.mvid, diff --git a/module/mv_detail_info.js b/module/(mv)/mv_detail_info.js similarity index 83% rename from module/mv_detail_info.js rename to module/(mv)/mv_detail_info.js index 116374f3..4f83ebc1 100644 --- a/module/mv_detail_info.js +++ b/module/(mv)/mv_detail_info.js @@ -1,6 +1,6 @@ // MV 点赞转发评论数数据 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { threadid: `R_MV_5_${query.mvid}`, diff --git a/module/mv_exclusive_rcmd.js b/module/(mv)/mv_exclusive_rcmd.js similarity index 79% rename from module/mv_exclusive_rcmd.js rename to module/(mv)/mv_exclusive_rcmd.js index 538a8d34..15b112b3 100644 --- a/module/mv_exclusive_rcmd.js +++ b/module/(mv)/mv_exclusive_rcmd.js @@ -1,6 +1,6 @@ // 网易出品 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { offset: query.offset || 0, diff --git a/module/mv_first.js b/module/(mv)/mv_first.js similarity index 82% rename from module/mv_first.js rename to module/(mv)/mv_first.js index 0f8ac6b8..c4e658e4 100644 --- a/module/mv_first.js +++ b/module/(mv)/mv_first.js @@ -1,6 +1,6 @@ // 最新MV -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { // 'offset': query.offset || 0, diff --git a/module/mv_sub.js b/module/(mv)/mv_sub.js similarity index 83% rename from module/mv_sub.js rename to module/(mv)/mv_sub.js index d7c881e5..caa7e313 100644 --- a/module/mv_sub.js +++ b/module/(mv)/mv_sub.js @@ -1,6 +1,6 @@ // 收藏与取消收藏MV -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { query.t = query.t == 1 ? 'sub' : 'unsub' const data = { diff --git a/module/mv_sublist.js b/module/(mv)/mv_sublist.js similarity index 83% rename from module/mv_sublist.js rename to module/(mv)/mv_sublist.js index 12feece5..8e430b7d 100644 --- a/module/mv_sublist.js +++ b/module/(mv)/mv_sublist.js @@ -1,6 +1,6 @@ // 已收藏MV列表 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 25, diff --git a/module/mv_url.js b/module/(mv)/mv_url.js similarity index 80% rename from module/mv_url.js rename to module/(mv)/mv_url.js index e0fd7ba8..cb4fa253 100644 --- a/module/mv_url.js +++ b/module/(mv)/mv_url.js @@ -1,6 +1,6 @@ // MV链接 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/personal_fm.js b/module/(personal)/personal_fm.js similarity index 70% rename from module/personal_fm.js rename to module/(personal)/personal_fm.js index f3e32d61..74634599 100644 --- a/module/personal_fm.js +++ b/module/(personal)/personal_fm.js @@ -1,6 +1,6 @@ // 私人FM -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request(`/api/v1/radio/get`, {}, createOption(query, 'weapi')) } diff --git a/module/personal_fm_mode.js b/module/(personal)/personal_fm_mode.js similarity index 86% rename from module/personal_fm_mode.js rename to module/(personal)/personal_fm_mode.js index 4d5b7f88..06fd8cdc 100644 --- a/module/personal_fm_mode.js +++ b/module/(personal)/personal_fm_mode.js @@ -3,7 +3,7 @@ // aidj, DEFAULT, FAMILIAR, EXPLORE, SCENE_RCMD ( EXERCISE, FOCUS, NIGHT_EMO ) // 来不及解释这几个了 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { mode: query.mode, diff --git a/module/personalized.js b/module/(personal)/personalized.js similarity index 83% rename from module/personalized.js rename to module/(personal)/personalized.js index 1e59b10b..f958bd79 100644 --- a/module/personalized.js +++ b/module/(personal)/personalized.js @@ -1,6 +1,6 @@ // 推荐歌单 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 30, diff --git a/module/personalized_djprogram.js b/module/(personal)/personalized_djprogram.js similarity index 74% rename from module/personalized_djprogram.js rename to module/(personal)/personalized_djprogram.js index a48ead42..82060c77 100644 --- a/module/personalized_djprogram.js +++ b/module/(personal)/personalized_djprogram.js @@ -1,6 +1,6 @@ // 推荐电台 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/personalized/djprogram`, diff --git a/module/personalized_mv.js b/module/(personal)/personalized_mv.js similarity index 70% rename from module/personalized_mv.js rename to module/(personal)/personalized_mv.js index 2f2b1043..ee5a2aab 100644 --- a/module/personalized_mv.js +++ b/module/(personal)/personalized_mv.js @@ -1,6 +1,6 @@ // 推荐MV -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request(`/api/personalized/mv`, {}, createOption(query, 'weapi')) } diff --git a/module/personalized_newsong.js b/module/(personal)/personalized_newsong.js similarity index 83% rename from module/personalized_newsong.js rename to module/(personal)/personalized_newsong.js index cd04ca96..dd1241db 100644 --- a/module/personalized_newsong.js +++ b/module/(personal)/personalized_newsong.js @@ -1,6 +1,6 @@ // 推荐新歌 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { type: 'recommend', diff --git a/module/personalized_privatecontent.js b/module/(personal)/personalized_privatecontent.js similarity index 75% rename from module/personalized_privatecontent.js rename to module/(personal)/personalized_privatecontent.js index 3d0ba78b..f1774086 100644 --- a/module/personalized_privatecontent.js +++ b/module/(personal)/personalized_privatecontent.js @@ -1,6 +1,6 @@ // 独家放送 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/personalized/privatecontent`, diff --git a/module/personalized_privatecontent_list.js b/module/(personal)/personalized_privatecontent_list.js similarity index 83% rename from module/personalized_privatecontent_list.js rename to module/(personal)/personalized_privatecontent_list.js index 75d58285..e49c7d30 100644 --- a/module/personalized_privatecontent_list.js +++ b/module/(personal)/personalized_privatecontent_list.js @@ -1,6 +1,6 @@ // 独家放送列表 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { offset: query.offset || 0, diff --git a/module/playlist_category_list.js b/module/(playlist)/playlist_category_list.js similarity index 82% rename from module/playlist_category_list.js rename to module/(playlist)/playlist_category_list.js index 0c2c9658..866ab0da 100644 --- a/module/playlist_category_list.js +++ b/module/(playlist)/playlist_category_list.js @@ -1,6 +1,6 @@ // 歌单分类列表 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { cat: query.cat || '全部', diff --git a/module/playlist_catlist.js b/module/(playlist)/playlist_catlist.js similarity index 72% rename from module/playlist_catlist.js rename to module/(playlist)/playlist_catlist.js index 409ecdb1..5aa4ec65 100644 --- a/module/playlist_catlist.js +++ b/module/(playlist)/playlist_catlist.js @@ -1,6 +1,6 @@ // 全部歌单分类 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request(`/api/playlist/catalogue`, {}, createOption(query, 'eapi')) } diff --git a/module/playlist_cover_update.js b/module/(playlist)/playlist_cover_update.js similarity index 83% rename from module/playlist_cover_update.js rename to module/(playlist)/playlist_cover_update.js index 32ad27cd..3dfb2d54 100644 --- a/module/playlist_cover_update.js +++ b/module/(playlist)/playlist_cover_update.js @@ -1,5 +1,5 @@ -const uploadPlugin = require('../plugins/upload') -const createOption = require('../util/option.js') +const uploadPlugin = require('../../plugins/upload') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { if (!query.imgFile) { return { diff --git a/module/playlist_create.js b/module/(playlist)/playlist_create.js similarity index 86% rename from module/playlist_create.js rename to module/(playlist)/playlist_create.js index 17cd858a..60cd0e3a 100644 --- a/module/playlist_create.js +++ b/module/(playlist)/playlist_create.js @@ -1,6 +1,6 @@ // 创建歌单 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { name: query.name, diff --git a/module/playlist_delete.js b/module/(playlist)/playlist_delete.js similarity index 77% rename from module/playlist_delete.js rename to module/(playlist)/playlist_delete.js index 15c3acc5..991eef45 100644 --- a/module/playlist_delete.js +++ b/module/(playlist)/playlist_delete.js @@ -1,6 +1,6 @@ // 删除歌单 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { ids: '[' + query.id + ']', diff --git a/module/playlist_desc_update.js b/module/(playlist)/playlist_desc_update.js similarity index 78% rename from module/playlist_desc_update.js rename to module/(playlist)/playlist_desc_update.js index a69a3b57..5a8b3e49 100644 --- a/module/playlist_desc_update.js +++ b/module/(playlist)/playlist_desc_update.js @@ -1,6 +1,6 @@ // 更新歌单描述 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/playlist_detail.js b/module/(playlist)/playlist_detail.js similarity index 79% rename from module/playlist_detail.js rename to module/(playlist)/playlist_detail.js index d3d737df..97344eee 100644 --- a/module/playlist_detail.js +++ b/module/(playlist)/playlist_detail.js @@ -1,6 +1,6 @@ // 歌单详情 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/playlist_detail_dynamic.js b/module/(playlist)/playlist_detail_dynamic.js similarity index 80% rename from module/playlist_detail_dynamic.js rename to module/(playlist)/playlist_detail_dynamic.js index d1fda3be..f7857927 100644 --- a/module/playlist_detail_dynamic.js +++ b/module/(playlist)/playlist_detail_dynamic.js @@ -1,6 +1,6 @@ // 歌单动态信息 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/playlist_detail_rcmd_get.js b/module/(playlist)/playlist_detail_rcmd_get.js similarity index 81% rename from module/playlist_detail_rcmd_get.js rename to module/(playlist)/playlist_detail_rcmd_get.js index 068a53cd..3e71e8b1 100644 --- a/module/playlist_detail_rcmd_get.js +++ b/module/(playlist)/playlist_detail_rcmd_get.js @@ -1,6 +1,6 @@ // 相关歌单推荐 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { scene: 'playlist_head', diff --git a/module/playlist_highquality_tags.js b/module/(playlist)/playlist_highquality_tags.js similarity index 77% rename from module/playlist_highquality_tags.js rename to module/(playlist)/playlist_highquality_tags.js index 95daf3bf..25bb8e24 100644 --- a/module/playlist_highquality_tags.js +++ b/module/(playlist)/playlist_highquality_tags.js @@ -1,5 +1,5 @@ // 精品歌单 tags -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/playlist_hot.js b/module/(playlist)/playlist_hot.js similarity index 72% rename from module/playlist_hot.js rename to module/(playlist)/playlist_hot.js index a194f767..ebbff187 100644 --- a/module/playlist_hot.js +++ b/module/(playlist)/playlist_hot.js @@ -1,6 +1,6 @@ // 热门歌单分类 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request(`/api/playlist/hottags`, {}, createOption(query, 'weapi')) } diff --git a/module/playlist_import_name_task_create.js b/module/(playlist)/playlist_import_name_task_create.js similarity index 96% rename from module/playlist_import_name_task_create.js rename to module/(playlist)/playlist_import_name_task_create.js index 5554a829..6a249a84 100644 --- a/module/playlist_import_name_task_create.js +++ b/module/(playlist)/playlist_import_name_task_create.js @@ -1,5 +1,5 @@ // 歌单导入 - 元数据/文字/链接导入 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { let data = { importStarPlaylist: query.importStarPlaylist || false, // 导入我喜欢的音乐 diff --git a/module/playlist_import_task_status.js b/module/(playlist)/playlist_import_task_status.js similarity index 80% rename from module/playlist_import_task_status.js rename to module/(playlist)/playlist_import_task_status.js index 50fbe6b9..82aa032f 100644 --- a/module/playlist_import_task_status.js +++ b/module/(playlist)/playlist_import_task_status.js @@ -1,5 +1,5 @@ // 歌单导入 - 任务状态 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/playlist/import/task/status/v2`, diff --git a/module/playlist_mylike.js b/module/(playlist)/playlist_mylike.js similarity index 81% rename from module/playlist_mylike.js rename to module/(playlist)/playlist_mylike.js index 03da8ea4..5b44b045 100644 --- a/module/playlist_mylike.js +++ b/module/(playlist)/playlist_mylike.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { time: query.time || '-1', diff --git a/module/playlist_name_update.js b/module/(playlist)/playlist_name_update.js similarity index 78% rename from module/playlist_name_update.js rename to module/(playlist)/playlist_name_update.js index 3bcb007b..7e799038 100644 --- a/module/playlist_name_update.js +++ b/module/(playlist)/playlist_name_update.js @@ -1,6 +1,6 @@ // 更新歌单名 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/playlist_order_update.js b/module/(playlist)/playlist_order_update.js similarity index 79% rename from module/playlist_order_update.js rename to module/(playlist)/playlist_order_update.js index 5f5b75f8..d239c161 100644 --- a/module/playlist_order_update.js +++ b/module/(playlist)/playlist_order_update.js @@ -1,6 +1,6 @@ // 编辑歌单顺序 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { ids: query.ids, diff --git a/module/playlist_privacy.js b/module/(playlist)/playlist_privacy.js similarity index 78% rename from module/playlist_privacy.js rename to module/(playlist)/playlist_privacy.js index c233cf03..d528b8b2 100644 --- a/module/playlist_privacy.js +++ b/module/(playlist)/playlist_privacy.js @@ -1,6 +1,6 @@ // 公开隐私歌单 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/playlist_subscribe.js b/module/(playlist)/playlist_subscribe.js similarity index 78% rename from module/playlist_subscribe.js rename to module/(playlist)/playlist_subscribe.js index 062027f3..4518b57c 100644 --- a/module/playlist_subscribe.js +++ b/module/(playlist)/playlist_subscribe.js @@ -1,6 +1,6 @@ // 收藏与取消收藏歌单 -const { APP_CONF } = require('../util/config.json') -const createOption = require('../util/option.js') +const { APP_CONF } = require('../../util/config.json') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const path = query.t == 1 ? 'subscribe' : 'unsubscribe' const data = { diff --git a/module/playlist_subscribers.js b/module/(playlist)/playlist_subscribers.js similarity index 81% rename from module/playlist_subscribers.js rename to module/(playlist)/playlist_subscribers.js index c61ae99d..a7a50a30 100644 --- a/module/playlist_subscribers.js +++ b/module/(playlist)/playlist_subscribers.js @@ -1,6 +1,6 @@ // 歌单收藏者 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/playlist_tags_update.js b/module/(playlist)/playlist_tags_update.js similarity index 78% rename from module/playlist_tags_update.js rename to module/(playlist)/playlist_tags_update.js index 0e767f59..bdad5c44 100644 --- a/module/playlist_tags_update.js +++ b/module/(playlist)/playlist_tags_update.js @@ -1,6 +1,6 @@ // 更新歌单标签 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/playlist_track_add.js b/module/(playlist)/playlist_track_add.js similarity index 77% rename from module/playlist_track_add.js rename to module/(playlist)/playlist_track_add.js index 1837674c..90e8a896 100644 --- a/module/playlist_track_add.js +++ b/module/(playlist)/playlist_track_add.js @@ -1,5 +1,5 @@ -const createOption = require('../util/option.js') -const logger = require('../util/logger.js') +const createOption = require('../../util/option.js') +const logger = require('../../util/logger.js') module.exports = async (query, request) => { query.ids = query.ids || '' const data = { diff --git a/module/playlist_track_all.js b/module/(playlist)/playlist_track_all.js similarity index 94% rename from module/playlist_track_all.js rename to module/(playlist)/playlist_track_all.js index 06758f51..cedc5283 100644 --- a/module/playlist_track_all.js +++ b/module/(playlist)/playlist_track_all.js @@ -1,7 +1,7 @@ // 通过传过来的歌单id拿到所有歌曲数据 // 支持传递参数limit来限制获取歌曲的数据数量 例如: /playlist/track/all?id=7044354223&limit=10 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/playlist_track_delete.js b/module/(playlist)/playlist_track_delete.js similarity index 88% rename from module/playlist_track_delete.js rename to module/(playlist)/playlist_track_delete.js index 2409552a..97d5e18a 100644 --- a/module/playlist_track_delete.js +++ b/module/(playlist)/playlist_track_delete.js @@ -1,6 +1,6 @@ // 收藏单曲到歌单 从歌单删除歌曲 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { query.ids = query.ids || '' const data = { diff --git a/module/playlist_tracks.js b/module/(playlist)/playlist_tracks.js similarity index 94% rename from module/playlist_tracks.js rename to module/(playlist)/playlist_tracks.js index e36dd802..796eaf49 100644 --- a/module/playlist_tracks.js +++ b/module/(playlist)/playlist_tracks.js @@ -1,6 +1,6 @@ // 收藏单曲到歌单 从歌单删除歌曲 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { // const tracks = query.tracks.split(',') diff --git a/module/playlist_update.js b/module/(playlist)/playlist_update.js similarity index 89% rename from module/playlist_update.js rename to module/(playlist)/playlist_update.js index 59dc7af3..927682f8 100644 --- a/module/playlist_update.js +++ b/module/(playlist)/playlist_update.js @@ -1,6 +1,6 @@ // 编辑歌单 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { query.desc = query.desc || '' query.tags = query.tags || '' diff --git a/module/playlist_update_playcount.js b/module/(playlist)/playlist_update_playcount.js similarity index 76% rename from module/playlist_update_playcount.js rename to module/(playlist)/playlist_update_playcount.js index f6951dbc..cd31c956 100644 --- a/module/playlist_update_playcount.js +++ b/module/(playlist)/playlist_update_playcount.js @@ -1,6 +1,6 @@ // 歌单打卡 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/playlist_video_recent.js b/module/(playlist)/playlist_video_recent.js similarity index 75% rename from module/playlist_video_recent.js rename to module/(playlist)/playlist_video_recent.js index 99c809ea..8583c840 100644 --- a/module/playlist_video_recent.js +++ b/module/(playlist)/playlist_video_recent.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/history_recommend_songs.js b/module/(recommend)/history_recommend_songs.js similarity index 79% rename from module/history_recommend_songs.js rename to module/(recommend)/history_recommend_songs.js index 9193cd7b..8551a967 100644 --- a/module/history_recommend_songs.js +++ b/module/(recommend)/history_recommend_songs.js @@ -1,6 +1,6 @@ // 历史每日推荐歌曲 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/history_recommend_songs_detail.js b/module/(recommend)/history_recommend_songs_detail.js similarity index 66% rename from module/history_recommend_songs_detail.js rename to module/(recommend)/history_recommend_songs_detail.js index ca9ccead..6dcc75cb 100644 --- a/module/history_recommend_songs_detail.js +++ b/module/(recommend)/history_recommend_songs_detail.js @@ -1,10 +1,8 @@ // 历史每日推荐歌曲详情 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { - const data = { - date: query.date || '', - } + const data = { date: query.date || '', } return request( `/api/discovery/recommend/songs/history/detail`, data, diff --git a/module/recommend_resource.js b/module/(recommend)/recommend_resource.js similarity index 76% rename from module/recommend_resource.js rename to module/(recommend)/recommend_resource.js index a7a7d5f3..9cd52060 100644 --- a/module/recommend_resource.js +++ b/module/(recommend)/recommend_resource.js @@ -1,6 +1,6 @@ // 每日推荐歌单 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/v1/discovery/recommend/resource`, diff --git a/module/recommend_songs.js b/module/(recommend)/recommend_songs.js similarity index 78% rename from module/recommend_songs.js rename to module/(recommend)/recommend_songs.js index 4cb981f4..27431820 100644 --- a/module/recommend_songs.js +++ b/module/(recommend)/recommend_songs.js @@ -1,6 +1,6 @@ // 每日推荐歌曲 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/recommend_songs_dislike.js b/module/(recommend)/recommend_songs_dislike.js similarity index 84% rename from module/recommend_songs_dislike.js rename to module/(recommend)/recommend_songs_dislike.js index 9f3a327a..cdb2b080 100644 --- a/module/recommend_songs_dislike.js +++ b/module/(recommend)/recommend_songs_dislike.js @@ -1,5 +1,5 @@ // 每日推荐歌曲-不感兴趣 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { resId: query.id, // 日推歌曲id diff --git a/module/record_recent_album.js b/module/(record_recnet)/record_recent_album.js similarity index 78% rename from module/record_recent_album.js rename to module/(record_recnet)/record_recent_album.js index 11466da4..f65c8c05 100644 --- a/module/record_recent_album.js +++ b/module/(record_recnet)/record_recent_album.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 100, diff --git a/module/record_recent_dj.js b/module/(record_recnet)/record_recent_dj.js similarity index 78% rename from module/record_recent_dj.js rename to module/(record_recnet)/record_recent_dj.js index ea7b4e59..85fa0879 100644 --- a/module/record_recent_dj.js +++ b/module/(record_recnet)/record_recent_dj.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 100, diff --git a/module/record_recent_playlist.js b/module/(record_recnet)/record_recent_playlist.js similarity index 78% rename from module/record_recent_playlist.js rename to module/(record_recnet)/record_recent_playlist.js index 3c80e0a7..ccc5885e 100644 --- a/module/record_recent_playlist.js +++ b/module/(record_recnet)/record_recent_playlist.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 100, diff --git a/module/record_recent_song.js b/module/(record_recnet)/record_recent_song.js similarity index 78% rename from module/record_recent_song.js rename to module/(record_recnet)/record_recent_song.js index 892b8e24..a6894981 100644 --- a/module/record_recent_song.js +++ b/module/(record_recnet)/record_recent_song.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 100, diff --git a/module/record_recent_video.js b/module/(record_recnet)/record_recent_video.js similarity index 78% rename from module/record_recent_video.js rename to module/(record_recnet)/record_recent_video.js index dfbd4ec8..309c3164 100644 --- a/module/record_recent_video.js +++ b/module/(record_recnet)/record_recent_video.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 100, diff --git a/module/record_recent_voice.js b/module/(record_recnet)/record_recent_voice.js similarity index 78% rename from module/record_recent_voice.js rename to module/(record_recnet)/record_recent_voice.js index dc8f6fcd..63d8b0a5 100644 --- a/module/record_recent_voice.js +++ b/module/(record_recnet)/record_recent_voice.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 100, diff --git a/module/related_allvideo.js b/module/(related)/related_allvideo.js similarity index 82% rename from module/related_allvideo.js rename to module/(related)/related_allvideo.js index 1fb9a6a2..2946cf6c 100644 --- a/module/related_allvideo.js +++ b/module/(related)/related_allvideo.js @@ -1,6 +1,6 @@ // 相关视频 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/related_playlist.js b/module/(related)/related_playlist.js similarity index 95% rename from module/related_playlist.js rename to module/(related)/related_playlist.js index 8975fae3..9707bbbe 100644 --- a/module/related_playlist.js +++ b/module/(related)/related_playlist.js @@ -1,6 +1,6 @@ // 相关歌单 const { default: axios } = require('axios') -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { const res = await axios({ method: 'GET', diff --git a/module/search.js b/module/(search)/search.js similarity index 92% rename from module/search.js rename to module/(search)/search.js index 077a3071..296d1b90 100644 --- a/module/search.js +++ b/module/(search)/search.js @@ -1,6 +1,6 @@ // 搜索 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { if (query.type && query.type == '2000') { const data = { diff --git a/module/(search)/search_default.js b/module/(search)/search_default.js new file mode 100644 index 00000000..04c8f345 --- /dev/null +++ b/module/(search)/search_default.js @@ -0,0 +1,6 @@ +// 默认搜索关键词 + +const createOption = require('../../util/option.js') +module.exports = (query, request) => { + return request(`/api/search/default/keyword/get`, {}, createOption(query)) +} diff --git a/module/search_hot.js b/module/(search)/search_hot.js similarity index 74% rename from module/search_hot.js rename to module/(search)/search_hot.js index 15810436..04f2a2fb 100644 --- a/module/search_hot.js +++ b/module/(search)/search_hot.js @@ -1,6 +1,6 @@ // 热门搜索 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { type: 1111, diff --git a/module/search_hot_detail.js b/module/(search)/search_hot_detail.js similarity index 74% rename from module/search_hot_detail.js rename to module/(search)/search_hot_detail.js index 20aeea3b..69eb2816 100644 --- a/module/search_hot_detail.js +++ b/module/(search)/search_hot_detail.js @@ -1,5 +1,5 @@ // 热搜列表 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request(`/api/hotsearchlist/get`, data, createOption(query, 'weapi')) diff --git a/module/search_match.js b/module/(search)/search_match.js similarity index 88% rename from module/search_match.js rename to module/(search)/search_match.js index 4f906978..1eb16ec3 100644 --- a/module/search_match.js +++ b/module/(search)/search_match.js @@ -1,6 +1,6 @@ // 本地歌曲匹配音乐信息 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { let songs = [ { diff --git a/module/search_multimatch.js b/module/(search)/search_multimatch.js similarity index 82% rename from module/search_multimatch.js rename to module/(search)/search_multimatch.js index 7ad14a18..3b41772d 100644 --- a/module/search_multimatch.js +++ b/module/(search)/search_multimatch.js @@ -1,6 +1,6 @@ // 多类型搜索 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { type: query.type || 1, diff --git a/module/search_suggest.js b/module/(search)/search_suggest.js similarity index 83% rename from module/search_suggest.js rename to module/(search)/search_suggest.js index 40ffddac..a12ccaa0 100644 --- a/module/search_suggest.js +++ b/module/(search)/search_suggest.js @@ -1,6 +1,6 @@ // 搜索建议 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { s: query.keywords || '', diff --git a/module/search_suggest_pc.js b/module/(search)/search_suggest_pc.js similarity index 80% rename from module/search_suggest_pc.js rename to module/(search)/search_suggest_pc.js index 95cc7443..e0d7f7bd 100644 --- a/module/search_suggest_pc.js +++ b/module/(search)/search_suggest_pc.js @@ -1,6 +1,6 @@ // 搜索建议pc端 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { keyword: query.keyword || '', diff --git a/module/send_album.js b/module/(send)/send_album.js similarity index 82% rename from module/send_album.js rename to module/(send)/send_album.js index cab10735..b56b092d 100644 --- a/module/send_album.js +++ b/module/(send)/send_album.js @@ -1,6 +1,6 @@ // 私信专辑 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/send_playlist.js b/module/(send)/send_playlist.js similarity index 82% rename from module/send_playlist.js rename to module/(send)/send_playlist.js index 55bdf78e..552462cc 100644 --- a/module/send_playlist.js +++ b/module/(send)/send_playlist.js @@ -1,6 +1,6 @@ // 私信歌单 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.playlist, diff --git a/module/send_song.js b/module/(send)/send_song.js similarity index 82% rename from module/send_song.js rename to module/(send)/send_song.js index efc9e00d..829d91b2 100644 --- a/module/send_song.js +++ b/module/(send)/send_song.js @@ -1,6 +1,6 @@ // 私信歌曲 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/send_text.js b/module/(send)/send_text.js similarity index 80% rename from module/send_text.js rename to module/(send)/send_text.js index 4aee44fb..a11fbd68 100644 --- a/module/send_text.js +++ b/module/(send)/send_text.js @@ -1,6 +1,6 @@ // 私信 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { type: 'text', diff --git a/module/simi_artist.js b/module/(simi)/simi_artist.js similarity index 79% rename from module/simi_artist.js rename to module/(simi)/simi_artist.js index b2f0ed76..589fa20e 100644 --- a/module/simi_artist.js +++ b/module/(simi)/simi_artist.js @@ -1,5 +1,5 @@ // 相似歌手 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { artistid: query.id, diff --git a/module/simi_mv.js b/module/(simi)/simi_mv.js similarity index 76% rename from module/simi_mv.js rename to module/(simi)/simi_mv.js index 4bd9e62d..92dfbd1f 100644 --- a/module/simi_mv.js +++ b/module/(simi)/simi_mv.js @@ -1,6 +1,6 @@ // 相似MV -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { mvid: query.mvid, diff --git a/module/simi_playlist.js b/module/(simi)/simi_playlist.js similarity index 83% rename from module/simi_playlist.js rename to module/(simi)/simi_playlist.js index dcf6e2d3..86d1fa29 100644 --- a/module/simi_playlist.js +++ b/module/(simi)/simi_playlist.js @@ -1,6 +1,6 @@ // 相似歌单 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { songid: query.id, diff --git a/module/simi_song.js b/module/(simi)/simi_song.js similarity index 83% rename from module/simi_song.js rename to module/(simi)/simi_song.js index 97f3ca83..1e8a6c22 100644 --- a/module/simi_song.js +++ b/module/(simi)/simi_song.js @@ -1,6 +1,6 @@ // 相似歌曲 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { songid: query.id, diff --git a/module/simi_user.js b/module/(simi)/simi_user.js similarity index 82% rename from module/simi_user.js rename to module/(simi)/simi_user.js index 0d96b090..61e3f022 100644 --- a/module/simi_user.js +++ b/module/(simi)/simi_user.js @@ -1,6 +1,6 @@ // 相似用户 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { songid: query.id, diff --git a/module/check_music.js b/module/(song)/check_music.js similarity index 93% rename from module/check_music.js rename to module/(song)/check_music.js index a621ccc0..184edf04 100644 --- a/module/check_music.js +++ b/module/(song)/check_music.js @@ -1,6 +1,6 @@ // 歌曲可用性 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { ids: '[' + parseInt(query.id) + ']', diff --git a/module/like.js b/module/(song)/like.js similarity index 84% rename from module/like.js rename to module/(song)/like.js index 1fbdf508..0a79b6f8 100644 --- a/module/like.js +++ b/module/(song)/like.js @@ -1,6 +1,6 @@ // 红心与取消红心歌曲 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { query.like = query.like == 'false' ? false : true const data = { diff --git a/module/likelist.js b/module/(song)/likelist.js similarity index 76% rename from module/likelist.js rename to module/(song)/likelist.js index 1a102563..2947a9c6 100644 --- a/module/likelist.js +++ b/module/(song)/likelist.js @@ -1,6 +1,6 @@ // 喜欢的歌曲(无序) -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { uid: query.uid, diff --git a/module/lyric.js b/module/(song)/lyric.js similarity index 80% rename from module/lyric.js rename to module/(song)/lyric.js index c432f29d..e325096e 100644 --- a/module/lyric.js +++ b/module/(song)/lyric.js @@ -1,6 +1,6 @@ // 歌词 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/lyric_new.js b/module/(song)/lyric_new.js similarity index 83% rename from module/lyric_new.js rename to module/(song)/lyric_new.js index 740d99f0..c6b7aceb 100644 --- a/module/lyric_new.js +++ b/module/(song)/lyric_new.js @@ -1,6 +1,6 @@ // 新版歌词 - 包含逐字歌词 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/song_chorus.js b/module/(song)/song_chorus.js similarity index 77% rename from module/song_chorus.js rename to module/(song)/song_chorus.js index e487cf45..1cc50267 100644 --- a/module/song_chorus.js +++ b/module/(song)/song_chorus.js @@ -1,5 +1,5 @@ // 副歌时间 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/song/chorus`, diff --git a/module/song_detail.js b/module/(song)/song_detail.js similarity index 85% rename from module/song_detail.js rename to module/(song)/song_detail.js index adcd9471..4365d64a 100644 --- a/module/song_detail.js +++ b/module/(song)/song_detail.js @@ -1,6 +1,6 @@ // 歌曲详情 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { // 歌曲数量不要超过1000 query.ids = query.ids.split(/\s*,\s*/) diff --git a/module/song_downlist.js b/module/(song)/song_downlist.js similarity index 82% rename from module/song_downlist.js rename to module/(song)/song_downlist.js index 6ee4643c..e62b3140 100644 --- a/module/song_downlist.js +++ b/module/(song)/song_downlist.js @@ -1,6 +1,6 @@ // 会员下载歌曲记录 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || '20', diff --git a/module/song_download_url.js b/module/(song)/song_download_url.js similarity index 81% rename from module/song_download_url.js rename to module/(song)/song_download_url.js index 9fa87740..dca2d741 100644 --- a/module/song_download_url.js +++ b/module/(song)/song_download_url.js @@ -1,6 +1,6 @@ // 获取客户端歌曲下载链接 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/song_download_url_v1.js b/module/(song)/song_download_url_v1.js similarity index 89% rename from module/song_download_url_v1.js rename to module/(song)/song_download_url_v1.js index 10a7b9c1..f2d8b938 100644 --- a/module/song_download_url_v1.js +++ b/module/(song)/song_download_url_v1.js @@ -2,7 +2,7 @@ // 此版本不再采用 br 作为音质区分的标准 // 而是采用 standard, exhigh, lossless, hires, jyeffect(高清环绕声), sky(沉浸环绕声), jymaster(超清母带) 进行音质判断 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/song_dynamic_cover.js b/module/(song)/song_dynamic_cover.js similarity index 77% rename from module/song_dynamic_cover.js rename to module/(song)/song_dynamic_cover.js index d51969f0..54030483 100644 --- a/module/song_dynamic_cover.js +++ b/module/(song)/song_dynamic_cover.js @@ -1,6 +1,6 @@ // 歌曲动态封面 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { songId: query.id, diff --git a/module/song_like.js b/module/(song)/song_like.js similarity index 81% rename from module/song_like.js rename to module/(song)/song_like.js index e3803943..e4aaa763 100644 --- a/module/song_like.js +++ b/module/(song)/song_like.js @@ -1,6 +1,6 @@ // 喜欢歌曲 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const like = query.like !== 'false' const data = { diff --git a/module/song_like_check.js b/module/(song)/song_like_check.js similarity index 77% rename from module/song_like_check.js rename to module/(song)/song_like_check.js index 4162e73e..ccd0cde4 100644 --- a/module/song_like_check.js +++ b/module/(song)/song_like_check.js @@ -1,6 +1,6 @@ // 歌曲是否喜爱 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { trackIds: query.ids, diff --git a/module/song_lyrics_mark.js b/module/(song)/song_lyrics_mark.js similarity index 79% rename from module/song_lyrics_mark.js rename to module/(song)/song_lyrics_mark.js index 74f20003..d30d2441 100644 --- a/module/song_lyrics_mark.js +++ b/module/(song)/song_lyrics_mark.js @@ -1,6 +1,6 @@ // 歌词摘录 - 歌词摘录信息 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { songId: query.id, diff --git a/module/song_lyrics_mark_add.js b/module/(song)/song_lyrics_mark_add.js similarity index 92% rename from module/song_lyrics_mark_add.js rename to module/(song)/song_lyrics_mark_add.js index 7fc6a09e..cf912099 100644 --- a/module/song_lyrics_mark_add.js +++ b/module/(song)/song_lyrics_mark_add.js @@ -1,6 +1,6 @@ // 歌词摘录 - 添加/修改摘录歌词 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { songId: query.id, diff --git a/module/song_lyrics_mark_del.js b/module/(song)/song_lyrics_mark_del.js similarity index 79% rename from module/song_lyrics_mark_del.js rename to module/(song)/song_lyrics_mark_del.js index cada7473..f5c71ec7 100644 --- a/module/song_lyrics_mark_del.js +++ b/module/(song)/song_lyrics_mark_del.js @@ -1,6 +1,6 @@ // 歌词摘录 - 删除摘录歌词 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { markIds: query.id, diff --git a/module/song_lyrics_mark_user_page.js b/module/(song)/song_lyrics_mark_user_page.js similarity index 83% rename from module/song_lyrics_mark_user_page.js rename to module/(song)/song_lyrics_mark_user_page.js index 2182dd8f..070bd34e 100644 --- a/module/song_lyrics_mark_user_page.js +++ b/module/(song)/song_lyrics_mark_user_page.js @@ -1,6 +1,6 @@ // 歌词摘录 - 我的歌词本 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 10, diff --git a/module/song_monthdownlist.js b/module/(song)/song_monthdownlist.js similarity index 83% rename from module/song_monthdownlist.js rename to module/(song)/song_monthdownlist.js index 1290eddf..b0ec5af1 100644 --- a/module/song_monthdownlist.js +++ b/module/(song)/song_monthdownlist.js @@ -1,6 +1,6 @@ // 会员本月下载歌曲记录 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || '20', diff --git a/module/song_music_detail.js b/module/(song)/song_music_detail.js similarity index 77% rename from module/song_music_detail.js rename to module/(song)/song_music_detail.js index 479a6ae2..4b3ae378 100644 --- a/module/song_music_detail.js +++ b/module/(song)/song_music_detail.js @@ -1,6 +1,6 @@ // 歌曲音质详情 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { songId: query.id, diff --git a/module/song_order_update.js b/module/(song)/song_order_update.js similarity index 81% rename from module/song_order_update.js rename to module/(song)/song_order_update.js index 55e93585..a410e3b3 100644 --- a/module/song_order_update.js +++ b/module/(song)/song_order_update.js @@ -1,6 +1,6 @@ // 更新歌曲顺序 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { pid: query.pid, diff --git a/module/song_purchased.js b/module/(song)/song_purchased.js similarity index 82% rename from module/song_purchased.js rename to module/(song)/song_purchased.js index 34b7cb6e..0ad0a7ec 100644 --- a/module/song_purchased.js +++ b/module/(song)/song_purchased.js @@ -1,6 +1,6 @@ // 已购单曲 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 20, diff --git a/module/song_red_count.js b/module/(song)/song_red_count.js similarity index 76% rename from module/song_red_count.js rename to module/(song)/song_red_count.js index 94239ca4..6c2d7662 100644 --- a/module/song_red_count.js +++ b/module/(song)/song_red_count.js @@ -1,6 +1,6 @@ // 歌曲红心数量 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { songId: query.id, diff --git a/module/song_singledownlist.js b/module/(song)/song_singledownlist.js similarity index 82% rename from module/song_singledownlist.js rename to module/(song)/song_singledownlist.js index d520d2e3..8900fe05 100644 --- a/module/song_singledownlist.js +++ b/module/(song)/song_singledownlist.js @@ -1,6 +1,6 @@ // 已购买单曲 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || '20', diff --git a/module/song_url.js b/module/(song)/song_url.js similarity index 90% rename from module/song_url.js rename to module/(song)/song_url.js index 1f65434c..7540de40 100644 --- a/module/song_url.js +++ b/module/(song)/song_url.js @@ -1,5 +1,5 @@ // 歌曲链接 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { const ids = String(query.id).split(',') const data = { diff --git a/module/song_url_match.js b/module/(song)/song_url_match.js similarity index 90% rename from module/song_url_match.js rename to module/(song)/song_url_match.js index d2adbb09..8e0bbc9b 100644 --- a/module/song_url_match.js +++ b/module/(song)/song_url_match.js @@ -1,8 +1,8 @@ // 网易云歌曲解灰(适配SPlayer的UNM-Server) // 支持qq音乐、酷狗音乐、酷我音乐、咪咕音乐、第三方网易云API等等(来自GD音乐台) -const createOption = require('../util/option.js') -const logger = require('../util/logger.js') +const createOption = require('../../util/option.js') +const logger = require('../../util/logger.js') module.exports = async (query, request) => { try { diff --git a/module/song_url_ncmget.js b/module/(song)/song_url_ncmget.js similarity index 100% rename from module/song_url_ncmget.js rename to module/(song)/song_url_ncmget.js diff --git a/module/song_url_v1.js b/module/(song)/song_url_v1.js similarity index 94% rename from module/song_url_v1.js rename to module/(song)/song_url_v1.js index 03b3f498..c76f3d62 100644 --- a/module/song_url_v1.js +++ b/module/(song)/song_url_v1.js @@ -3,8 +3,8 @@ // 而是采用 standard, exhigh, lossless, hires, jyeffect(高清环绕声), sky(沉浸环绕声), jymaster(超清母带) 进行音质判断 // 当unblock为true时, 会尝试使用unblockmusic-utils进行解锁, 同时音质设置不会生效, 但仍然为必须传入参数 -const logger = require('../util/logger.js') -const createOption = require('../util/option.js') +const logger = require('../../util/logger.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { const { matchID, diff --git a/module/song_url_v1_302.js b/module/(song)/song_url_v1_302.js similarity index 95% rename from module/song_url_v1_302.js rename to module/(song)/song_url_v1_302.js index 4150832a..bf7b6405 100644 --- a/module/song_url_v1_302.js +++ b/module/(song)/song_url_v1_302.js @@ -2,7 +2,7 @@ // 此版本不再采用 br 作为音质区分的标准 // 而是采用 standard, exhigh, lossless, hires, jyeffect(高清环绕声), sky(沉浸环绕声), jymaster(超清母带) 进行音质判断 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { const data = { id: query.id, diff --git a/module/song_wiki_summary.js b/module/(song)/song_wiki_summary.js similarity index 78% rename from module/song_wiki_summary.js rename to module/(song)/song_wiki_summary.js index fa8d8e37..a422cc57 100644 --- a/module/song_wiki_summary.js +++ b/module/(song)/song_wiki_summary.js @@ -1,5 +1,5 @@ // 音乐百科基础信息 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { songId: query.id, diff --git a/module/style_album.js b/module/(style)/style_album.js similarity index 84% rename from module/style_album.js rename to module/(style)/style_album.js index 26f84889..0f3abc1b 100644 --- a/module/style_album.js +++ b/module/(style)/style_album.js @@ -1,6 +1,6 @@ // 曲风-专辑 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { cursor: query.cursor || 0, diff --git a/module/style_artist.js b/module/(style)/style_artist.js similarity index 83% rename from module/style_artist.js rename to module/(style)/style_artist.js index 77114b78..c69c5236 100644 --- a/module/style_artist.js +++ b/module/(style)/style_artist.js @@ -1,6 +1,6 @@ // 曲风-歌手 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { cursor: query.cursor || 0, diff --git a/module/style_detail.js b/module/(style)/style_detail.js similarity index 77% rename from module/style_detail.js rename to module/(style)/style_detail.js index 3a9f1767..ee609db0 100644 --- a/module/style_detail.js +++ b/module/(style)/style_detail.js @@ -1,6 +1,6 @@ // 曲风详情 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { tagId: query.tagId, diff --git a/module/style_list.js b/module/(style)/style_list.js similarity index 73% rename from module/style_list.js rename to module/(style)/style_list.js index f73f5a51..2e3300f2 100644 --- a/module/style_list.js +++ b/module/(style)/style_list.js @@ -1,6 +1,6 @@ // 曲风列表 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request(`/api/tag/list/get`, data, createOption(query, 'weapi')) diff --git a/module/style_playlist.js b/module/(style)/style_playlist.js similarity index 83% rename from module/style_playlist.js rename to module/(style)/style_playlist.js index 69be8954..b7c4290e 100644 --- a/module/style_playlist.js +++ b/module/(style)/style_playlist.js @@ -1,6 +1,6 @@ // 曲风-歌单 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { cursor: query.cursor || 0, diff --git a/module/style_preference.js b/module/(style)/style_preference.js similarity index 76% rename from module/style_preference.js rename to module/(style)/style_preference.js index e561cacb..270be98a 100644 --- a/module/style_preference.js +++ b/module/(style)/style_preference.js @@ -1,6 +1,6 @@ // 曲风偏好 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/style_song.js b/module/(style)/style_song.js similarity index 83% rename from module/style_song.js rename to module/(style)/style_song.js index 5d827ad9..2da68db8 100644 --- a/module/style_song.js +++ b/module/(style)/style_song.js @@ -1,6 +1,6 @@ // 曲风-歌曲 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { cursor: query.cursor || 0, diff --git a/module/hot_topic.js b/module/(top)/hot_topic.js similarity index 79% rename from module/hot_topic.js rename to module/(top)/hot_topic.js index e4c86a82..aea87938 100644 --- a/module/hot_topic.js +++ b/module/(top)/hot_topic.js @@ -1,6 +1,6 @@ //热门话题 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 20, diff --git a/module/top_album.js b/module/(top)/top_album.js similarity index 90% rename from module/top_album.js rename to module/(top)/top_album.js index 5d0b45b3..944c6f48 100644 --- a/module/top_album.js +++ b/module/(top)/top_album.js @@ -1,6 +1,6 @@ // 新碟上架 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const date = new Date() diff --git a/module/top_artists.js b/module/(top)/top_artists.js similarity index 81% rename from module/top_artists.js rename to module/(top)/top_artists.js index bc8d84d6..c1170d09 100644 --- a/module/top_artists.js +++ b/module/(top)/top_artists.js @@ -1,6 +1,6 @@ // 热门歌手 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 50, diff --git a/module/top_list.js b/module/(top)/top_list.js similarity index 87% rename from module/top_list.js rename to module/(top)/top_list.js index c8eba0ef..a23b9a88 100644 --- a/module/top_list.js +++ b/module/(top)/top_list.js @@ -1,5 +1,5 @@ // 排行榜 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { if (query.idx) { return Promise.resolve({ diff --git a/module/top_mv.js b/module/(top)/top_mv.js similarity index 82% rename from module/top_mv.js rename to module/(top)/top_mv.js index 1ee32a49..68eba782 100644 --- a/module/top_mv.js +++ b/module/(top)/top_mv.js @@ -1,6 +1,6 @@ // MV排行榜 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { area: query.area || '', diff --git a/module/top_playlist.js b/module/(top)/top_playlist.js similarity index 95% rename from module/top_playlist.js rename to module/(top)/top_playlist.js index 1f463365..f67cd956 100644 --- a/module/top_playlist.js +++ b/module/(top)/top_playlist.js @@ -1,6 +1,6 @@ // 分类歌单 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { const data = { cat: query.cat || '全部', // 全部,华语,欧美,日语,韩语,粤语,小语种,流行,摇滚,民谣,电子,舞曲,说唱,轻音乐,爵士,乡村,R&B/Soul,古典,民族,英伦,金属,朋克,蓝调,雷鬼,世界音乐,拉丁,另类/独立,New Age,古风,后摇,Bossa Nova,清晨,夜晚,学习,工作,午休,下午茶,地铁,驾车,运动,旅行,散步,酒吧,怀旧,清新,浪漫,性感,伤感,治愈,放松,孤独,感动,兴奋,快乐,安静,思念,影视原声,ACG,儿童,校园,游戏,70后,80后,90后,网络歌曲,KTV,经典,翻唱,吉他,钢琴,器乐,榜单,00后 diff --git a/module/top_playlist_highquality.js b/module/(top)/top_playlist_highquality.js similarity index 89% rename from module/top_playlist_highquality.js rename to module/(top)/top_playlist_highquality.js index 68bf30b3..2c64a421 100644 --- a/module/top_playlist_highquality.js +++ b/module/(top)/top_playlist_highquality.js @@ -1,6 +1,6 @@ // 精品歌单 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { cat: query.cat || '全部', // 全部,华语,欧美,韩语,日语,粤语,小语种,运动,ACG,影视原声,流行,摇滚,后摇,古风,民谣,轻音乐,电子,器乐,说唱,古典,爵士 diff --git a/module/top_song.js b/module/(top)/top_song.js similarity index 86% rename from module/top_song.js rename to module/(top)/top_song.js index 0cbf7b10..a14ed910 100644 --- a/module/top_song.js +++ b/module/(top)/top_song.js @@ -1,6 +1,6 @@ // 新歌速递 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { areaId: query.type || 0, // 全部:0 华语:7 欧美:96 日本:8 韩国:16 diff --git a/module/toplist.js b/module/(top)/toplist.js similarity index 69% rename from module/toplist.js rename to module/(top)/toplist.js index 3fba5e18..021aac27 100644 --- a/module/toplist.js +++ b/module/(top)/toplist.js @@ -1,6 +1,6 @@ // 所有榜单介绍 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request(`/api/toplist`, {}, createOption(query)) } diff --git a/module/toplist_artist.js b/module/(top)/toplist_artist.js similarity index 81% rename from module/toplist_artist.js rename to module/(top)/toplist_artist.js index 633d1fc7..4c939ff5 100644 --- a/module/toplist_artist.js +++ b/module/(top)/toplist_artist.js @@ -1,6 +1,6 @@ // 歌手榜 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { type: query.type || 1, diff --git a/module/toplist_detail.js b/module/(top)/toplist_detail.js similarity index 73% rename from module/toplist_detail.js rename to module/(top)/toplist_detail.js index 65cb270b..50a954b3 100644 --- a/module/toplist_detail.js +++ b/module/(top)/toplist_detail.js @@ -1,6 +1,6 @@ // 所有榜单内容摘要 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request(`/api/toplist/detail`, {}, createOption(query, 'weapi')) } diff --git a/module/toplist_detail_v2.js b/module/(top)/toplist_detail_v2.js similarity index 73% rename from module/toplist_detail_v2.js rename to module/(top)/toplist_detail_v2.js index e947b7b1..aaaae528 100644 --- a/module/toplist_detail_v2.js +++ b/module/(top)/toplist_detail_v2.js @@ -1,6 +1,6 @@ // 所有榜单内容摘要v2 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request(`/api/toplist/detail/v2`, {}, createOption(query, 'weapi')) } diff --git a/module/topic_detail.js b/module/(topic)/topic_detail.js similarity index 74% rename from module/topic_detail.js rename to module/(topic)/topic_detail.js index 57162ffd..2851e018 100644 --- a/module/topic_detail.js +++ b/module/(topic)/topic_detail.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { actid: query.actid, diff --git a/module/topic_detail_event_hot.js b/module/(topic)/topic_detail_event_hot.js similarity index 75% rename from module/topic_detail_event_hot.js rename to module/(topic)/topic_detail_event_hot.js index 18504a46..e1d8fa83 100644 --- a/module/topic_detail_event_hot.js +++ b/module/(topic)/topic_detail_event_hot.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { actid: query.actid, diff --git a/module/topic_sublist.js b/module/(topic)/topic_sublist.js similarity index 81% rename from module/topic_sublist.js rename to module/(topic)/topic_sublist.js index 5424445b..0ed9dca0 100644 --- a/module/topic_sublist.js +++ b/module/(topic)/topic_sublist.js @@ -1,6 +1,6 @@ // 收藏的专栏 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 50, diff --git a/module/ugc_album_get.js b/module/(ugc)/ugc_album_get.js similarity index 77% rename from module/ugc_album_get.js rename to module/(ugc)/ugc_album_get.js index 751aa047..96100b35 100644 --- a/module/ugc_album_get.js +++ b/module/(ugc)/ugc_album_get.js @@ -1,5 +1,5 @@ // 专辑简要百科信息 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { albumId: query.id, diff --git a/module/ugc_artist_get.js b/module/(ugc)/ugc_artist_get.js similarity index 77% rename from module/ugc_artist_get.js rename to module/(ugc)/ugc_artist_get.js index 3483f0b8..a9d7b47c 100644 --- a/module/ugc_artist_get.js +++ b/module/(ugc)/ugc_artist_get.js @@ -1,5 +1,5 @@ // 歌手简要百科信息 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { artistId: query.id, diff --git a/module/ugc_artist_search.js b/module/(ugc)/ugc_artist_search.js similarity index 82% rename from module/ugc_artist_search.js rename to module/(ugc)/ugc_artist_search.js index 7bb4b866..a9b87a0e 100644 --- a/module/ugc_artist_search.js +++ b/module/(ugc)/ugc_artist_search.js @@ -1,6 +1,6 @@ // 搜索歌手 // 可传关键字或者歌手id -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { keyword: query.keyword, diff --git a/module/ugc_detail.js b/module/(ugc)/ugc_detail.js similarity index 92% rename from module/ugc_detail.js rename to module/(ugc)/ugc_detail.js index 392029bb..29f7b130 100644 --- a/module/ugc_detail.js +++ b/module/(ugc)/ugc_detail.js @@ -1,5 +1,5 @@ // 用户贡献内容 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { auditStatus: query.auditStatus || '', diff --git a/module/ugc_mv_get.js b/module/(ugc)/ugc_mv_get.js similarity index 76% rename from module/ugc_mv_get.js rename to module/(ugc)/ugc_mv_get.js index 2df71ce2..24924588 100644 --- a/module/ugc_mv_get.js +++ b/module/(ugc)/ugc_mv_get.js @@ -1,5 +1,5 @@ // mv简要百科信息 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { mvId: query.id, diff --git a/module/ugc_song_get.js b/module/(ugc)/ugc_song_get.js similarity index 77% rename from module/ugc_song_get.js rename to module/(ugc)/ugc_song_get.js index 3912c086..01d83bd3 100644 --- a/module/ugc_song_get.js +++ b/module/(ugc)/ugc_song_get.js @@ -1,5 +1,5 @@ // 歌曲简要百科信息 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { songId: query.id, diff --git a/module/ugc_user_devote.js b/module/(ugc)/ugc_user_devote.js similarity index 76% rename from module/ugc_user_devote.js rename to module/(ugc)/ugc_user_devote.js index 109c1dfb..f8c44052 100644 --- a/module/ugc_user_devote.js +++ b/module/(ugc)/ugc_user_devote.js @@ -1,5 +1,5 @@ // 用户贡献条目、积分、云贝数量 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request(`/api/rep/ugc/user/devote`, data, createOption(query)) diff --git a/module/follow.js b/module/(user)/follow.js similarity index 81% rename from module/follow.js rename to module/(user)/follow.js index 9d5d7f43..66b36beb 100644 --- a/module/follow.js +++ b/module/(user)/follow.js @@ -1,6 +1,6 @@ // 关注与取消关注用户 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { query.t = query.t == 1 ? 'follow' : 'delfollow' return request( diff --git a/module/get_userids.js b/module/(user)/get_userids.js similarity index 76% rename from module/get_userids.js rename to module/(user)/get_userids.js index c44ab890..f94e834e 100644 --- a/module/get_userids.js +++ b/module/(user)/get_userids.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { nicknames: query.nicknames, diff --git a/module/nickname_check.js b/module/(user)/nickname_check.js similarity index 76% rename from module/nickname_check.js rename to module/(user)/nickname_check.js index ccdd1019..22967bc4 100644 --- a/module/nickname_check.js +++ b/module/(user)/nickname_check.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { nickname: query.nickname, diff --git a/module/user_account.js b/module/(user)/user_account.js similarity index 72% rename from module/user_account.js rename to module/(user)/user_account.js index 0cdada53..03b89ff1 100644 --- a/module/user_account.js +++ b/module/(user)/user_account.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request(`/api/nuser/account/get`, data, createOption(query, 'weapi')) diff --git a/module/user_audio.js b/module/(user)/user_audio.js similarity index 78% rename from module/user_audio.js rename to module/(user)/user_audio.js index d2a43fad..d9f81de9 100644 --- a/module/user_audio.js +++ b/module/(user)/user_audio.js @@ -1,6 +1,6 @@ // 用户创建的电台 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { userId: query.uid, diff --git a/module/user_binding.js b/module/(user)/user_binding.js similarity index 75% rename from module/user_binding.js rename to module/(user)/user_binding.js index 0e0f7d42..35e393e9 100644 --- a/module/user_binding.js +++ b/module/(user)/user_binding.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/user_bindingcellphone.js b/module/(user)/user_bindingcellphone.js similarity index 87% rename from module/user_bindingcellphone.js rename to module/(user)/user_bindingcellphone.js index 580efd2d..09f1f8c2 100644 --- a/module/user_bindingcellphone.js +++ b/module/(user)/user_bindingcellphone.js @@ -1,5 +1,5 @@ const CryptoJS = require('crypto-js') -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { phone: query.phone, diff --git a/module/user_cloud.js b/module/(user)/user_cloud.js similarity index 80% rename from module/user_cloud.js rename to module/(user)/user_cloud.js index c5cec100..1499c3ef 100644 --- a/module/user_cloud.js +++ b/module/(user)/user_cloud.js @@ -1,6 +1,6 @@ // 云盘数据 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 30, diff --git a/module/user_cloud_del.js b/module/(user)/user_cloud_del.js similarity index 77% rename from module/user_cloud_del.js rename to module/(user)/user_cloud_del.js index acb54132..f0c45013 100644 --- a/module/user_cloud_del.js +++ b/module/(user)/user_cloud_del.js @@ -1,6 +1,6 @@ // 云盘歌曲删除 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { songIds: [query.id], diff --git a/module/user_cloud_detail.js b/module/(user)/user_cloud_detail.js similarity index 81% rename from module/user_cloud_detail.js rename to module/(user)/user_cloud_detail.js index 22420c7f..b116a71f 100644 --- a/module/user_cloud_detail.js +++ b/module/(user)/user_cloud_detail.js @@ -1,6 +1,6 @@ // 云盘数据详情 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const id = query.id.replace(/\s/g, '').split(',') const data = { diff --git a/module/user_comment_history.js b/module/(user)/user_comment_history.js similarity index 85% rename from module/user_comment_history.js rename to module/(user)/user_comment_history.js index cd93d876..d4f9309b 100644 --- a/module/user_comment_history.js +++ b/module/(user)/user_comment_history.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { compose_reminder: 'true', diff --git a/module/user_detail.js b/module/(user)/user_detail.js similarity index 85% rename from module/user_detail.js rename to module/(user)/user_detail.js index 7ed90029..663d0262 100644 --- a/module/user_detail.js +++ b/module/(user)/user_detail.js @@ -1,6 +1,6 @@ // 用户详情 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { const res = await request( `/api/v1/user/detail/${query.uid}`, diff --git a/module/user_detail_new.js b/module/(user)/user_detail_new.js similarity index 88% rename from module/user_detail_new.js rename to module/(user)/user_detail_new.js index ff319c17..fd86001f 100644 --- a/module/user_detail_new.js +++ b/module/(user)/user_detail_new.js @@ -1,6 +1,6 @@ // 用户详情 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = async (query, request) => { const data = { all: 'true', diff --git a/module/user_dj.js b/module/(user)/user_dj.js similarity index 82% rename from module/user_dj.js rename to module/(user)/user_dj.js index ff42a8ad..f4b9f995 100644 --- a/module/user_dj.js +++ b/module/(user)/user_dj.js @@ -1,6 +1,6 @@ // 用户电台节目 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 30, diff --git a/module/user_event.js b/module/(user)/user_event.js similarity index 82% rename from module/user_event.js rename to module/(user)/user_event.js index 8b947b83..654c7f5d 100644 --- a/module/user_event.js +++ b/module/(user)/user_event.js @@ -1,6 +1,6 @@ // 用户动态 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { getcounts: true, diff --git a/module/user_follow_mixed.js b/module/(user)/user_follow_mixed.js similarity index 90% rename from module/user_follow_mixed.js rename to module/(user)/user_follow_mixed.js index 4ccb1dfa..78a27169 100644 --- a/module/user_follow_mixed.js +++ b/module/(user)/user_follow_mixed.js @@ -1,6 +1,6 @@ // 当前账号关注的用户/歌手 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const size = query.size || 30 const cursor = query.cursor || 0 diff --git a/module/user_followeds.js b/module/(user)/user_followeds.js similarity index 85% rename from module/user_followeds.js rename to module/(user)/user_followeds.js index 992886f7..35f6a23a 100644 --- a/module/user_followeds.js +++ b/module/(user)/user_followeds.js @@ -1,6 +1,6 @@ // 关注TA的人(粉丝) -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { userId: query.uid, diff --git a/module/user_follows.js b/module/(user)/user_follows.js similarity index 83% rename from module/user_follows.js rename to module/(user)/user_follows.js index d604b1d2..7b839f9b 100644 --- a/module/user_follows.js +++ b/module/(user)/user_follows.js @@ -1,6 +1,6 @@ // TA关注的人(关注) -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { offset: query.offset || 0, diff --git a/module/user_level.js b/module/(user)/user_level.js similarity index 74% rename from module/user_level.js rename to module/(user)/user_level.js index 4d0107bd..8fced3e9 100644 --- a/module/user_level.js +++ b/module/(user)/user_level.js @@ -1,6 +1,6 @@ // 类别热门电台 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request(`/api/user/level`, data, createOption(query, 'weapi')) diff --git a/module/user_medal.js b/module/(user)/user_medal.js similarity index 75% rename from module/user_medal.js rename to module/(user)/user_medal.js index f9509f1c..9c0aab2d 100644 --- a/module/user_medal.js +++ b/module/(user)/user_medal.js @@ -1,5 +1,5 @@ // 用户徽章 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/medal/user/page`, diff --git a/module/user_mutualfollow_get.js b/module/(user)/user_mutualfollow_get.js similarity index 78% rename from module/user_mutualfollow_get.js rename to module/(user)/user_mutualfollow_get.js index 67bff6c8..554dfe7d 100644 --- a/module/user_mutualfollow_get.js +++ b/module/(user)/user_mutualfollow_get.js @@ -1,6 +1,6 @@ // 用户是否互相关注 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { friendid: query.uid, diff --git a/module/user_playlist.js b/module/(user)/user_playlist.js similarity index 83% rename from module/user_playlist.js rename to module/(user)/user_playlist.js index e1186445..560f1579 100644 --- a/module/user_playlist.js +++ b/module/(user)/user_playlist.js @@ -1,6 +1,6 @@ // 用户歌单 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { uid: query.uid, diff --git a/module/user_playlist_collect.js b/module/(user)/user_playlist_collect.js similarity index 86% rename from module/user_playlist_collect.js rename to module/(user)/user_playlist_collect.js index 24fb3deb..000ecbe7 100644 --- a/module/user_playlist_collect.js +++ b/module/(user)/user_playlist_collect.js @@ -1,6 +1,6 @@ // 获取用户的收藏歌单列表 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || '100', diff --git a/module/user_playlist_create.js b/module/(user)/user_playlist_create.js similarity index 86% rename from module/user_playlist_create.js rename to module/(user)/user_playlist_create.js index 03ed06d9..fd5aa0fe 100644 --- a/module/user_playlist_create.js +++ b/module/(user)/user_playlist_create.js @@ -1,6 +1,6 @@ // 获取用户的创建歌单列表 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || '100', diff --git a/module/user_record.js b/module/(user)/user_record.js similarity index 81% rename from module/user_record.js rename to module/(user)/user_record.js index 30ce8274..7cf23b8f 100644 --- a/module/user_record.js +++ b/module/(user)/user_record.js @@ -1,6 +1,6 @@ // 听歌排行 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { uid: query.uid, diff --git a/module/user_replacephone.js b/module/(user)/user_replacephone.js similarity index 84% rename from module/user_replacephone.js rename to module/(user)/user_replacephone.js index 4347526d..273f9407 100644 --- a/module/user_replacephone.js +++ b/module/(user)/user_replacephone.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { phone: query.phone, diff --git a/module/user_social_status.js b/module/(user)/user_social_status.js similarity index 76% rename from module/user_social_status.js rename to module/(user)/user_social_status.js index 97a929ba..d3c1097f 100644 --- a/module/user_social_status.js +++ b/module/(user)/user_social_status.js @@ -1,5 +1,5 @@ // 用户状态 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/social/user/status`, diff --git a/module/user_social_status_edit.js b/module/(user)/user_social_status_edit.js similarity index 86% rename from module/user_social_status_edit.js rename to module/(user)/user_social_status_edit.js index 4e53b829..7f7ec808 100644 --- a/module/user_social_status_edit.js +++ b/module/(user)/user_social_status_edit.js @@ -1,5 +1,5 @@ // 用户状态 - 编辑 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/social/user/status/edit`, diff --git a/module/user_social_status_rcmd.js b/module/(user)/user_social_status_rcmd.js similarity index 74% rename from module/user_social_status_rcmd.js rename to module/(user)/user_social_status_rcmd.js index a3b7b38f..f17f9ecc 100644 --- a/module/user_social_status_rcmd.js +++ b/module/(user)/user_social_status_rcmd.js @@ -1,5 +1,5 @@ // 用户状态 - 相同状态的用户 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request(`/api/social/user/status/rcmd`, {}, createOption(query)) } diff --git a/module/user_social_status_support.js b/module/(user)/user_social_status_support.js similarity index 74% rename from module/user_social_status_support.js rename to module/(user)/user_social_status_support.js index 1b688e8e..53f28ff5 100644 --- a/module/user_social_status_support.js +++ b/module/(user)/user_social_status_support.js @@ -1,5 +1,5 @@ // 用户状态 - 支持设置的状态 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request(`/api/social/user/status/support`, {}, createOption(query)) } diff --git a/module/user_subcount.js b/module/(user)/user_subcount.js similarity index 70% rename from module/user_subcount.js rename to module/(user)/user_subcount.js index 7b62bb6c..09a4dcd8 100644 --- a/module/user_subcount.js +++ b/module/(user)/user_subcount.js @@ -1,6 +1,6 @@ // 收藏计数 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request(`/api/subcount`, {}, createOption(query, 'weapi')) } diff --git a/module/user_update.js b/module/(user)/user_update.js similarity index 86% rename from module/user_update.js rename to module/(user)/user_update.js index c6433f18..4fe7723e 100644 --- a/module/user_update.js +++ b/module/(user)/user_update.js @@ -1,6 +1,6 @@ // 编辑用户信息 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { // avatarImgId: '0', diff --git a/module/video_category_list.js b/module/(video)/video_category_list.js similarity index 83% rename from module/video_category_list.js rename to module/(video)/video_category_list.js index 235fc12c..51c0a037 100644 --- a/module/video_category_list.js +++ b/module/(video)/video_category_list.js @@ -1,6 +1,6 @@ // 视频分类列表 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { offset: query.offset || 0, diff --git a/module/video_detail.js b/module/(video)/video_detail.js similarity index 79% rename from module/video_detail.js rename to module/(video)/video_detail.js index d5fc5565..349ce1f2 100644 --- a/module/video_detail.js +++ b/module/(video)/video_detail.js @@ -1,6 +1,6 @@ // 视频详情 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/video_detail_info.js b/module/(video)/video_detail_info.js similarity index 83% rename from module/video_detail_info.js rename to module/(video)/video_detail_info.js index 44fa36a7..e0c78f64 100644 --- a/module/video_detail_info.js +++ b/module/(video)/video_detail_info.js @@ -1,6 +1,6 @@ // 视频点赞转发评论数数据 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { threadid: `R_VI_62_${query.vid}`, diff --git a/module/video_group.js b/module/(video)/video_group.js similarity index 85% rename from module/video_group.js rename to module/(video)/video_group.js index 774d3288..5da0d0ff 100644 --- a/module/video_group.js +++ b/module/(video)/video_group.js @@ -1,6 +1,6 @@ // 视频标签/分类下的视频 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { groupId: query.id, diff --git a/module/video_group_list.js b/module/(video)/video_group_list.js similarity index 77% rename from module/video_group_list.js rename to module/(video)/video_group_list.js index b5911c5b..dd408ff7 100644 --- a/module/video_group_list.js +++ b/module/(video)/video_group_list.js @@ -1,6 +1,6 @@ // 视频标签列表 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/video_sub.js b/module/(video)/video_sub.js similarity index 83% rename from module/video_sub.js rename to module/(video)/video_sub.js index b16809f7..a21fd569 100644 --- a/module/video_sub.js +++ b/module/(video)/video_sub.js @@ -1,6 +1,6 @@ // 收藏与取消收藏视频 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { query.t = query.t == 1 ? 'sub' : 'unsub' const data = { diff --git a/module/video_timeline_all.js b/module/(video)/video_timeline_all.js similarity index 86% rename from module/video_timeline_all.js rename to module/(video)/video_timeline_all.js index e8349683..61ce0d0f 100644 --- a/module/video_timeline_all.js +++ b/module/(video)/video_timeline_all.js @@ -1,6 +1,6 @@ // 全部视频列表 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { groupId: 0, diff --git a/module/video_timeline_recommend.js b/module/(video)/video_timeline_recommend.js similarity index 84% rename from module/video_timeline_recommend.js rename to module/(video)/video_timeline_recommend.js index 63264278..f52c6092 100644 --- a/module/video_timeline_recommend.js +++ b/module/(video)/video_timeline_recommend.js @@ -1,6 +1,6 @@ // 推荐视频 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { offset: query.offset || 0, diff --git a/module/video_url.js b/module/(video)/video_url.js similarity index 81% rename from module/video_url.js rename to module/(video)/video_url.js index cccf868f..6f093d7b 100644 --- a/module/video_url.js +++ b/module/(video)/video_url.js @@ -1,6 +1,6 @@ // 视频链接 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { ids: '["' + query.id + '"]', diff --git a/module/vip_growthpoint.js b/module/(vip)/vip_growthpoint.js similarity index 78% rename from module/vip_growthpoint.js rename to module/(vip)/vip_growthpoint.js index 13aa045b..7619fc8e 100644 --- a/module/vip_growthpoint.js +++ b/module/(vip)/vip_growthpoint.js @@ -1,6 +1,6 @@ // 会员成长值 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/vip_growthpoint_details.js b/module/(vip)/vip_growthpoint_details.js similarity index 83% rename from module/vip_growthpoint_details.js rename to module/(vip)/vip_growthpoint_details.js index da4e3630..d5e0683b 100644 --- a/module/vip_growthpoint_details.js +++ b/module/(vip)/vip_growthpoint_details.js @@ -1,6 +1,6 @@ // 会员成长值领取记录 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 20, diff --git a/module/vip_growthpoint_get.js b/module/(vip)/vip_growthpoint_get.js similarity index 81% rename from module/vip_growthpoint_get.js rename to module/(vip)/vip_growthpoint_get.js index a68d7c02..6c13e893 100644 --- a/module/vip_growthpoint_get.js +++ b/module/(vip)/vip_growthpoint_get.js @@ -1,6 +1,6 @@ // 领取会员成长值 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { taskIds: query.ids, diff --git a/module/vip_info.js b/module/(vip)/vip_info.js similarity index 79% rename from module/vip_info.js rename to module/(vip)/vip_info.js index abc153c7..cbd45ab2 100644 --- a/module/vip_info.js +++ b/module/(vip)/vip_info.js @@ -1,6 +1,6 @@ // 获取 VIP 信息 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/music-vip-membership/front/vip/info`, diff --git a/module/vip_info_v2.js b/module/(vip)/vip_info_v2.js similarity index 80% rename from module/vip_info_v2.js rename to module/(vip)/vip_info_v2.js index 83ae3310..e6305a80 100644 --- a/module/vip_info_v2.js +++ b/module/(vip)/vip_info_v2.js @@ -1,6 +1,6 @@ // 获取 VIP 信息 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { return request( `/api/music-vip-membership/client/vip/info`, diff --git a/module/vip_sign.js b/module/(vip)/vip_sign.js similarity index 77% rename from module/vip_sign.js rename to module/(vip)/vip_sign.js index 8539ba71..f2068998 100644 --- a/module/vip_sign.js +++ b/module/(vip)/vip_sign.js @@ -1,6 +1,6 @@ // 黑胶乐签打卡 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/vip_sign_info.js b/module/(vip)/vip_sign_info.js similarity index 78% rename from module/vip_sign_info.js rename to module/(vip)/vip_sign_info.js index 8d77f13a..8905ac45 100644 --- a/module/vip_sign_info.js +++ b/module/(vip)/vip_sign_info.js @@ -1,6 +1,6 @@ // 黑胶乐签签到信息 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/vip_tasks.js b/module/(vip)/vip_tasks.js similarity index 77% rename from module/vip_tasks.js rename to module/(vip)/vip_tasks.js index d398c735..8a36bf90 100644 --- a/module/vip_tasks.js +++ b/module/(vip)/vip_tasks.js @@ -1,6 +1,6 @@ // 会员任务 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/vip_timemachine.js b/module/(vip)/vip_timemachine.js similarity index 86% rename from module/vip_timemachine.js rename to module/(vip)/vip_timemachine.js index 518f50ee..8d4c50f8 100644 --- a/module/vip_timemachine.js +++ b/module/(vip)/vip_timemachine.js @@ -1,6 +1,6 @@ // 黑胶时光机 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} if (query.startTime && query.endTime) { diff --git a/module/voice_delete.js b/module/(voice)/voice_delete.js similarity index 74% rename from module/voice_delete.js rename to module/(voice)/voice_delete.js index 76473e2b..ff601765 100644 --- a/module/voice_delete.js +++ b/module/(voice)/voice_delete.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { ids: query.ids, diff --git a/module/voice_detail.js b/module/(voice)/voice_detail.js similarity index 75% rename from module/voice_detail.js rename to module/(voice)/voice_detail.js index b69583bc..ccdb42aa 100644 --- a/module/voice_detail.js +++ b/module/(voice)/voice_detail.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/voice_lyric.js b/module/(voice)/voice_lyric.js similarity index 74% rename from module/voice_lyric.js rename to module/(voice)/voice_lyric.js index af4035d9..76de85e7 100644 --- a/module/voice_lyric.js +++ b/module/(voice)/voice_lyric.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { programId: query.id, diff --git a/module/voice_upload.js b/module/(voice)/voice_upload.js similarity index 97% rename from module/voice_upload.js rename to module/(voice)/voice_upload.js index 986fa71a..ad06d869 100644 --- a/module/voice_upload.js +++ b/module/(voice)/voice_upload.js @@ -2,8 +2,8 @@ const { default: axios } = require('axios') const fs = require('fs') var xml2js = require('xml2js') -const createOption = require('../util/option.js') -const { getFileExtension, readFileChunk } = require('../util/fileHelper') +const createOption = require('../../util/option.js') +const { getFileExtension, readFileChunk } = require('../../util/fileHelper.js') var parser = new xml2js.Parser() diff --git a/module/voicelist_detail.js b/module/(voice)/voicelist_detail.js similarity index 77% rename from module/voicelist_detail.js rename to module/(voice)/voicelist_detail.js index 047fed26..793d184d 100644 --- a/module/voicelist_detail.js +++ b/module/(voice)/voicelist_detail.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { id: query.id, diff --git a/module/voicelist_list.js b/module/(voice)/voicelist_list.js similarity index 83% rename from module/voicelist_list.js rename to module/(voice)/voicelist_list.js index 86f04d8b..906e3c26 100644 --- a/module/voicelist_list.js +++ b/module/(voice)/voicelist_list.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || '200', diff --git a/module/voicelist_list_search.js b/module/(voice)/voicelist_list_search.js similarity index 88% rename from module/voicelist_list_search.js rename to module/(voice)/voicelist_list_search.js index b66fa30d..112025c7 100644 --- a/module/voicelist_list_search.js +++ b/module/(voice)/voicelist_list_search.js @@ -1,5 +1,5 @@ //声音搜索 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || '200', diff --git a/module/voicelist_my_created.js b/module/(voice)/voicelist_my_created.js similarity index 81% rename from module/voicelist_my_created.js rename to module/(voice)/voicelist_my_created.js index 84f73af4..1517ed59 100644 --- a/module/voicelist_my_created.js +++ b/module/(voice)/voicelist_my_created.js @@ -1,6 +1,6 @@ // 我创建的播客声音 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 20, diff --git a/module/voicelist_search.js b/module/(voice)/voicelist_search.js similarity index 83% rename from module/voicelist_search.js rename to module/(voice)/voicelist_search.js index 0220ae62..8885458c 100644 --- a/module/voicelist_search.js +++ b/module/(voice)/voicelist_search.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { keyword: query.keyword || '', diff --git a/module/voicelist_trans.js b/module/(voice)/voicelist_trans.js similarity index 88% rename from module/voicelist_trans.js rename to module/(voice)/voicelist_trans.js index 1e142125..b7888af6 100644 --- a/module/voicelist_trans.js +++ b/module/(voice)/voicelist_trans.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || '200', // 每页数量 diff --git a/module/yunbei.js b/module/(yunbei)/yunbei.js similarity index 75% rename from module/yunbei.js rename to module/(yunbei)/yunbei.js index be9d9604..7c3b0bbe 100644 --- a/module/yunbei.js +++ b/module/(yunbei)/yunbei.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} // /api/point/today/get diff --git a/module/yunbei_expense.js b/module/(yunbei)/yunbei_expense.js similarity index 78% rename from module/yunbei_expense.js rename to module/(yunbei)/yunbei_expense.js index e1c41046..41b17999 100644 --- a/module/yunbei_expense.js +++ b/module/(yunbei)/yunbei_expense.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 10, diff --git a/module/yunbei_info.js b/module/(yunbei)/yunbei_info.js similarity index 71% rename from module/yunbei_info.js rename to module/(yunbei)/yunbei_info.js index f4c339ff..98c0e249 100644 --- a/module/yunbei_info.js +++ b/module/(yunbei)/yunbei_info.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request(`/api/v1/user/info`, data, createOption(query, 'weapi')) diff --git a/module/yunbei_rcmd_song.js b/module/(yunbei)/yunbei_rcmd_song.js similarity index 85% rename from module/yunbei_rcmd_song.js rename to module/(yunbei)/yunbei_rcmd_song.js index 5d8e7357..e0f052c2 100644 --- a/module/yunbei_rcmd_song.js +++ b/module/(yunbei)/yunbei_rcmd_song.js @@ -1,6 +1,6 @@ // 云贝推歌 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { songId: query.id, diff --git a/module/yunbei_rcmd_song_history.js b/module/(yunbei)/yunbei_rcmd_song_history.js similarity index 84% rename from module/yunbei_rcmd_song_history.js rename to module/(yunbei)/yunbei_rcmd_song_history.js index b3d427fc..c719d1e9 100644 --- a/module/yunbei_rcmd_song_history.js +++ b/module/(yunbei)/yunbei_rcmd_song_history.js @@ -1,6 +1,6 @@ // 云贝推歌历史记录 -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { page: JSON.stringify({ diff --git a/module/yunbei_receipt.js b/module/(yunbei)/yunbei_receipt.js similarity index 78% rename from module/yunbei_receipt.js rename to module/(yunbei)/yunbei_receipt.js index 82aec8e6..7300b082 100644 --- a/module/yunbei_receipt.js +++ b/module/(yunbei)/yunbei_receipt.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { limit: query.limit || 10, diff --git a/module/yunbei_sign.js b/module/(yunbei)/yunbei_sign.js similarity index 72% rename from module/yunbei_sign.js rename to module/(yunbei)/yunbei_sign.js index 74dd4629..bb3a10f6 100644 --- a/module/yunbei_sign.js +++ b/module/(yunbei)/yunbei_sign.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request(`/api/pointmall/user/sign`, data, createOption(query, 'weapi')) diff --git a/module/yunbei_task_finish.js b/module/(yunbei)/yunbei_task_finish.js similarity index 82% rename from module/yunbei_task_finish.js rename to module/(yunbei)/yunbei_task_finish.js index 49240c09..2b5d7218 100644 --- a/module/yunbei_task_finish.js +++ b/module/(yunbei)/yunbei_task_finish.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = { userTaskId: query.userTaskId, diff --git a/module/yunbei_tasks.js b/module/(yunbei)/yunbei_tasks.js similarity index 75% rename from module/yunbei_tasks.js rename to module/(yunbei)/yunbei_tasks.js index 843148ea..16a5c91e 100644 --- a/module/yunbei_tasks.js +++ b/module/(yunbei)/yunbei_tasks.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/yunbei_tasks_todo.js b/module/(yunbei)/yunbei_tasks_todo.js similarity index 75% rename from module/yunbei_tasks_todo.js rename to module/(yunbei)/yunbei_tasks_todo.js index b65060c1..76398dab 100644 --- a/module/yunbei_tasks_todo.js +++ b/module/(yunbei)/yunbei_tasks_todo.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request( diff --git a/module/yunbei_today.js b/module/(yunbei)/yunbei_today.js similarity index 71% rename from module/yunbei_today.js rename to module/(yunbei)/yunbei_today.js index 938fba9f..1e0a480a 100644 --- a/module/yunbei_today.js +++ b/module/(yunbei)/yunbei_today.js @@ -1,4 +1,4 @@ -const createOption = require('../util/option.js') +const createOption = require('../../util/option.js') module.exports = (query, request) => { const data = {} return request(`/api/point/today/get`, data, createOption(query, 'weapi')) diff --git a/module/resource_like.js b/module/resource_like.js index 1a201757..71a66621 100644 --- a/module/resource_like.js +++ b/module/resource_like.js @@ -1,5 +1,5 @@ // 点赞与取消点赞资源 -const { resourceTypeMap } = require('../util/config.json') +const resourceTypeMap = require('../util/config.json').resourceTypeMap const createOption = require('../util/option.js') module.exports = (query, request) => { query.t = query.t == 1 ? 'like' : 'unlike' diff --git a/module/search_default.js b/module/search_default.js deleted file mode 100644 index 4fd60c25..00000000 --- a/module/search_default.js +++ /dev/null @@ -1,6 +0,0 @@ -// 默认搜索关键词 - -const createOption = require('../util/option.js') -module.exports = (query, request) => { - return request(`/api/search/defaultkeyword/get`, {}, createOption(query)) -} diff --git a/module/v1/search/(tab)/album_pc.js b/module/v1/search/(tab)/album_pc.js new file mode 100644 index 00000000..3f3b5660 --- /dev/null +++ b/module/v1/search/(tab)/album_pc.js @@ -0,0 +1,16 @@ +const createOption = require("../../../../util/option.js"); + +module.exports = (query, request) => { + const data = { + s: query.s, + limit: query.limit || 10, + offset: query.offset || 0, + queryCorrect: query.queryCorrect || true, + } + + return request( + "/api/v1/search/album/get", + data, + createOption(query, "weapi") + ) +} diff --git a/module/v1/search/(tab)/artist_pc.js b/module/v1/search/(tab)/artist_pc.js new file mode 100644 index 00000000..af44459e --- /dev/null +++ b/module/v1/search/(tab)/artist_pc.js @@ -0,0 +1,16 @@ +const createOption = require("../../../../util/option.js"); + +module.exports = (query, request) => { + const data = { + s: query.s, + limit: query.limit || 10, + offset: query.offset || 0, + queryCorrect: query.queryCorrect || true, + } + + return request( + "/api/v1/search/artist/get", + data, + createOption(query, "weapi") + ) +} diff --git a/module/v1/search/(tab)/playlist_pc.js b/module/v1/search/(tab)/playlist_pc.js new file mode 100644 index 00000000..f8f548d8 --- /dev/null +++ b/module/v1/search/(tab)/playlist_pc.js @@ -0,0 +1,16 @@ +const createOption = require("../../../../util/option.js"); + +module.exports = (query, request) => { + const data = { + s: query.s, + limit: query.limit || 10, + offset: query.offset || 0, + queryCorrect: query.queryCorrect || true, + } + + return request( + "/api/v1/search/playlist/get", + data, + createOption(query, "weapi") + ) +} diff --git a/module/v1/search/(tab)/song_pc.js b/module/v1/search/(tab)/song_pc.js new file mode 100644 index 00000000..9c657d2b --- /dev/null +++ b/module/v1/search/(tab)/song_pc.js @@ -0,0 +1,18 @@ +const createOption = require("../../../../util/option.js"); + +module.exports = (query, request) => { + const data = { + keyword: query.keyword, + scene: "normal", // 暂时不知道还有啥 scene,先写死为 normal + limit: query.limit || 10, + offset: query.offset || 0, + needCorrect: query.needCorrect || true, + channel: "typing" // 暂时不知道还有啥 channel,先写死为 typing + } + + return request( + "/api/search/song/list/page", + data, + createOption(query, "weapi") + ) +} diff --git a/module/v1/search/default_keyword_pc.js b/module/v1/search/default_keyword_pc.js new file mode 100644 index 00000000..374fcfef --- /dev/null +++ b/module/v1/search/default_keyword_pc.js @@ -0,0 +1,11 @@ +const createOption = require("../../../util/option.js"); + +module.exports = (query, request) => { + const data = {} + + return request( + "/api/search/pc/rcmd/keyword/get", + data, + createOption(query, "weapi") + ) +} diff --git a/module/v1/search/suggest_pc.js b/module/v1/search/suggest_pc.js new file mode 100644 index 00000000..24973e4e --- /dev/null +++ b/module/v1/search/suggest_pc.js @@ -0,0 +1,13 @@ +const createOption = require("../../../util/option.js"); + +module.exports = (query, request) => { + const data = { + keyword: query.keyword, + } + + return request( + "/api/search/pc/suggest/keyword/get", + data, + createOption(query, "weapi") + ) +} diff --git a/package.json b/package.json index f9249fec..6d60fd88 100644 --- a/package.json +++ b/package.json @@ -103,6 +103,8 @@ "pkg": "^5.8.1", "power-assert": "^1.6.1", "prettier": "^3.8.1", - "typescript": "^5.9.3" - } + "typescript": "^5.9.3", + "@types/bun": "latest" + }, + "private": true } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 442477c8..8cb39009 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -60,6 +60,9 @@ importers: '@eslint/js': specifier: ^9.39.4 version: 9.39.4 + '@types/bun': + specifier: latest + version: 1.3.11 '@types/express': specifier: ^5.0.6 version: 5.0.6 @@ -255,6 +258,9 @@ packages: '@types/body-parser@1.19.6': resolution: {integrity: sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==} + '@types/bun@1.3.11': + resolution: {integrity: sha512-5vPne5QvtpjGpsGYXiFyycfpDF2ECyPcTSsFBMa0fraoxiQyMJ3SmuQIGhzPg2WJuWxVBoxWJ2kClYTcw/4fAg==} + '@types/busboy@1.5.4': resolution: {integrity: sha512-kG7WrUuAKK0NoyxfQHsVE6j1m01s6kMma64E+OZenQABMQyTJop1DumUWcLwAQ2JzpefU7PDYoRDKl8uZosFjw==} @@ -533,6 +539,9 @@ packages: buffer@5.7.1: resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==} + bun-types@1.3.11: + resolution: {integrity: sha512-1KGPpoxQWl9f6wcZh57LvrPIInQMn2TQ7jsgxqpRzg+l0QPOFvJVH7HmvHo/AiPgwXy+/Thf6Ov3EdVn1vOabg==} + busboy@1.6.0: resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==} engines: {node: '>=10.16.0'} @@ -1241,9 +1250,8 @@ packages: resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} engines: {node: '>=10.13.0'} - glob@10.5.0: - resolution: {integrity: sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==} - deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me + glob@10.4.5: + resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==} hasBin: true globals@14.0.0: @@ -1971,7 +1979,6 @@ packages: prebuild-install@7.1.1: resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==} engines: {node: '>=10'} - deprecated: No longer maintained. Please contact the author of the relevant native addon; alternatives are available. hasBin: true prelude-ls@1.1.2: @@ -2789,6 +2796,10 @@ snapshots: '@types/connect': 3.4.38 '@types/node': 25.5.0 + '@types/bun@1.3.11': + dependencies: + bun-types: 1.3.11 + '@types/busboy@1.5.4': dependencies: '@types/node': 25.5.0 @@ -3124,6 +3135,10 @@ snapshots: base64-js: 1.5.1 ieee754: 1.2.1 + bun-types@1.3.11: + dependencies: + '@types/node': 25.5.0 + busboy@1.6.0: dependencies: streamsearch: 1.1.0 @@ -4030,7 +4045,7 @@ snapshots: dependencies: is-glob: 4.0.3 - glob@10.5.0: + glob@10.4.5: dependencies: foreground-child: 3.3.1 jackspeak: 3.4.3 @@ -4474,7 +4489,7 @@ snapshots: diff: 7.0.0 escape-string-regexp: 4.0.0 find-up: 5.0.0 - glob: 10.5.0 + glob: 10.4.5 he: 1.2.0 is-path-inside: 3.0.3 js-yaml: 4.1.1 diff --git a/precompiled/app-linux/app b/precompiled/app-linux/app new file mode 100644 index 00000000..1fc83d65 Binary files /dev/null and b/precompiled/app-linux/app differ diff --git a/precompiled/app-macos/app b/precompiled/app-macos/app new file mode 100644 index 00000000..5a829566 Binary files /dev/null and b/precompiled/app-macos/app differ diff --git a/precompiled/app-win/app.exe b/precompiled/app-win/app.exe new file mode 100644 index 00000000..519cda99 Binary files /dev/null and b/precompiled/app-win/app.exe differ diff --git a/public/docs/_coverpage.md b/public/docs/_coverpage.md index d251cb4f..4e775904 100644 --- a/public/docs/_coverpage.md +++ b/public/docs/_coverpage.md @@ -10,4 +10,4 @@ [Github](https://github.com/neteasecloudmusicapienhanced/api-enhanced) [Get Started](#neteasecloudmusicapienhanced) -![color](#ffffff) + diff --git a/public/docs/index.html b/public/docs/index.html index e6cf90a2..16dff0db 100644 --- a/public/docs/index.html +++ b/public/docs/index.html @@ -1,5 +1,6 @@ + @@ -7,9 +8,10 @@ 网易云音乐 NodeJS API Enhanced - + - + +
@@ -44,4 +47,5 @@ gtag('config', 'G-BPRGR23JEG'); + diff --git a/server.js b/server.js index ff58fc1e..a6f99f86 100644 --- a/server.js +++ b/server.js @@ -54,40 +54,75 @@ const VERSION_CHECK_RESULT = { */ /** - * Get the module definitions dynamically. + * Get the module definitions dynamically (Recursive version) * * @param {string} modulesPath The path to modules (JS). * @param {Record} [specificRoute] The specific route of specific modules. * @param {boolean} [doRequire] If true, require() the module directly. - * Otherwise, print out the module path. Default to true. * @returns {Promise} The module definitions. - * - * @example getModuleDefinitions("./module", {"album_new.js": "/album/create"}) */ async function getModulesDefinitions( modulesPath, specificRoute, doRequire = true, ) { - const files = await fs.promises.readdir(modulesPath) - const parseRoute = (/** @type {string} */ fileName) => - specificRoute && fileName in specificRoute - ? specificRoute[fileName] - : `/${fileName.replace(/\.js$/i, '').replace(/_/g, '/')}` - - const modules = files - .reverse() - .filter((file) => file.endsWith('.js')) - .map((file) => { - const identifier = file.split('.').shift() - const route = parseRoute(file) - const modulePath = path.join(modulesPath, file) - const module = doRequire ? require(modulePath) : modulePath - - return { identifier, route, module } - }) + const modules = []; + + /** + * 递归扫描目录内部函数 + * 我们按照 Next.js 的路由结构来实现改造我们的模块系统 + * - 目录即路由前缀,文件即路由路径 + * - 例如 module/playlist/detail.js 对应 /playlist/detail 路由 + * - 目录名中的下划线会被转换成斜杠,例如 module/user/_info.js 对应 /user/info 路由 + * - 特例:如果目录名被括号包裹,例如 module/(search)/index.js,对应 /search 路由(即括号内的内容会被忽略) + * @param {string} currentDir 当前所在的目录路径 + * @param {string} basePrefix 累加的路由前缀,会转换会 URL 的一部分,可用 () 决定是否包含该部分 + */ + async function scanDir(currentDir, basePrefix = '/') { + const files = await fs.promises.readdir(currentDir); + + for (const file of files) { + const fullPath = path.join(currentDir, file); + const stat = await fs.promises.stat(fullPath); + + if (stat.isDirectory()) { + // 判断是否是路由组,例如 "(search)" + const isGroup = file.startsWith('(') && file.endsWith(')'); + + // 工程化细节:URL 路径拼接必须用 path.posix.join,防止在 Windows 下生成 \ 斜杠 + const nextPrefix = isGroup + ? basePrefix + : path.posix.join(basePrefix, file); + + // 递归进入子目录 + await scanDir(fullPath, nextPrefix); + } else if (file.endsWith('.js')) { + const identifier = file.split('.').shift(); + let route; + + // 1. 优先检查是否有特殊写死的路由映射 + if (specificRoute && file in specificRoute) { + route = specificRoute[file]; + } else { + // 2. 正常处理逻辑:文件名下划线转斜杠 + const fileRoutePath = identifier.replace(/_/g, '/'); + // 将文件夹前缀和文件路由拼接,并确保多余的斜杠被清理 + route = path.posix.join(basePrefix, fileRoutePath); + } + + const moduleDef = doRequire ? require(fullPath) : fullPath; + + // 将结果推入数组,保持和原先一样的数据结构 + modules.push({ identifier, route, module: moduleDef }); + } + } + } + + // 从根目录开始执行扫描 + await scanDir(modulesPath); - return modules + // 保持原有的逆序习惯 + return modules.reverse(); } /** @@ -201,14 +236,14 @@ async function constructServer(moduleDefs) { */ app.use((req, _, next) => { req.cookies = {} - //;(req.headers.cookie || '').split(/\s*;\s*/).forEach((pair) => { // Polynomial regular expression // - ;(req.headers.cookie || '').split(/;\s+|(? { - let crack = pair.indexOf('=') - if (crack < 1 || crack == pair.length - 1) return - req.cookies[decode(pair.slice(0, crack)).trim()] = decode( - pair.slice(crack + 1), - ).trim() - }) + //;(req.headers.cookie || '').split(/\s*;\s*/).forEach((pair) => { // Polynomial regular expression // + ; (req.headers.cookie || '').split(/;\s+|(? { + let crack = pair.indexOf('=') + if (crack < 1 || crack == pair.length - 1) return + req.cookies[decode(pair.slice(0, crack)).trim()] = decode( + pair.slice(crack + 1), + ).trim() + }) next() }) @@ -406,24 +441,22 @@ async function serveNcmApi(options) { /** @type {import('express').Express & ExpressExtension} */ const appExt = app appExt.server = app.listen(port, host, () => { - console.log(` - _ _ _____ __ __ - | \\ | |/ ____| \\/ | - | \\| | | | \\ / | - | . \` | | | |\\/| | - | |\\ | |____| | | | - |_| \\_|\\_____|_| |_| - `) - console.log(` - ╔═╗╔═╗╦ ╔═╗╔╗╔╦ ╦╔═╗╔╗╔╔═╗╔═╗╔╦╗ - ╠═╣╠═╝║ ║╣ ║║║╠═╣╠═╣║║║║ ║╣ ║║ - ╩ ╩╩ ╩ ╚═╝╝╚╝╩ ╩╩ ╩╝╚╝╚═╝╚═╝═╩╝ - `) + + console.log(`\x1b[31m + ███╗ ██╗███████╗████████╗███████╗ █████╗ ███████╗███████╗ █████╗ ██████╗ ██╗ + ████╗ ██║██╔════╝╚══██╔══╝██╔════╝██╔══██╗██╔════╝██╔════╝ ██╔══██╗██╔══██╗██║ + ██╔██╗ ██║█████╗ ██║ █████╗ ███████║███████╗█████╗ ███████║██████╔╝██║ + ██║╚██╗██║██╔══╝ ██║ ██╔══╝ ██╔══██║╚════██║██╔══╝ ██╔══██║██╔═══╝ ██║ + ██║ ╚████║███████╗ ██║ ███████╗██║ ██║███████║███████╗ ██║ ██║██║ ██║ + ╚═╝ ╚═══╝╚══════╝ ╚═╝ ╚══════╝╚═╝ ╚═╝╚══════╝╚══════╝ ╚═╝ ╚═╝╚═╝ ╚═╝ + \x1b[0m`) + logger.info(` -- Server started successfully @ http://${host ? host : 'localhost'}:${port} -- Environment: ${process.env.NODE_ENV || 'development'} -- Node Version: ${process.version} -- Process ID: ${process.pid}`) + - Server started successfully @ http://${host ? host : 'localhost'}:${port} + - Environment: ${process.env.NODE_ENV || 'development'} + - Node Version: ${process.version} + - Process ID: ${process.pid}` + ) }) return appExt diff --git a/test/nextjsLikeApi.test.ts b/test/nextjsLikeApi.test.ts new file mode 100644 index 00000000..0141e486 --- /dev/null +++ b/test/nextjsLikeApi.test.ts @@ -0,0 +1,10 @@ +import path from 'path'; +import { expect, test } from "bun:test"; +import { loadModules } from '~/util/loadModules'; + + +test('Next.js-like API Route Loader', () => { + const modulesDir = path.join(__dirname, '../module/'); + expect(modulesDir).toBe("D:\\Study\\Web\\momo-music-player\\backend\\api-enhanced\\module"); + loadModules(modulesDir); +}); diff --git a/tsconfig.json b/tsconfig.json index 37b19e11..7cf187d1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,31 +1,31 @@ { - "compilerOptions": { - "target": "ES2015", - "module": "commonjs", - "experimentalDecorators": true, - "ignoreDeprecations": "6.0", - "moduleResolution": "node", - "lib": [ - "esnext", - "esnext.asynciterable", - "dom" + "compilerOptions": { + "target": "ES2015", + "module": "commonjs", + "experimentalDecorators": true, + "ignoreDeprecations": "5.0", + "moduleResolution": "node", + "lib": [ + "esnext", + "esnext.asynciterable", + "dom" + ], + "esModuleInterop": true, + "allowJs": true, + "sourceMap": true, + "strict": true, + "noEmit": true, + "baseUrl": ".", + "paths": { + "~/*": [ + "./*" ], - "esModuleInterop": true, - "allowJs": true, - "sourceMap": true, - "strict": true, - "noEmit": true, - "baseUrl": ".", - "paths": { - "~/*": [ - "./*" - ], - "@/*": [ - "./*" - ] - }, + "@/*": [ + "./*" + ] }, - "exclude": [ - "node_modules" - ] - } \ No newline at end of file + }, + "exclude": [ + "node_modules" + ] +} diff --git a/util/loadModules.ts b/util/loadModules.ts new file mode 100644 index 00000000..4165c0a1 --- /dev/null +++ b/util/loadModules.ts @@ -0,0 +1,41 @@ +import fs from 'fs'; +import path from 'path'; + +/** + * 递归获取所有路由文件并生成前缀 + * @param dir 当前扫描的目录 + * @param basePrefix 累积的 URL 前缀 + */ +export function loadModules(dir: string, basePrefix = '/') { + const files = fs.readdirSync(dir); + + for (const file of files) { + const fullPath = path.join(dir, file); + const stat = fs.statSync(fullPath); + + if (stat.isDirectory()) { + // 检查是否是路由组 (group) + const isGroup = file.startsWith('(') && file.endsWith(')'); + const nextPrefix = isGroup + ? basePrefix + : path.join(basePrefix, file); + + // 递归处理子目录 + loadModules(fullPath, nextPrefix); + } else if (file.endsWith('.ts') || file.endsWith('.js')) { + // 处理文件 + const fileName = path.parse(file).name; + + // 兼容原有的下划线逻辑 + // 比如 file 为 "user_info.ts", basePrefix 为 "/v1" + // 结果为 /v1/user/info + const fileRoutePath = fileName.split('_').join('/'); + const finalRoute = path.join(basePrefix, fileRoutePath).replace(/\\/g, '/'); + + console.log(`绑定路由: ${finalRoute} -> 来自文件: ${fullPath}`); + + // 在这里执行你原有的 register 逻辑 + // register(finalRoute, require(fullPath)); + } + } +} diff --git a/util/request.js b/util/request.js index b1fab846..af2e1b70 100644 --- a/util/request.js +++ b/util/request.js @@ -17,7 +17,7 @@ const { generateRandomChineseIP, } = require('./index') const { URLSearchParams, URL } = require('url') -const { APP_CONF } = require('../util/config.json') +const { APP_CONF } = require('./config.json') // 预先读取匿名token并缓存 const anonymous_token = fs.readFileSync(