From fa6b7eacaac86449ccfddd1cb479e2a318037834 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Tue, 9 Mar 2021 17:40:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AD=8C=E6=9B=B2ID=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E5=8F=98=E6=9B=B4=E5=AF=BC=E8=87=B4=E9=85=B7=E7=8B=97?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=8E=B7=E5=8F=96=E5=A4=B1=E8=B4=A5=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                               | 2 +-
 publish/changeLog.md                       | 2 +-
 src/renderer/utils/music/kg/comment.js     | 6 +++++-
 src/renderer/utils/music/kg/musicSearch.js | 3 +--
 src/renderer/utils/music/kg/pic.js         | 5 ++++-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 59901ba4..bba194cf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lx-music-desktop",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "description": "一个免费的音乐查找助手",
   "main": "./dist/electron/main.js",
   "productName": "lx-music-desktop",
diff --git a/publish/changeLog.md b/publish/changeLog.md
index 68c9c707..19e48b7f 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -1,3 +1,3 @@
 ### 修复
 
-- 修复歌词翻译的主题颜色适配问题
+- 修复歌曲ID存储变更导致酷狗图片获取失败的问题
diff --git a/src/renderer/utils/music/kg/comment.js b/src/renderer/utils/music/kg/comment.js
index 6cb6fd52..cffd7aa8 100644
--- a/src/renderer/utils/music/kg/comment.js
+++ b/src/renderer/utils/music/kg/comment.js
@@ -31,9 +31,13 @@ export default {
     if (statusCode != 200 || body.err_code !== 0) throw new Error('获取热门评论失败')
     return { source: 'kg', comments: this.filterComment(body.weightList || []) }
   },
-  async getReplyComment({ songmid }, replyId, page = 1, limit = 100) {
+  async getReplyComment({ songmid, audioId }, replyId, page = 1, limit = 100) {
     if (this._requestObj2) this._requestObj2.cancelHttp()
 
+    songmid = songmid.length == 32 // 修复歌曲ID存储变更导致图片获取失败的问题
+      ? audioId.split('_')[0]
+      : songmid
+
     const _requestObj2 = httpFetch(`http://comment.service.kugou.com/index.php?r=commentsv2/getReplyWithLike&code=fc4be23b4e972707f36b8a828a93ba8a&p=${page}&pagesize=${limit}&ver=1.01&clientver=8373&kugouid=687373022&appid=1001&childrenid=${songmid}&tid=${replyId}`, {
       headers: {
         'User-Agent': 'Android712-AndroidPhone-8983-18-0-COMMENT-wifi',
diff --git a/src/renderer/utils/music/kg/musicSearch.js b/src/renderer/utils/music/kg/musicSearch.js
index c181cdc7..e5909076 100644
--- a/src/renderer/utils/music/kg/musicSearch.js
+++ b/src/renderer/utils/music/kg/musicSearch.js
@@ -48,7 +48,7 @@ export default {
       name: decodeName(rawData.songname),
       albumName: decodeName(rawData.album_name),
       albumId: rawData.album_id,
-      songmid: rawData.hash,
+      songmid: rawData.audio_id,
       source: 'kg',
       interval: formatPlayTime(rawData.duration),
       _interval: rawData.duration,
@@ -58,7 +58,6 @@ export default {
       hash: rawData.hash,
       types,
       _types,
-      audioId: rawData.audio_id + '_' + rawData.hash,
       typeUrl: {},
     }
   },
diff --git a/src/renderer/utils/music/kg/pic.js b/src/renderer/utils/music/kg/pic.js
index b74693ba..5d9c262d 100644
--- a/src/renderer/utils/music/kg/pic.js
+++ b/src/renderer/utils/music/kg/pic.js
@@ -20,7 +20,10 @@ export default {
           relate: 1,
           resource: [
             {
-              album_audio_id: songInfo.songmid,
+              album_audio_id:
+                songInfo.songmid.length == 32 // 修复歌曲ID存储变更导致图片获取失败的问题
+                  ? songInfo.audioId.split('_')[0]
+                  : songInfo.songmid,
               album_id: songInfo.albumId,
               hash: songInfo.hash,
               id: 0,