Merge remote-tracking branch 'origin/master'

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) {

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)