MoeFurina/NeteaseCloudMusicApiEnhanced
1
0
Fork 0
mirror of https://github.com/NeteaseCloudMusicApiEnhanced/api-enhanced.git synced 2025-10-23 07:33:10 +00:00
Code Issues Packages Projects Releases Activity

fix: 修复合并出现的冲突

Browse Source
This commit is contained in:
ImFurina 2025-08-24 23:17:23 +08:00
parent ceb2044500
commit 79edb14a03
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package.json
View File

@ -1,13 +1,7 @@
{ {
<<<<<<< HEAD
"name": "NeteaseCloudMusicApi",
"version": "4.25.0",
"description": "网易云音乐 NodeJS 版 API",
=======
"name": "@neteaseapireborn/api", "name": "@neteaseapireborn/api",
"version": "4.28.10", "version": "4.28.28",
"description": "为停更的网易云音乐 NodeJs API 提供持续的维护！", "description": "为停更的网易云音乐 NodeJs API 提供持续的维护！",
>>>>>>> 05bedc6 (feat: 支持直接在请求歌曲url使用unm server)
"scripts": { "scripts": {
"start": "node app.js", "start": "node app.js",
"test": "mocha -r intelli-espower-loader -t 60000 server.test.js main.test.js --exit", "test": "mocha -r intelli-espower-loader -t 60000 server.test.js main.test.js --exit",
@ -71,9 +65,10 @@
"data" "data"
], ],
"dependencies": { "dependencies": {
"@unblockneteasemusic/server": "^0.27.10",
"axios": "^1.2.2", "axios": "^1.2.2",
"dotenv": "^16.0.3",
"crypto-js": "^4.2.0", "crypto-js": "^4.2.0",
"dotenv": "^16.0.3",
"express": "^4.17.1", "express": "^4.17.1",
"express-fileupload": "^1.1.9", "express-fileupload": "^1.1.9",
"md5": "^2.3.0", "md5": "^2.3.0",

24
pnpm-lock.yaml generated
View File

@ -12,34 +12,34 @@ importers:
specifier: ^0.27.10 specifier: ^0.27.10
version: 0.27.10 version: 0.27.10
axios: axios:
specifier: ^1.11.0 specifier: ^1.2.2
version: 1.11.0 version: 1.11.0
crypto-js: crypto-js:
specifier: ^4.2.0 specifier: ^4.2.0
version: 4.2.0 version: 4.2.0
dotenv: dotenv:
specifier: ^16.6.1 specifier: ^16.0.3
version: 16.6.1 version: 16.6.1
express: express:
specifier: ^4.21.2 specifier: ^4.17.1
version: 4.21.2 version: 4.21.2
express-fileupload: express-fileupload:
specifier: ^1.5.2 specifier: ^1.1.9
version: 1.5.2 version: 1.5.2
md5: md5:
specifier: ^2.3.0 specifier: ^2.3.0
version: 2.3.0 version: 2.3.0
music-metadata: music-metadata:
specifier: ^7.14.0 specifier: ^7.5.3
version: 7.14.0 version: 7.14.0
node-forge: node-forge:
specifier: ^1.3.1 specifier: ^1.3.1
version: 1.3.1 version: 1.3.1
pac-proxy-agent: pac-proxy-agent:
specifier: ^7.2.0 specifier: ^7.0.0
version: 7.2.0 version: 7.2.0
qrcode: qrcode:
specifier: ^1.5.4 specifier: ^1.4.4
version: 1.5.4 version: 1.5.4
safe-decode-uri-component: safe-decode-uri-component:
specifier: ^1.2.1 specifier: ^1.2.1
@ -51,17 +51,17 @@ importers:
specifier: ^0.6.2 specifier: ^0.6.2
version: 0.6.2 version: 0.6.2
yargs: yargs:
specifier: ^17.7.2 specifier: ^17.1.1
version: 17.7.2 version: 17.7.2
devDependencies: devDependencies:
'@types/express': '@types/express':
specifier: ^4.17.23 specifier: ^4.17.13
version: 4.17.23 version: 4.17.23
'@types/express-fileupload': '@types/express-fileupload':
specifier: ^1.5.1 specifier: ^1.2.2
version: 1.5.1 version: 1.5.1
'@types/mocha': '@types/mocha':
specifier: ^9.1.1 specifier: ^9.1.0
version: 9.1.1 version: 9.1.1
'@types/node': '@types/node':
specifier: 16.11.19 specifier: 16.11.19
@ -97,7 +97,7 @@ importers:
specifier: 10.0.0 specifier: 10.0.0
version: 10.0.0 version: 10.0.0
pkg: pkg:
specifier: ^5.8.1 specifier: ^5.8.0
version: 5.8.1 version: 5.8.1
power-assert: power-assert:
specifier: 1.6.1 specifier: 1.6.1