From f84eb673c8a1dc3736c43cf14d8a865325ee34bf Mon Sep 17 00:00:00 2001 From: NaiboWang-Alienware Date: Thu, 6 Jul 2023 05:43:37 +0800 Subject: [PATCH] URL pattern detect --- ElectronJS/config.json | 8 +-- ElectronJS/main.js | 2 +- ElectronJS/src/taskGrid/FlowChart_CN.html | 22 ++++--- ElectronJS/src/taskGrid/logic_CN.js | 16 +++++ ElectronJS/tasks/1.json | 2 +- ElectronJS/tasks/112.json | 2 +- ElectronJS/tasks/142.json | 2 +- ElectronJS/tasks/143.json | 1 + ElectronJS/tasks/34.json | 2 +- ExecuteStage/.vscode/launch.json | 6 +- ExecuteStage/config.json | 10 ++-- ExecuteStage/easyspider_executestage.py | 63 +++++++++++++++----- ExecuteStage/requirements.txt | 3 +- ExecuteStage/utils.py | 71 ++++++++++++++++++----- 14 files changed, 150 insertions(+), 60 deletions(-) create mode 100644 ElectronJS/tasks/143.json diff --git a/ElectronJS/config.json b/ElectronJS/config.json index 1a370f8b..2a7366dd 100644 --- a/ElectronJS/config.json +++ b/ElectronJS/config.json @@ -1,7 +1 @@ -{ - "webserver_address": "http://localhost", - "webserver_port": 8074, - "user_data_folder": "./user_data", - "debug": true, - "absolute_user_data_folder": "D:\\Document\\Projects\\EasySpider\\ElectronJS\\user_data" -} +{"webserver_address":"http://localhost","webserver_port":8074,"user_data_folder":"./user_data","debug":true,"absolute_user_data_folder":"D:\\Document\\Projects\\EasySpider\\ElectronJS\\user_data"} \ No newline at end of file diff --git a/ElectronJS/main.js b/ElectronJS/main.js index 0b0c343f..b6b7fbac 100644 --- a/ElectronJS/main.js +++ b/ElectronJS/main.js @@ -457,7 +457,7 @@ function handleOpenBrowser(event, lang = "en", user_data_folder = "", mobile = f runBrowser(lang, user_data_folder, mobile); let size = screen.getPrimaryDisplay().workAreaSize; let width = parseInt(size.width); - let height = parseInt(size.height * 0.65); + let height = parseInt(size.height * 0.6); flowchart_window = new BrowserWindow({ x: 0, y: 0, diff --git a/ElectronJS/src/taskGrid/FlowChart_CN.html b/ElectronJS/src/taskGrid/FlowChart_CN.html index 9f0594cc..d2a5cb96 100644 --- a/ElectronJS/src/taskGrid/FlowChart_CN.html +++ b/ElectronJS/src/taskGrid/FlowChart_CN.html @@ -513,25 +513,33 @@ -