From 8a9b040092a706efcf9e3ccc78657afa6ee5c2a5 Mon Sep 17 00:00:00 2001
From: overwriter <no@email.address>
Date: Sat, 23 Sep 2023 07:58:45 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A02017-2022=E5=B9=B4?=
 =?UTF-8?q?=E5=BA=A6=E5=90=AC=E6=AD=8C=E6=8A=A5=E5=91=8A=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/summary_annual_2017.js | 17 +++++++++++++++++
 module/summary_annual_2018.js | 17 +++++++++++++++++
 module/summary_annual_2019.js | 17 +++++++++++++++++
 module/summary_annual_2020.js | 17 +++++++++++++++++
 module/summary_annual_2021.js | 17 +++++++++++++++++
 module/summary_annual_2022.js | 17 +++++++++++++++++
 6 files changed, 102 insertions(+)
 create mode 100644 module/summary_annual_2017.js
 create mode 100644 module/summary_annual_2018.js
 create mode 100644 module/summary_annual_2019.js
 create mode 100644 module/summary_annual_2020.js
 create mode 100644 module/summary_annual_2021.js
 create mode 100644 module/summary_annual_2022.js

diff --git a/module/summary_annual_2017.js b/module/summary_annual_2017.js
new file mode 100644
index 0000000..0f7709c
--- /dev/null
+++ b/module/summary_annual_2017.js
@@ -0,0 +1,17 @@
+// 年度听歌报告2017
+const crypto = require('crypto')
+module.exports = (query, request) => {
+  const data = {}
+  return request(
+    'POST',
+    `https://music.163.com/weapi/activity/summary/annual/2017/userdata`,
+    data,
+    {
+      crypto: 'eapi',
+      cookie: query.cookie,
+      proxy: query.proxy,
+      realIP: query.realIP,
+      url: '/api/activity/summary/annual/2017/userdata',
+    },
+  )
+}
diff --git a/module/summary_annual_2018.js b/module/summary_annual_2018.js
new file mode 100644
index 0000000..eeab9fa
--- /dev/null
+++ b/module/summary_annual_2018.js
@@ -0,0 +1,17 @@
+// 年度听歌报告2018
+const crypto = require('crypto')
+module.exports = (query, request) => {
+  const data = {}
+  return request(
+    'POST',
+    `https://music.163.com/weapi/activity/summary/annual/2018/userdata`,
+    data,
+    {
+      crypto: 'eapi',
+      cookie: query.cookie,
+      proxy: query.proxy,
+      realIP: query.realIP,
+      url: '/api/activity/summary/annual/2018/userdata',
+    },
+  )
+}
diff --git a/module/summary_annual_2019.js b/module/summary_annual_2019.js
new file mode 100644
index 0000000..7dedebf
--- /dev/null
+++ b/module/summary_annual_2019.js
@@ -0,0 +1,17 @@
+// 年度听歌报告2019
+const crypto = require('crypto')
+module.exports = (query, request) => {
+  const data = {}
+  return request(
+    'POST',
+    `https://music.163.com/weapi/activity/summary/annual/2019/userdata`,
+    data,
+    {
+      crypto: 'eapi',
+      cookie: query.cookie,
+      proxy: query.proxy,
+      realIP: query.realIP,
+      url: '/api/activity/summary/annual/2019/userdata',
+    },
+  )
+}
diff --git a/module/summary_annual_2020.js b/module/summary_annual_2020.js
new file mode 100644
index 0000000..9b1c8b3
--- /dev/null
+++ b/module/summary_annual_2020.js
@@ -0,0 +1,17 @@
+// 年度听歌报告2020
+const crypto = require('crypto')
+module.exports = (query, request) => {
+  const data = {}
+  return request(
+    'POST',
+    `https://music.163.com/weapi/activity/summary/annual/2020/data`,
+    data,
+    {
+      crypto: 'eapi',
+      cookie: query.cookie,
+      proxy: query.proxy,
+      realIP: query.realIP,
+      url: '/api/activity/summary/annual/2020/data',
+    },
+  )
+}
diff --git a/module/summary_annual_2021.js b/module/summary_annual_2021.js
new file mode 100644
index 0000000..bdd0084
--- /dev/null
+++ b/module/summary_annual_2021.js
@@ -0,0 +1,17 @@
+// 年度听歌报告2021
+const crypto = require('crypto')
+module.exports = (query, request) => {
+  const data = {}
+  return request(
+    'POST',
+    `https://music.163.com/weapi/activity/summary/annual/2021/data`,
+    data,
+    {
+      crypto: 'eapi',
+      cookie: query.cookie,
+      proxy: query.proxy,
+      realIP: query.realIP,
+      url: '/api/activity/summary/annual/2021/data',
+    },
+  )
+}
diff --git a/module/summary_annual_2022.js b/module/summary_annual_2022.js
new file mode 100644
index 0000000..35d3531
--- /dev/null
+++ b/module/summary_annual_2022.js
@@ -0,0 +1,17 @@
+// 年度听歌报告2022
+const crypto = require('crypto')
+module.exports = (query, request) => {
+  const data = {}
+  return request(
+    'POST',
+    `https://music.163.com/weapi/activity/summary/annual/2022/data`,
+    data,
+    {
+      crypto: 'eapi',
+      cookie: query.cookie,
+      proxy: query.proxy,
+      realIP: query.realIP,
+      url: '/api/activity/summary/annual/2022/data',
+    },
+  )
+}

From 8d1f196cf6c24c75f9282b49f3309b401e9aac95 Mon Sep 17 00:00:00 2001
From: overwriter <no@email.address>
Date: Sat, 23 Sep 2023 08:31:22 +0800
Subject: [PATCH 2/5] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/README.md | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/docs/README.md b/docs/README.md
index 5cc33e7..efffd8a 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -284,6 +284,12 @@
 266. 搜索歌手
 267. 用户贡献内容
 268. 用户贡献条目、积分、云贝数量
+269. 年度听歌报告2017
+269. 年度听歌报告2018
+269. 年度听歌报告2019
+269. 年度听歌报告2020
+269. 年度听歌报告2021
+269. 年度听歌报告2022
 
 ## 安装
 
@@ -4404,6 +4410,48 @@ qrCodeStatus:20,detailReason:0  验证成功qrCodeStatus:21,detailReason:0 二
 
 **调用例子:** `/ugc/user/devote`
 
+### 年度听歌报告2017
+说明: 登录后调用此接口,使用此接口,可获取当前登录用户年度听歌报告2017
+
+**接口地址:** `/summary/annual/2017`
+
+**调用例子:** `/summary/annual/2017`
+
+### 年度听歌报告2018
+说明: 登录后调用此接口,使用此接口,可获取当前登录用户年度听歌报告2018
+
+**接口地址:** `/summary/annual/2018`
+
+**调用例子:** `/summary/annual/2018`
+
+### 年度听歌报告2019
+说明: 登录后调用此接口,使用此接口,可获取当前登录用户年度听歌报告2019
+
+**接口地址:** `/summary/annual/2019`
+
+**调用例子:** `/summary/annual/2019`
+
+### 年度听歌报告2020
+说明: 登录后调用此接口,使用此接口,可获取当前登录用户年度听歌报告2020
+
+**接口地址:** `/summary/annual/2020`
+
+**调用例子:** `/summary/annual/2020`
+
+### 年度听歌报告2021
+说明: 登录后调用此接口,使用此接口,可获取当前登录用户年度听歌报告2021
+
+**接口地址:** `/summary/annual/2021`
+
+**调用例子:** `/summary/annual/2021`
+
+### 年度听歌报告2022
+说明: 登录后调用此接口,使用此接口,可获取当前登录用户年度听歌报告2022
+
+**接口地址:** `/summary/annual/2022`
+
+**调用例子:** `/summary/annual/2022`
+
 ## 离线访问此文档
 
 此文档同时也是 Progressive Web Apps(PWA), 加入了 serviceWorker, 可离线访问

From a526741a556b677500079e1b68744b257ccf5fa6 Mon Sep 17 00:00:00 2001
From: overwriter <no@email.address>
Date: Sat, 23 Sep 2023 08:39:47 +0800
Subject: [PATCH 3/5] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index efffd8a..3adc4b9 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -285,11 +285,11 @@
 267. 用户贡献内容
 268. 用户贡献条目、积分、云贝数量
 269. 年度听歌报告2017
-269. 年度听歌报告2018
-269. 年度听歌报告2019
-269. 年度听歌报告2020
-269. 年度听歌报告2021
-269. 年度听歌报告2022
+270. 年度听歌报告2018
+271. 年度听歌报告2019
+272. 年度听歌报告2020
+273. 年度听歌报告2021
+274. 年度听歌报告2022
 
 ## 安装
 

From 5506e31c433f8191ed5e649db06559ffc5a8b42e Mon Sep 17 00:00:00 2001
From: overwriter <no@email.address>
Date: Sat, 23 Sep 2023 11:01:31 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=B2=89=E4=B8=9D?=
 =?UTF-8?q?=E6=9D=A5=E6=BA=90=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/fanscenter_trend_list.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/module/fanscenter_trend_list.js b/module/fanscenter_trend_list.js
index 00c0343..8748cf0 100644
--- a/module/fanscenter_trend_list.js
+++ b/module/fanscenter_trend_list.js
@@ -1,7 +1,11 @@
 // 粉丝来源
 const crypto = require('crypto')
 module.exports = (query, request) => {
-  const data = {}
+  const data = {
+    startTime: query.startTime || Date.now() - 7 * 24 * 3600 * 1000,
+    endTime: query.endTime || Date.now(),
+    type: query.type || 0, //新增关注:0 新增取关:1
+  }
   return request(
     'POST',
     `https://interface.music.163.com/weapi/fanscenter/trend/list`,

From bb7f0734f54d0868fe799096ef6bcbb79b51308b Mon Sep 17 00:00:00 2001
From: overwriter <no@email.address>
Date: Sat, 23 Sep 2023 13:38:45 +0800
Subject: [PATCH 5/5] =?UTF-8?q?refactor:=E5=90=88=E5=B9=B6=E5=B9=B4?=
 =?UTF-8?q?=E5=BA=A6=E5=90=AC=E6=AD=8C=E6=8A=A5=E5=91=8A=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/README.md                | 52 ++++++-----------------------------
 module/summary_annual.js      | 19 +++++++++++++
 module/summary_annual_2017.js | 17 ------------
 module/summary_annual_2018.js | 17 ------------
 module/summary_annual_2019.js | 17 ------------
 module/summary_annual_2020.js | 17 ------------
 module/summary_annual_2021.js | 17 ------------
 module/summary_annual_2022.js | 17 ------------
 8 files changed, 27 insertions(+), 146 deletions(-)
 create mode 100644 module/summary_annual.js
 delete mode 100644 module/summary_annual_2017.js
 delete mode 100644 module/summary_annual_2018.js
 delete mode 100644 module/summary_annual_2019.js
 delete mode 100644 module/summary_annual_2020.js
 delete mode 100644 module/summary_annual_2021.js
 delete mode 100644 module/summary_annual_2022.js

diff --git a/docs/README.md b/docs/README.md
index 3adc4b9..09df6d7 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -284,12 +284,7 @@
 266. 搜索歌手
 267. 用户贡献内容
 268. 用户贡献条目、积分、云贝数量
-269. 年度听歌报告2017
-270. 年度听歌报告2018
-271. 年度听歌报告2019
-272. 年度听歌报告2020
-273. 年度听歌报告2021
-274. 年度听歌报告2022
+269. 年度听歌报告
 
 ## 安装
 
@@ -4375,7 +4370,7 @@ qrCodeStatus:20,detailReason:0  验证成功qrCodeStatus:21,detailReason:0 二
 
 `limit`: 取出条目数量 , 默认为 40
 
-**接口地址:** `/artist/search',`
+**接口地址:** `/artist/search`
 
 **调用例子:** `/artist/search?keyword=sasakure`
 
@@ -4410,47 +4405,16 @@ qrCodeStatus:20,detailReason:0  验证成功qrCodeStatus:21,detailReason:0 二
 
 **调用例子:** `/ugc/user/devote`
 
-### 年度听歌报告2017
-说明: 登录后调用此接口,使用此接口,可获取当前登录用户年度听歌报告2017
+### 年度听歌报告
+说明: 登录后调用此接口,使用此接口,可获取当前登录用户年度听歌报告，目前支持2017-2022年的报告
 
-**接口地址:** `/summary/annual/2017`
+**必选参数：**  
 
-**调用例子:** `/summary/annual/2017`
+`year`: 报告年份
 
-### 年度听歌报告2018
-说明: 登录后调用此接口,使用此接口,可获取当前登录用户年度听歌报告2018
+**接口地址:** `/summary/annual/`
 
-**接口地址:** `/summary/annual/2018`
-
-**调用例子:** `/summary/annual/2018`
-
-### 年度听歌报告2019
-说明: 登录后调用此接口,使用此接口,可获取当前登录用户年度听歌报告2019
-
-**接口地址:** `/summary/annual/2019`
-
-**调用例子:** `/summary/annual/2019`
-
-### 年度听歌报告2020
-说明: 登录后调用此接口,使用此接口,可获取当前登录用户年度听歌报告2020
-
-**接口地址:** `/summary/annual/2020`
-
-**调用例子:** `/summary/annual/2020`
-
-### 年度听歌报告2021
-说明: 登录后调用此接口,使用此接口,可获取当前登录用户年度听歌报告2021
-
-**接口地址:** `/summary/annual/2021`
-
-**调用例子:** `/summary/annual/2021`
-
-### 年度听歌报告2022
-说明: 登录后调用此接口,使用此接口,可获取当前登录用户年度听歌报告2022
-
-**接口地址:** `/summary/annual/2022`
-
-**调用例子:** `/summary/annual/2022`
+**调用例子:** `/summary/annual?year=2022`
 
 ## 离线访问此文档
 
diff --git a/module/summary_annual.js b/module/summary_annual.js
new file mode 100644
index 0000000..14f8162
--- /dev/null
+++ b/module/summary_annual.js
@@ -0,0 +1,19 @@
+// 年度听歌报告2017-2022
+const crypto = require('crypto')
+module.exports = (query, request) => {
+  const data = {}
+  const key =
+    ['2017', '2018', '2019'].indexOf(query.year) > -1 ? 'userdata' : 'data'
+  return request(
+    'POST',
+    `https://music.163.com/weapi/activity/summary/annual/${query.year}/${key}`,
+    data,
+    {
+      crypto: 'eapi',
+      cookie: query.cookie,
+      proxy: query.proxy,
+      realIP: query.realIP,
+      url: `/api/activity/summary/annual/${query.year}/${key}`,
+    },
+  )
+}
diff --git a/module/summary_annual_2017.js b/module/summary_annual_2017.js
deleted file mode 100644
index 0f7709c..0000000
--- a/module/summary_annual_2017.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// 年度听歌报告2017
-const crypto = require('crypto')
-module.exports = (query, request) => {
-  const data = {}
-  return request(
-    'POST',
-    `https://music.163.com/weapi/activity/summary/annual/2017/userdata`,
-    data,
-    {
-      crypto: 'eapi',
-      cookie: query.cookie,
-      proxy: query.proxy,
-      realIP: query.realIP,
-      url: '/api/activity/summary/annual/2017/userdata',
-    },
-  )
-}
diff --git a/module/summary_annual_2018.js b/module/summary_annual_2018.js
deleted file mode 100644
index eeab9fa..0000000
--- a/module/summary_annual_2018.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// 年度听歌报告2018
-const crypto = require('crypto')
-module.exports = (query, request) => {
-  const data = {}
-  return request(
-    'POST',
-    `https://music.163.com/weapi/activity/summary/annual/2018/userdata`,
-    data,
-    {
-      crypto: 'eapi',
-      cookie: query.cookie,
-      proxy: query.proxy,
-      realIP: query.realIP,
-      url: '/api/activity/summary/annual/2018/userdata',
-    },
-  )
-}
diff --git a/module/summary_annual_2019.js b/module/summary_annual_2019.js
deleted file mode 100644
index 7dedebf..0000000
--- a/module/summary_annual_2019.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// 年度听歌报告2019
-const crypto = require('crypto')
-module.exports = (query, request) => {
-  const data = {}
-  return request(
-    'POST',
-    `https://music.163.com/weapi/activity/summary/annual/2019/userdata`,
-    data,
-    {
-      crypto: 'eapi',
-      cookie: query.cookie,
-      proxy: query.proxy,
-      realIP: query.realIP,
-      url: '/api/activity/summary/annual/2019/userdata',
-    },
-  )
-}
diff --git a/module/summary_annual_2020.js b/module/summary_annual_2020.js
deleted file mode 100644
index 9b1c8b3..0000000
--- a/module/summary_annual_2020.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// 年度听歌报告2020
-const crypto = require('crypto')
-module.exports = (query, request) => {
-  const data = {}
-  return request(
-    'POST',
-    `https://music.163.com/weapi/activity/summary/annual/2020/data`,
-    data,
-    {
-      crypto: 'eapi',
-      cookie: query.cookie,
-      proxy: query.proxy,
-      realIP: query.realIP,
-      url: '/api/activity/summary/annual/2020/data',
-    },
-  )
-}
diff --git a/module/summary_annual_2021.js b/module/summary_annual_2021.js
deleted file mode 100644
index bdd0084..0000000
--- a/module/summary_annual_2021.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// 年度听歌报告2021
-const crypto = require('crypto')
-module.exports = (query, request) => {
-  const data = {}
-  return request(
-    'POST',
-    `https://music.163.com/weapi/activity/summary/annual/2021/data`,
-    data,
-    {
-      crypto: 'eapi',
-      cookie: query.cookie,
-      proxy: query.proxy,
-      realIP: query.realIP,
-      url: '/api/activity/summary/annual/2021/data',
-    },
-  )
-}
diff --git a/module/summary_annual_2022.js b/module/summary_annual_2022.js
deleted file mode 100644
index 35d3531..0000000
--- a/module/summary_annual_2022.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// 年度听歌报告2022
-const crypto = require('crypto')
-module.exports = (query, request) => {
-  const data = {}
-  return request(
-    'POST',
-    `https://music.163.com/weapi/activity/summary/annual/2022/data`,
-    data,
-    {
-      crypto: 'eapi',
-      cookie: query.cookie,
-      proxy: query.proxy,
-      realIP: query.realIP,
-      url: '/api/activity/summary/annual/2022/data',
-    },
-  )
-}