From f4a8c7aed931fbde1075c4dbc1dd616c1087b63a Mon Sep 17 00:00:00 2001 From: naibo Date: Sun, 21 May 2023 20:57:35 +0800 Subject: [PATCH] Version Update --- ElectronJS/每次发布之前要检查的事项.md | 2 +- ExecuteStage/.vscode/launch.json | 2 +- ExecuteStage/easyspider_executestage.py | 11 +++++++++++ Extension/manifest_v3/package.json | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ElectronJS/每次发布之前要检查的事项.md b/ElectronJS/每次发布之前要检查的事项.md index 90ba493..489ee69 100644 --- a/ElectronJS/每次发布之前要检查的事项.md +++ b/ElectronJS/每次发布之前要检查的事项.md @@ -1,3 +1,3 @@ - 删除chrome的install文件夹 -- 修改logic.js及logic_CN.js， ElectronJS/package.json，Manifestv3/package.json，easyspider_executestage.py中的版本号 +- 修改logic.js及logic_CN.js， ElectronJS/package.json，manifest_v3/package.json，easyspider_executestage.py中的版本号 - 更新最新的tasks文件夹 \ No newline at end of file diff --git a/ExecuteStage/.vscode/launch.json b/ExecuteStage/.vscode/launch.json index ca5b61a..cb06512 100644 --- a/ExecuteStage/.vscode/launch.json +++ b/ExecuteStage/.vscode/launch.json @@ -12,7 +12,7 @@ "console": "integratedTerminal", "justMyCode": true, // "args": ["--id", "38", "--read_type", "local", "--headless", "1"] - "args": ["--id", "23", "--headless", "0"] + "args": ["--id", "26", "--headless", "0"] } ] } \ No newline at end of file diff --git a/ExecuteStage/easyspider_executestage.py b/ExecuteStage/easyspider_executestage.py index 7677a3a..6672e57 100644 --- a/ExecuteStage/easyspider_executestage.py +++ b/ExecuteStage/easyspider_executestage.py @@ -996,6 +996,17 @@ if __name__ == '__main__': service = json.loads(content) # 加载服务信息 print("name: ", service["name"]) procedure = service["graph"] # 程序执行流程 + try: + if service["version"] != c.version: + print("版本不一致，请使用" + service["version"] + "版本的EasySpider运行该任务") + print("Version not match, please use EasySpider " + service["version"] + " to run this task") + browser.quit() + sys.exit() + except: + print("版本不一致，请使用v0.2.0版本的EasySpider运行该任务") + print("Version not match, please use EasySpider v0.2.0 to run this task") + browser.quit() + sys.exit() links = list(filter(isnull, service["links"].split("\n"))) # 要执行的link的列表 OUTPUT = [] # 采集的数据 OUTPUT.append([]) # 添加表头 diff --git a/Extension/manifest_v3/package.json b/Extension/manifest_v3/package.json index d760fee..a709516 100644 --- a/Extension/manifest_v3/package.json +++ b/Extension/manifest_v3/package.json @@ -1,6 +1,6 @@ { "name": "EasySpider", - "version": "0.2.0", + "version": "0.3.0", "type": "module", "scripts": { "build": "rollup -c",