From dd2c88f24785faae81d4856ed1a007d726e9350d Mon Sep 17 00:00:00 2001 From: linyuanshi Date: Tue, 15 Oct 2024 14:39:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routes/Rs6.js | 3 +-- routes/service/Rs6Service.js | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/routes/Rs6.js b/routes/Rs6.js index b199810..034fb01 100644 --- a/routes/Rs6.js +++ b/routes/Rs6.js @@ -15,7 +15,6 @@ router.post('/rsCookie', async (req, res) => { let start = new Date(); try { let url = req.body['url']; - let areaName = req.body['areaName']; let htmlBase64 = req.body['htmlBase64']; let cookieBase64 = req.body['cookieBase64']; let userAgentBase64 = req.body['userAgentBase64']; @@ -42,7 +41,7 @@ router.post('/rsCookie', async (req, res) => { userAgent = Buffer.from(userAgentBase64, 'base64').toString('utf-8'); } // 执行 - let cookies = await rs6Service.handle(url, uuid, areaName, htmlStr, cookieStr, userAgent) + let cookies = await rs6Service.handle(url, uuid, htmlStr, cookieStr, userAgent) console.log(`${uuid};返回cookie ---->`, cookies) res.status(200).send(cookies); } catch (e) { diff --git a/routes/service/Rs6Service.js b/routes/service/Rs6Service.js index 57f62b4..daf93bf 100644 --- a/routes/service/Rs6Service.js +++ b/routes/service/Rs6Service.js @@ -7,9 +7,10 @@ let TimeUtil = require("../../utils/TimeUtil"); class Rs6Service { store = new Store(); // service handle - async handle(url, uuid, areaName, htmlStr, cookie, userAgent) { + async handle(url, uuid, htmlStr, cookie, userAgent) { // 获取 origin - let baseUrl = new URL(url).origin; + var var1 = new URL(url) + let baseUrl = var1.origin; // 初始化 jsDom 和 cookieJar const [jsDom, cookieJar] = jsdomFromText({ url: url, referrer: url, userAgent: userAgent, contentType: "text/html", runScripts: "outside-only", // runScripts: 'dangerously'/'outside-only' @@ -62,7 +63,7 @@ class Rs6Service { // ------------------------------------------------ 实例化浏览器 ----------------------------------------------------- browser(window, 'chrome'); // 加载js - let js = await JsUtil.loadJs(window.document, areaName, cookie); + let js = await JsUtil.loadJs(window.document, var1.hostname, cookie); console.log(`${uuid};js 加载长度--->`, js.length)