Version 0.6.3

.temp_to_pub/EasySpider_windows_x64/Code/myChrome.py

@@ -19,11 +19,16 @@
 
 
 
-class MyChrome(webdriver.Chrome):
+class MyChrome(webdriver.Chrome, webdriver.Remote):
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, mode='local_driver', *args, **kwargs):
         self.iframe_env = False  # 现在的环境是root还是iframe
-        super().__init__(*args, **kwargs)  # 调用父类的 __init__
+        self.mode = mode
+        if mode == "local_driver":
+            webdriver.Chrome.__init__(self, *args, **kwargs)
+        elif mode == "remote_driver":
+            webdriver.Remote.__init__(self, *args, **kwargs)
+        # super().__init__(*args, **kwargs)  # 调用父类的 __init__
 
     # def find_element(self, by=By.ID, value=None, iframe=False):
     #     # 在这里改变查找元素的行为

.temp_to_pub/compress.py

@@ -64,7 +64,7 @@ def compress_folder_to_7z_split(folder_path, output_file):
         except:
             subprocess.call(["7zz", "a", "-v95m", output_file, folder_path])
 
-easyspider_version = "0.6.2"
+easyspider_version = "0.6.3"
 
 if __name__ == "__main__":
 

ElectronJS/change_version.py

@@ -30,7 +30,7 @@ def update_file_version(file_path, new_version, key="当前版本/Current Versio
             file.write(line)
 
 
-version = "0.6.2"
+version = "0.6.3"
 
 # py html js
 
@@ -47,7 +47,8 @@ def update_file_version(file_path, new_version, key="当前版本/Current Versio
 
     # index.html
     file_path = "./src/index.html"
-    update_file_version(file_path, version, key="当前版本/Current Version: <b>v")
+    update_file_version(file_path, version, key="软件当前版本：<b>v")
+    update_file_version(file_path, version, key="Current Version: <b>v")
 
     # package.json
     file_path = "./package.json"

ElectronJS/config.json

@@ -1 +1 @@
-{"webserver_address":"http://localhost","webserver_port":8074,"user_data_folder":"./user_data","debug":false,"copyright":1,"sys_version":"x64","mysql_config_path":"./mysql_config.json","absolute_user_data_folder":"D:\\Documents\\Projects\\EasySpider\\ElectronJS\\user_data"}
+{"webserver_address":"http://localhost","webserver_port":8074,"user_data_folder":"./user_data","debug":false,"lang":"en","copyright":1,"sys_arch":"x64","mysql_config_path":"./mysql_config.json","absolute_user_data_folder":"D:\\Document\\Projects\\EasySpider\\ElectronJS\\user_data"}

ElectronJS/config1.json

@@ -0,0 +1 @@
+{"webserver_address":"http://localhost","webserver_port":8074,"user_data_folder":"./user_data","debug":false,"copyright":1,"sys_version":"x64","mysql_config_path":"./mysql_config.json","absolute_user_data_folder":"D:\\Documents\\Projects\\EasySpider\\ElectronJS\\user_data","lang":"zh"}

ElectronJS/main.js

@@ -150,8 +150,8 @@ function createWindow() {
         server_address +
         "/index.html?user_data_folder=" +
         config.user_data_folder +
-        "&copyright=" +
-        config.copyright,
+        "&copyright=" + config.copyright +
+        "&lang=" + config.lang,
         {extraHeaders: "pragma: no-cache\n"}
     );
     // 隐藏菜单栏
@@ -162,9 +162,8 @@ function createWindow() {
             app.quit();
         }
     });
+    //调试模式
     // mainWindow.webContents.openDevTools();
-    // Open the DevTools.
-    // mainWindow.webContents.openDevTools()
 }
 
 async function findElementRecursive(driver, by, value, frames) {
@@ -1558,6 +1557,17 @@ app.whenReady().then(() => {
             path.join(task_server.getDir(), "config.json"),
             JSON.stringify(config)
         );
+        //重新读取配置文件
+        config = JSON.parse(fs.readFileSync(path.join(task_server.getDir(), "config.json")));
+    });
+    ipcMain.on("change-lang", function (event, arg) {
+        config.lang = arg;
+        fs.writeFileSync(
+            path.join(task_server.getDir(), "config.json"),
+            JSON.stringify(config)
+        );
+        //重新读取配置文件
+        config = JSON.parse(fs.readFileSync(path.join(task_server.getDir(), "config.json")));
     });
     createWindow();
 

ElectronJS/package.json

@@ -1,7 +1,7 @@
 {
     "name": "easy-spider",
     "productName": "EasySpider",
-    "version": "0.6.2",
+    "version": "0.6.3",
     "icon": "./favicon",
     "description": "NoCode Visual Web Crawler",
     "main": "main.js",
@@ -39,8 +39,8 @@
         "multer": "^1.4.5-lts.1",
         "node-abi": "^3.52.0",
         "node-window-manager": "^2.2.4",
-        "selenium-webdriver": "^4.16.0",
-        "ws": "^8.17.1",
+        "selenium-webdriver": "^4.27.0",
+        "ws": "^8.18.0",
         "xlsx": "^0.18.5"
     },
     "config": {
@@ -67,7 +67,7 @@
             ],
             "packagerConfig": {
                 "icon": "./favicon",
-                "appVersion": "0.6.2",
+                "appVersion": "0.6.3",
                 "name": "EasySpider",
                 "executableName": "EasySpider",
                 "appCopyright": "Naibo Wang ([email protected])",

ElectronJS/server.js

@@ -66,6 +66,7 @@ if (!fs.existsSync(path.join(getDir(), "config.json"))) {
       webserver_port: 8074,
       user_data_folder: "./user_data",
       debug: false,
+      lang: "-",
       copyright: 0,
       sys_arch: require("os").arch(),
       mysql_config_path: "./mysql_config.json",
@@ -459,6 +460,10 @@ exports.start = function (port = 8074) {
             "utf8"
           );
           config_file = JSON.parse(config_file);
+          let lang = config_file["lang"];
+          if(lang == undefined){
+            lang = "-";
+          }
           res.write(JSON.stringify(config_file));
           res.end();
         } else if (pathName == "/setUserDataFolder") {

ElectronJS/src/index.html

@@ -32,17 +32,14 @@
 <body>
 <div id="app">
 
-    <div style="padding: 10px; text-align: center;vertical-align: middle;" v-if="init">
+    <div style="padding: 10px; text-align: center;vertical-align: middle;" v-if="lang=='-'">
         <h5 style="margin-top: 20px">选择语言/Select Language</h5>
 
         <p><a @click="changeLang('zh')" class="btn btn-outline-primary btn-lg"
               style="margin-top: 15px; width: 300px;height:60px;padding-top:12px;">中文</a></p>
 
         <p><a @click="changeLang('en')" class="btn btn-outline-primary btn-lg"
               style="margin-top: 15px; width: 300px;height:60px;padding-top:12px;">English</a></p>
-        <p style="font-size: 17px">当前版本/Current Version: <b>v0.6.2</b></p>
-        <p style="font-size: 17px"><a href="https://github.com/NaiboWang/EasySpider/releases"
-                                      target="_blank">Github</a>最新版本/Newest Version：<b>{{newest_version}}</b></p>
         <!--        <p>如发现新版本更新，可从以下Github仓库下载最新版本使用/If a new version is found, you can download the latest version from the following Github repository:</p>-->
         <!--        <p></p>-->
         <div class="img-container">
@@ -92,6 +89,9 @@ <h4 style="margin-top: 20px">Copyright and Disclaimer</h4>
                     <a href="https://www.easyspider.cn/index_english.html" target="_blank"
                        style="text-align: center; font-size: 18px">Browse official website to watch tutorials</a>
                 </p>
+                <p style="font-size: 17px">Current Version: <b>v0.6.3</b></p>
+        <p style="font-size: 17px"><a href="https://github.com/NaiboWang/EasySpider/releases"
+                                      target="_blank">Newest</a> Version: <b>{{newest_version}}</b></p>
                 <div class="img-container">
                     <!--                    <h5>Producer</h5>-->
                     <a href="https://www.zju.edu.cn" alt="Zhejiang University" target="_blank"><img
@@ -191,6 +191,9 @@ <h4 style="margin-top: 20px">版权声明和注意事项</h4>
                     <a href="https://www.easyspider.cn?lang=zh" target="_blank"
                        style="text-align: center; font-size: 18px">点此访问官网查看文档/视频教程</a>
                 </p>
+                <p style="font-size: 17px">软件当前版本：<b>v0.6.3</b></p>
+                <p style="font-size: 17px"><a href="https://github.com/NaiboWang/EasySpider/releases"
+                                      target="_blank">官网</a>最新版本：<b>{{newest_version}}</b></p>
                 <div class="img-container">
                     <!--                    <h5>出品方</h5>-->
                     <a href="https://www.zju.edu.cn" alt="浙江大学" target="_blank"><img src="img/zju.png"></a>

ElectronJS/src/index.js

@@ -22,7 +22,7 @@ let app = Vue.createApp({
     data() {
         return {
             init: true,
-            lang: 'zh',
+            lang: '-',
             user_data_folder: getUrlParam("user_data_folder"),
             copyright: 0,
             step: 0,
@@ -34,6 +34,10 @@ let app = Vue.createApp({
         if(this.copyright == 0){
             this.step = -1;
         }
+        this.lang = getUrlParam("lang");
+        if (this.lang == 'undefined' || this.lang == '') {
+            this.lang = '-';
+        }
         // 发送GET请求获取GitHub的Release API响应
         const request = new XMLHttpRequest();
         request.open('GET', `https://api.github.com/repos/NaiboWang/EasySpider/releases/latest`);
@@ -52,8 +56,9 @@ let app = Vue.createApp({
     },
     methods: {
         changeLang(lang = 'zh') {
-            this.init = false;
+            // this.init = false;
             this.lang = lang;
+            window.electronAPI.changeLang(lang);
         },
         acceptAgreement() {
             this.step = 0;

ElectronJS/src/js/preload.js

@@ -11,4 +11,5 @@ contextBridge.exposeInMainWorld('electronAPI', {
     startDesign: (lang="en", user_data_folder = '', mobile=false) => ipcRenderer.send('start-design', lang, user_data_folder, mobile),
     startInvoke: (lang="en") => ipcRenderer.send('start-invoke', lang),
     acceptAgreement: () => ipcRenderer.send('accept-agreement'),
+    changeLang: (lang="en") => ipcRenderer.send('change-lang', lang)
 })

ElectronJS/src/taskGrid/logic.js

@@ -491,7 +491,7 @@ if (mobile == "true") {
 }
 
 let serviceInfo = {
-    "version": "0.6.2"
+    "version": "0.6.3"
 };
 
 function saveService(type) {
@@ -625,7 +625,7 @@ function saveService(type) {
         "links": links,
         "create_time": $("#create_time").val(),
         "update_time": formatDateTime(new Date()),
-        "version": "0.6.2",
+        "version": "0.6.3",
         "saveThreshold": saveThreshold,
         // "cloudflare": cloudflare,
         "quitWaitTime": parseInt($("#quitWaitTime").val()),