diff --git a/.temp_to_pub/EasySpider_Linux_x64/Support Author.png b/.temp_to_pub/EasySpider_Linux_x64/Support Author.png new file mode 100644 index 0000000..b7e0833 Binary files /dev/null and b/.temp_to_pub/EasySpider_Linux_x64/Support Author.png differ diff --git a/.temp_to_pub/EasySpider_Linux_x64/支持作者.png b/.temp_to_pub/EasySpider_Linux_x64/支持作者.png new file mode 100644 index 0000000..b7e0833 Binary files /dev/null and b/.temp_to_pub/EasySpider_Linux_x64/支持作者.png differ diff --git a/.temp_to_pub/EasySpider_MacOS_all_arch/Support Author.png b/.temp_to_pub/EasySpider_MacOS_all_arch/Support Author.png new file mode 100644 index 0000000..b7e0833 Binary files /dev/null and b/.temp_to_pub/EasySpider_MacOS_all_arch/Support Author.png differ diff --git a/.temp_to_pub/EasySpider_MacOS_all_arch/支持作者.png b/.temp_to_pub/EasySpider_MacOS_all_arch/支持作者.png new file mode 100644 index 0000000..b7e0833 Binary files /dev/null and b/.temp_to_pub/EasySpider_MacOS_all_arch/支持作者.png differ diff --git a/.temp_to_pub/EasySpider_windows_x32/Support Author.png b/.temp_to_pub/EasySpider_windows_x32/Support Author.png new file mode 100644 index 0000000..b7e0833 Binary files /dev/null and b/.temp_to_pub/EasySpider_windows_x32/Support Author.png differ diff --git a/.temp_to_pub/EasySpider_windows_x32/支持作者.png b/.temp_to_pub/EasySpider_windows_x32/支持作者.png new file mode 100644 index 0000000..b7e0833 Binary files /dev/null and b/.temp_to_pub/EasySpider_windows_x32/支持作者.png differ diff --git a/.temp_to_pub/EasySpider_windows_x64/Support Author.png b/.temp_to_pub/EasySpider_windows_x64/Support Author.png new file mode 100644 index 0000000..b7e0833 Binary files /dev/null and b/.temp_to_pub/EasySpider_windows_x64/Support Author.png differ diff --git a/.temp_to_pub/EasySpider_windows_x64/支持作者.png b/.temp_to_pub/EasySpider_windows_x64/支持作者.png new file mode 100644 index 0000000..b7e0833 Binary files /dev/null and b/.temp_to_pub/EasySpider_windows_x64/支持作者.png differ diff --git a/ElectronJS/.gitignore b/ElectronJS/.gitignore index 9bb343a..70c4f97 100644 --- a/ElectronJS/.gitignore +++ b/ElectronJS/.gitignore @@ -1,3 +1,4 @@ +sys_version.json node_modules/ out/ chromedrivers/ diff --git a/ElectronJS/README.md b/ElectronJS/README.md index 5eed76b..5916d43 100644 --- a/ElectronJS/README.md +++ b/ElectronJS/README.md @@ -3,7 +3,7 @@ EasySpider分三部分： 1. 主程序：在`ElectronJS`文件夹下。 -2. 浏览器扩展：在`Extension`文件夹下，为浏览器的“操作控制台”的代码，打包后的扩展在此目录下的`EasySpider_zh.crx`文件。 +2. 浏览器扩展：在`Extension`文件夹下，为浏览器的“操作台”的代码，打包后的扩展在此目录下的`EasySpider_zh.crx`文件。 3. 执行阶段程序：在`ExecuteStage`文件夹下。 此部分为`主程序`的编译说明。 @@ -53,7 +53,7 @@ chrome_linux64/ # for linux x64 chrome_mac64/ # for mac x64 ``` -然后，从下面的页面下载和**自己安装的Chrome版本一致**的Chromedriver：[https://chromedriver.chromium.org/downloads](https://chromedriver.chromium.org/downloads)，把chromedriver放入刚刚的chrome文件夹内，并更名为下面的格式： +然后，从下面的页面下载和**自己安装的Chrome版本一致**的Chromedriver：[https://chromedriver.chromium.org/downloads](https://chromedriver.chromium.org/downloads)，把chromedriver放入刚刚的`chrome`文件夹内，并更名为下面的格式： ``` chromedriver_win32.exe # for windows x32 diff --git a/ElectronJS/main.js b/ElectronJS/main.js index a5f8905..3ccf81e 100644 --- a/ElectronJS/main.js +++ b/ElectronJS/main.js @@ -38,6 +38,29 @@ let driverPath = ""; let chromeBinaryPath = ""; let execute_path = ""; console.log(process.arch); + +exec(`wmic os get Caption`, function(error, stdout, stderr) { + if (error) { + console.error(`执行的错误: ${error}`); + return; + } + + if (stdout.includes('Windows 7')) { + console.log('Windows 7'); + let sys_version = fs.readFileSync(path.join(__dirname, `sys_version.json`), 'utf8'); + sys_version = JSON.parse(sys_version); + if (sys_version.arch === 'x64') { + dialog.showMessageBoxSync({ + type: 'error', + title: 'Error', + message: 'Windows 7系统请下载使用x32版本的软件，不论Win 7系统为x64还是x32版本。\nFor Windows 7, please download and use the x32 version of the software, regardless of whether the Win 7 system is x64 or x32 version.', + }); + } + } else { + console.log('Not Windows 7'); + } +}); + if (process.platform === 'win32' && process.arch === 'ia32') { driverPath = path.join(__dirname, "chrome_win32/chromedriver_win32.exe"); chromeBinaryPath = path.join(__dirname, "chrome_win32/chrome.exe"); diff --git a/ElectronJS/src/index.html b/ElectronJS/src/index.html index 727fded..888565d 100644 --- a/ElectronJS/src/index.html +++ b/ElectronJS/src/index.html @@ -136,7 +136,7 @@ style="margin-top: 15px; width: 300px;height:60px;padding-top:12px;color:white">查看/管理/执行任务

- 点此访问官网查看教程 + 点此访问官网查看文档/视频教程

@@ -167,6 +167,7 @@ 返回首页

+

指定用户信息目录

diff --git a/ElectronJS/src/taskGrid/FlowChart.html b/ElectronJS/src/taskGrid/FlowChart.html index 14a3850..9e12c55 100644 --- a/ElectronJS/src/taskGrid/FlowChart.html +++ b/ElectronJS/src/taskGrid/FlowChart.html @@ -55,7 +55,7 @@
Click button above and then click the flowchart to insert.
-
+
@@ -110,6 +110,7 @@ + @@ -155,6 +156,7 @@ + @@ -449,7 +451,7 @@
- +
@@ -475,6 +477,7 @@ + @@ -537,10 +540,10 @@