From 5bb9ac6235d6ffd48ea813a8bdf57e543e315f98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=91=98=E5=B0=8F=E5=A2=A8?= <2291200076@qq.com> Date: Fri, 29 Jul 2022 16:15:45 +0800 Subject: [PATCH] =?UTF-8?q?weibo,bilibili=E5=90=8E=E6=B7=BB=E5=8A=A0hotban?= =?UTF-8?q?d=EF=BC=9B=E4=BF=AE=E6=94=B9html=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/{bilibili.html => bilibili_hotband.html} | 2 +- html/{weibo.html => weibo_hotband.html} | 2 +- index.html | 6 +++--- src/get_bilibili_hotband.js | 15 +++++++++------ src/get_weibo_hotband.js | 15 +++++++++------ 5 files changed, 23 insertions(+), 17 deletions(-) rename html/{bilibili.html => bilibili_hotband.html} (99%) rename html/{weibo.html => weibo_hotband.html} (99%) diff --git a/html/bilibili.html b/html/bilibili_hotband.html similarity index 99% rename from html/bilibili.html rename to html/bilibili_hotband.html index 85786e9..364158d 100644 --- a/html/bilibili.html +++ b/html/bilibili_hotband.html @@ -192,7 +192,7 @@ function getData() { var xhr = new XMLHttpRequest(); - xhr.open("GET", "../data/bilibili/latest.json?t=" + Date.now(), true); + xhr.open("GET", "../data/bilibili-hotband/latest.json?t=" + Date.now(), true); xhr.send(); xhr.onreadystatechange = function () { if (xhr.readyState !== 4) return; diff --git a/html/weibo.html b/html/weibo_hotband.html similarity index 99% rename from html/weibo.html rename to html/weibo_hotband.html index 275ceb2..dfb9105 100644 --- a/html/weibo.html +++ b/html/weibo_hotband.html @@ -201,7 +201,7 @@ function getData() { var xhr = new XMLHttpRequest(); - xhr.open("GET", "../data/weibo/latest.json?t=" + Date.now(), true); + xhr.open("GET", "../data/weibo-hotband/latest.json?t=" + Date.now(), true); xhr.send(); xhr.onreadystatechange = function () { if (xhr.readyState !== 4) return; diff --git a/index.html b/index.html index abfc0b2..f1af8d0 100644 --- a/index.html +++ b/index.html @@ -74,11 +74,11 @@
-
+

微博

-
+

B站

@@ -123,7 +123,7 @@ // 根据 URL 参数切换页面 function locationToPageByUrlParam() { - let pages = ['weibo', 'bilibili']; + let pages = ['weibo_hotband', 'bilibili_hotband']; // 获取 url 中的 target 参数 let url = new URL(window.location.href); let target = url.searchParams.get('target'); diff --git a/src/get_bilibili_hotband.js b/src/get_bilibili_hotband.js index d39c5f1..2a38c57 100644 --- a/src/get_bilibili_hotband.js +++ b/src/get_bilibili_hotband.js @@ -6,7 +6,10 @@ const path = require('path'); const fileUtils = require('./utils/fileUtils'); const requestUtils = require('./utils/requestUtils'); -const DATA_FOLDER = path.join(path.dirname(__dirname), process.env.DATA_FOLDER ?? 'data', 'bilibili'); +const API_URL = "https://app.bilibili.com/x/v2/search/trending/ranking"; +const SUB_FOLDER = "bilibili-hotband"; + +const DATA_FOLDER = path.join(path.dirname(__dirname), process.env.DATA_FOLDER ?? 'data', SUB_FOLDER); console.log("DATA_FOLDER", DATA_FOLDER); fileUtils.createFolder(DATA_FOLDER); // 程序运行就保证 data 目录存在 @@ -14,12 +17,12 @@ async function main() { let requestTimestamp = Date.now(); let now = new Date(requestTimestamp + 8 * 3600 * 1000).toISOString(); - let result = await requestUtils.getApiResult("https://app.bilibili.com/x/v2/search/trending/ranking"); + let result = await requestUtils.getApiResult(API_URL); if (result.code != 0) { - console.log(new Date(Date.now() + 8 * 60 * 60 * 1000).toISOString(), "bilibili", "请求成功，但服务器处理失败，正在重试。"); - result = await requestUtils.getApiResult("https://app.bilibili.com/x/v2/search/trending/ranking"); + console.log(new Date(Date.now() + 8 * 60 * 60 * 1000).toISOString(), SUB_FOLDER, "请求成功，但服务器处理失败，正在重试。"); + result = await requestUtils.getApiResult(API_URL); if (result.ok != 1) { - console.log(new Date(Date.now() + 8 * 60 * 60 * 1000).toISOString(), "bilibili", "请求成功，但服务器处理失败，保存失败信息。"); + console.log(new Date(Date.now() + 8 * 60 * 60 * 1000).toISOString(), SUB_FOLDER, "请求成功，但服务器处理失败，保存失败信息。"); // ok 不为 1，那么久直接保存便于后续分析，不进行后续处理 fileUtils.saveJSON({ saveFolder: DATA_FOLDER, @@ -33,7 +36,7 @@ async function main() { } } - console.log(new Date(Date.now() + 8 * 60 * 60 * 1000).toISOString(), "bilibili", "请求成功"); + console.log(new Date(Date.now() + 8 * 60 * 60 * 1000).toISOString(), SUB_FOLDER, "请求成功"); // console.log("result", result); let data = result.data; diff --git a/src/get_weibo_hotband.js b/src/get_weibo_hotband.js index d482d81..cb08c35 100644 --- a/src/get_weibo_hotband.js +++ b/src/get_weibo_hotband.js @@ -6,7 +6,10 @@ const path = require('path'); const fileUtils = require('./utils/fileUtils'); const requestUtils = require('./utils/requestUtils'); -const DATA_FOLDER = path.join(path.dirname(__dirname), process.env.DATA_FOLDER ?? 'data', 'weibo'); +const API_URL = "https://weibo.com/ajax/statuses/hot_band"; +const SUB_FOLDER = "weibo-hotband"; + +const DATA_FOLDER = path.join(path.dirname(__dirname), process.env.DATA_FOLDER ?? 'data', SUB_FOLDER); console.log("DATA_FOLDER", DATA_FOLDER); fileUtils.createFolder(DATA_FOLDER); // 程序运行就保证 data 目录存在 @@ -14,12 +17,12 @@ async function main() { let requestTimestamp = Date.now(); let now = new Date(requestTimestamp + 8 * 3600 * 1000).toISOString(); - let result = await requestUtils.getApiResult("https://weibo.com/ajax/statuses/hot_band"); + let result = await requestUtils.getApiResult(API_URL); if (result.ok != 1) { - console.log(new Date(Date.now() + 8 * 60 * 60 * 1000).toISOString(), "weibo", "请求成功，但服务器处理失败，正在重试。"); - result = await requestUtils.getApiResult("https://weibo.com/ajax/statuses/hot_band"); + console.log(new Date(Date.now() + 8 * 60 * 60 * 1000).toISOString(), SUB_FOLDER, "请求成功，但服务器处理失败，正在重试。"); + result = await requestUtils.getApiResult(API_URL); if (result.ok != 1) { - console.log(new Date(Date.now() + 8 * 60 * 60 * 1000).toISOString(), "weibo", "请求成功，但服务器处理失败，保存失败信息。"); + console.log(new Date(Date.now() + 8 * 60 * 60 * 1000).toISOString(), SUB_FOLDER, "请求成功，但服务器处理失败，保存失败信息。"); // ok 不为 1，那么久直接保存便于后续分析，不进行后续处理 fileUtils.saveJSON({ saveFolder: DATA_FOLDER, @@ -33,7 +36,7 @@ async function main() { } } - console.log(new Date(Date.now() + 8 * 60 * 60 * 1000).toISOString(), "weibo", "请求成功"); + console.log(new Date(Date.now() + 8 * 60 * 60 * 1000).toISOString(), SUB_FOLDER, "请求成功"); // console.log("result", result); /**