diff --git a/src/main/java/top/baogutang/music/client/QQMusicClient.java b/src/main/java/top/baogutang/music/client/QQMusicClient.java index ef731da..116c5aa 100644 --- a/src/main/java/top/baogutang/music/client/QQMusicClient.java +++ b/src/main/java/top/baogutang/music/client/QQMusicClient.java @@ -267,13 +267,21 @@ public class QQMusicClient implements ChannelClient() { }); if (Objects.isNull(qqMusicDownloadRes) || Objects.isNull(qqMusicDownloadRes.getMusicUrlInfo())) { - return null; + downloadUrl = String.format(qqMusicProperties.getDownloadBaseUrl2(), id); + qqMusicDownloadRes = OkHttpUtil.get(downloadUrl, null, null, new TypeReference<>() { + }); + if (Objects.isNull(qqMusicDownloadRes) || Objects.isNull(qqMusicDownloadRes.getMusicUrlInfo())) { + return null; + } } + return download(qqMusicDownloadRes); + } + private MusicDownloadRes download(QQMusicDownloadRes qqMusicDownloadRes) { MusicDownloadRes musicDownloadRes = new MusicDownloadRes(); musicDownloadRes.setAlbumName(qqMusicDownloadRes.getSong().getAlbum()); musicDownloadRes.setArtistName(qqMusicDownloadRes.getSong().getSinger()); diff --git a/src/main/java/top/baogutang/music/properties/QQMusicProperties.java b/src/main/java/top/baogutang/music/properties/QQMusicProperties.java index 4a8a0f7..8aaf497 100644 --- a/src/main/java/top/baogutang/music/properties/QQMusicProperties.java +++ b/src/main/java/top/baogutang/music/properties/QQMusicProperties.java @@ -22,7 +22,9 @@ public class QQMusicProperties { private String albumBaseUrl; - private String downloadBaseUrl; + private String downloadBaseUrl1; + + private String downloadBaseUrl2; private String downloadPath; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2fa7bed..b0ce257 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -55,7 +55,8 @@ baogutang: query-base-url: http://117.72.78.133:5175/search?key=%s&pageNo=%d&pageSize=%d&t=%d playlist-base-url: http://117.72.78.133:5175/songlist?id=%s album-base-url: http://117.72.78.133:5175/album/songs?albummid=%s - download-base-url: http://117.72.78.133:5176/song?url=https://y.qq.com/n/ryqq/songDetail/%s + download-base-url1: http://117.72.78.133:5176/song?url=https://y.qq.com/n/ryqq/songDetail/%s + download-base-url2: http://117.72.78.133:5176/song?url=https://u.y.qq.com/n/ryqq/songDetail/%s download-path: /downloads/music # download-path: /Users/nikooh/Desktop/downloads/music diff --git a/src/main/resources/templates/music.html b/src/main/resources/templates/music.html index 7b18e72..c673cc5 100644 --- a/src/main/resources/templates/music.html +++ b/src/main/resources/templates/music.html @@ -241,8 +241,6 @@ } } - /* 其他样式保持不变 */ - .album-list { display: flex; flex-wrap: wrap; @@ -337,7 +335,6 @@ width: 100%; } - /* 歌单列表样式 */ .playlist-list { display: flex; flex-wrap: wrap; @@ -435,13 +432,14 @@ -
- - -
-

下载进度:0%

- + +
+
+

下载进度:0%

+ +
+