From aacbba907129e7bf5e3f730f47a2dfe71a53aafe Mon Sep 17 00:00:00 2001 From: Naibo Wang Date: Thu, 8 Jun 2023 02:05:04 +0800 Subject: [PATCH] Update --- .temp_to_pub/EasySpider_MacOS_all_arch/readme.txt | 2 ++ .temp_to_pub/EasySpider_MacOS_all_arch/软件使用说明.txt | 2 ++ ElectronJS/src/taskGrid/invokeTask.html | 6 +++--- ElectronJS/tasks/100.json | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 ElectronJS/tasks/100.json diff --git a/.temp_to_pub/EasySpider_MacOS_all_arch/readme.txt b/.temp_to_pub/EasySpider_MacOS_all_arch/readme.txt index 7ca20db..567308e 100644 --- a/.temp_to_pub/EasySpider_MacOS_all_arch/readme.txt +++ b/.temp_to_pub/EasySpider_MacOS_all_arch/readme.txt @@ -4,6 +4,8 @@ Welcome to promote this software to other friends. This version is for MacOS, can be used on all Chips, including Intel (such as Corel i7) and Arm (such as M1). Support on MacOS 11.x and above. +If your MacOS version is 10.x and below, please download EasySpider V0.2.0. + Video Tutorial: https://youtube.com/playlist?list=PL0kEFEkWrT7mt9MUlEBV2DTo1QsaanUTp You can import tasks from other machines by simply opening the EasySpider software in this directory, right-clicking "Show Package Contents", and then placing the .json files from the tasks folder in the /Users/your user name/Library/Application Support/EasySpider/tasks folder of the other machine. Similarly, execution ID files can be imported by copying the .json files from the execution_instances folder. Please note that the .json files in both folders only support names greater than 0. diff --git a/.temp_to_pub/EasySpider_MacOS_all_arch/软件使用说明.txt b/.temp_to_pub/EasySpider_MacOS_all_arch/软件使用说明.txt index 59e2242..13ea66e 100644 --- a/.temp_to_pub/EasySpider_MacOS_all_arch/软件使用说明.txt +++ b/.temp_to_pub/EasySpider_MacOS_all_arch/软件使用说明.txt @@ -4,6 +4,8 @@ 支持MacOS系统，包括Intel芯片和Arm芯片，如酷睿i7和M1芯片，最低MacOS系统版本为11.x。 +10.x版本MacOS请下载v0.2.0版本使用。 + 视频教程：https://www.bilibili.com/video/BV1Fk4y1L7xX/ 可以从其他机器导入任务，只需要把其他机器的tasks文件夹里的.json文件放入/Users/你的用户名/Library/Application Support/EasySpider/tasks文件夹里即可。同理执行号文件可以通过复制execution_instances文件夹中的.json文件来导入。注意，两个文件夹里的.json文件只支持命名为大于0的数字。 diff --git a/ElectronJS/src/taskGrid/invokeTask.html b/ElectronJS/src/taskGrid/invokeTask.html index a8fdc14..382db53 100644 --- a/ElectronJS/src/taskGrid/invokeTask.html +++ b/ElectronJS/src/taskGrid/invokeTask.html @@ -57,7 +57,7 @@
- + @@ -302,9 +302,9 @@ app.$data.command = "./EasySpider/resources/app/chrome_linux64/easyspider_executestage --id '[" + app.$data.ID.toString() + "]' --user_data " + (app.$data.with_user_data ? "1" : "0") + " --server_address " + app.$data.backEndAddressServiceWrapper; } else if(OSInfo.version == 'darwin'){ if(getUrlParam("lang") == "zh"){ - app.$data.easyspider_location = "你的EasySpider文件夹，如：cd /Users/你的用户名/Downloads/EasySpider_MacOS_all_arch"; + app.$data.easyspider_location = "你的EasySpider文件夹，如：cd /Users/"+ app.$data.config_folder.split("/")[2] + "/Downloads/EasySpider_MacOS_all_arch"; } else { - app.$data.easyspider_location = "Your EasySpider folder, such as: cd /Users/Your Username/Downloads/EasySpider_MacOS_all_arch"; + app.$data.easyspider_location = "Your EasySpider folder, such as: cd /Users/"+ app.$data.config_folder.split("/")[2] + "/Downloads/EasySpider_MacOS_all_arch"; } app.$data.command = "./easyspider_executestage --id '[" + app.$data.ID.toString() + "]' --user_data " + (app.$data.with_user_data ? "1" : "0") + " --server_address " + app.$data.backEndAddressServiceWrapper; } diff --git a/ElectronJS/tasks/100.json b/ElectronJS/tasks/100.json new file mode 100644 index 0000000..88aee74 --- /dev/null +++ b/ElectronJS/tasks/100.json @@ -0,0 +1 @@ +{"id":100,"name":"京东全球版-专业的综合网上购物商城","url":"https://www.jd.com","links":"https://www.jd.com","create_time":"2023/6/8 01:51:15","version":"0.3.2","containJudge":false,"desc":"https://www.jd.com","inputParameters":[{"id":0,"name":"urlList_0","nodeId":1,"nodeName":"打开网页","value":"https://www.jd.com","desc":"要采集的网址列表，多行以\\n分开","type":"string","exampleValue":"https://www.jd.com"}],"outputParameters":[{"id":0,"name":"参数1_文本","desc":"","type":"string","exampleValue":"/"},{"id":1,"name":"参数2_链接文本","desc":"","type":"string","exampleValue":"手机"},{"id":2,"name":"参数3_链接地址","desc":"","type":"string","exampleValue":"https://shouji.jd.com/"},{"id":3,"name":"参数4_文本","desc":"","type":"string","exampleValue":"/"},{"id":4,"name":"参数5_链接文本","desc":"","type":"string","exampleValue":"数码"},{"id":5,"name":"参数6_链接地址","desc":"","type":"string","exampleValue":"https://shuma.jd.com/"},{"id":6,"name":"参数7_文本","desc":"","type":"string","exampleValue":"/"},{"id":7,"name":"参数8_链接文本","desc":"","type":"string","exampleValue":"厨具"},{"id":8,"name":"参数9_链接地址","desc":"","type":"string","exampleValue":"https://channel.jd.com/kitchenware.html"},{"id":9,"name":"参数10_文本","desc":"","type":"string","exampleValue":"/"},{"id":10,"name":"参数11_链接文本","desc":"","type":"string","exampleValue":"工业品"},{"id":11,"name":"参数12_链接地址","desc":"","type":"string","exampleValue":"https://pro.jd.com/mall/active/2u2DR1dUiK34csAE3DqmcG8aXvUK/index.html"}],"graph":[{"index":0,"id":0,"parentId":0,"type":-1,"option":0,"title":"root","sequence":[1,2],"parameters":{"history":1,"tabIndex":0,"useLoop":false,"xpath":"","wait":0},"isInLoop":false},{"id":1,"index":1,"parentId":0,"type":0,"option":1,"title":"打开网页","sequence":[],"isInLoop":false,"position":0,"parameters":{"useLoop":false,"xpath":"","wait":0,"beforeJS":"","beforeJSWaitTime":0,"afterJS":"","afterJSWaitTime":0,"url":"https://www.jd.com","links":"https://www.jd.com","maxWaitTime":10,"scrollType":0,"scrollCount":1,"scrollWaitTime":1}},{"id":2,"index":2,"parentId":0,"type":1,"option":8,"title":"循环","sequence":[3],"isInLoop":false,"position":1,"parameters":{"history":4,"tabIndex":-1,"useLoop":false,"xpath":"/html/body/div[5]/div[1]/div[1]/div[1]/div[1]/div[1]/div[1]/div[1]/div[1]/div","wait":0,"beforeJS":"","beforeJSWaitTime":0,"afterJS":"","afterJSWaitTime":0,"scrollType":0,"scrollCount":1,"scrollWaitTime":1,"loopType":1,"pathList":"","textList":"","code":"","waitTime":0,"exitCount":0,"historyWait":2,"breakMode":0,"breakCode":"","breakCodeWaitTime":0,"allXPaths":["/html/body/div[5]/div[1]/div[1]/div[1]/div[1]/div[1]/div[1]/div[1]/div[1]/div[1]","//div[contains(., '/手机/数码')]","//DIV[@class='LeftSide_menu_item__SBMWC LeftSide_text_space__2UhbG ']"]}},{"id":3,"index":3,"parentId":2,"type":0,"option":3,"title":"提取数据","sequence":[],"isInLoop":true,"position":0,"parameters":{"history":4,"tabIndex":-1,"useLoop":false,"xpath":"","wait":0,"beforeJS":"","beforeJSWaitTime":0,"afterJS":"","afterJSWaitTime":0,"paras":[{"nodeType":0,"contentType":1,"relative":true,"name":"参数1_文本","desc":"","relativeXPath":"/span[1]","allXPaths":["/span[1]","//span[contains(., '/')]","//SPAN[@class='LeftSide_cate_menu_line__vzQu9 LeftSide_fore0__r2Yrl']"],"exampleValues":[{"num":0,"value":"/"},{"num":1,"value":"/"},{"num":2,"value":"/"},{"num":3,"value":"/"},{"num":4,"value":"/"},{"num":5,"value":"/"},{"num":6,"value":"/"},{"num":7,"value":"/"},{"num":8,"value":"/"},{"num":9,"value":"/"},{"num":10,"value":"/"},{"num":11,"value":"/"},{"num":12,"value":"/"}],"unique_index":"/span[1]","default":"","beforeJS":"","beforeJSWaitTime":0,"JS":"","JSWaitTime":0,"afterJS":"","afterJSWaitTime":0,"downloadPic":0},{"nodeType":1,"contentType":0,"relative":true,"name":"参数2_链接文本","desc":"","relativeXPath":"/a[1]","allXPaths":["/a[1]","//a[contains(., '手机')]"],"exampleValues":[{"num":0,"value":"手机"},{"num":1,"value":"家用电器"},{"num":2,"value":"电脑"},{"num":3,"value":"家纺"},{"num":4,"value":"家具"},{"num":5,"value":"内衣"},{"num":6,"value":"箱包"},{"num":7,"value":"运动"},{"num":8,"value":"汽车用品"},{"num":9,"value":"母婴"},{"num":10,"value":"玩具乐器"},{"num":11,"value":"家庭清洁"},{"num":12,"value":"图书"}],"unique_index":"/a[1]","default":"","beforeJS":"","beforeJSWaitTime":0,"JS":"","JSWaitTime":0,"afterJS":"","afterJSWaitTime":0,"downloadPic":0},{"nodeType":2,"contentType":0,"relative":true,"name":"参数3_链接地址","desc":"","relativeXPath":"/a[1]","allXPaths":["/a[1]","//a[contains(., '手机')]"],"exampleValues":[{"num":0,"value":"https://shouji.jd.com/"},{"num":1,"value":"https://search.jd.com/Search?keyword=%E5%B0%8F%E5%AE%B6%E7%94%B5&enc=utf-8&wq=%E5%B0%8F%E5%AE%B6%E7%94%B5&pvid=261a350161304c979fa0e7ce95c05671"},{"num":2,"value":"https://diannao.jd.com/"},{"num":3,"value":"https://channel.jd.com/jf.html"},{"num":4,"value":"https://channel.jd.com/furniture.html"},{"num":5,"value":"https://channel.jd.com/underwear.html"},{"num":6,"value":"https://channel.jd.com/bag.html"},{"num":7,"value":"https://phat.jd.com/10-109.html"},{"num":8,"value":"https://che.jd.com/"},{"num":9,"value":"https://search.jd.com/Search?keyword=%E6%AF%8D%E5%A9%B4&enc=utf-8&qrst=1&rt=1&stop=1&vt=2&wq=%E6%AF%8D%E5%A9%B4&stock=1&gp=2&click=1"},{"num":10,"value":"https://toy.jd.com/"},{"num":11,"value":"https://channel.jd.com/beauty.html"},{"num":12,"value":"https://book.jd.com/"}],"unique_index":"/a[1]","default":"","beforeJS":"","beforeJSWaitTime":0,"JS":"","JSWaitTime":0,"afterJS":"","afterJSWaitTime":0,"downloadPic":0},{"nodeType":0,"contentType":1,"relative":true,"name":"参数4_文本","desc":"","relativeXPath":"/span[2]","allXPaths":["/span[2]","//span[contains(., '/')]","//SPAN[@class='LeftSide_cate_menu_line__vzQu9 undefined']"],"exampleValues":[{"num":0,"value":"/"},{"num":2,"value":"/"},{"num":3,"value":"/"},{"num":4,"value":"/"},{"num":5,"value":"/"},{"num":6,"value":"/"},{"num":7,"value":"/"},{"num":8,"value":"/"},{"num":9,"value":"/"},{"num":10,"value":"/"},{"num":11,"value":"/"},{"num":12,"value":"/"}],"unique_index":"/span[2]","default":"","beforeJS":"","beforeJSWaitTime":0,"JS":"","JSWaitTime":0,"afterJS":"","afterJSWaitTime":0,"downloadPic":0},{"nodeType":1,"contentType":0,"relative":true,"name":"参数5_链接文本","desc":"","relativeXPath":"/a[2]","allXPaths":["/a[2]","//a[contains(., '数码')]"],"exampleValues":[{"num":0,"value":"数码"},{"num":2,"value":"办公"},{"num":3,"value":"家居"},{"num":4,"value":"家装"},{"num":5,"value":"男装"},{"num":6,"value":"钟表"},{"num":7,"value":"户外"},{"num":8,"value":"车载电器"},{"num":9,"value":"洗护喂养"},{"num":10,"value":"宠物生活"},{"num":11,"value":"个人护理"},{"num":12,"value":"童书"}],"unique_index":"/a[2]","default":"","beforeJS":"","beforeJSWaitTime":0,"JS":"","JSWaitTime":0,"afterJS":"","afterJSWaitTime":0,"downloadPic":0},{"nodeType":2,"contentType":0,"relative":true,"name":"参数6_链接地址","desc":"","relativeXPath":"/a[2]","allXPaths":["/a[2]","//a[contains(., '数码')]"],"exampleValues":[{"num":0,"value":"https://shuma.jd.com/"},{"num":2,"value":"https://bg.jd.com/"},{"num":3,"value":"https://channel.jd.com/home.html"},{"num":4,"value":"https://jzjc.jd.com/"},{"num":5,"value":"https://channel.jd.com/1315-1342.html"},{"num":6,"value":"https://channel.jd.com/watch.html"},{"num":7,"value":"https://channel.jd.com/outdoor.html"},{"num":8,"value":"https://list.jd.com/list.html?cat=6728,6740&page=1&delivery_glb=1&stock=1&sort=sort_totalsales15_desc&trans=1&JL=4_7_0#J_main"},{"num":9,"value":"https://channel.jd.com/feed.html"},{"num":10,"value":"https://channel.jd.com/pet.html"},{"num":11,"value":"https://lady.jd.com/"},{"num":12,"value":"https://book.jd.com/children.html"}],"unique_index":"/a[2]","default":"","beforeJS":"","beforeJSWaitTime":0,"JS":"","JSWaitTime":0,"afterJS":"","afterJSWaitTime":0,"downloadPic":0},{"nodeType":0,"contentType":1,"relative":true,"name":"参数7_文本","desc":"","relativeXPath":"/span[3]","allXPaths":["/span[3]","//span[contains(., '/')]","//SPAN[@class='LeftSide_cate_menu_line__vzQu9 undefined']"],"exampleValues":[{"num":3,"value":"/"},{"num":4,"value":"/"},{"num":5,"value":"/"},{"num":6,"value":"/"},{"num":7,"value":"/"},{"num":11,"value":"/"},{"num":12,"value":"/"}],"unique_index":"/span[3]","default":"","beforeJS":"","beforeJSWaitTime":0,"JS":"","JSWaitTime":0,"afterJS":"","afterJSWaitTime":0,"downloadPic":0},{"nodeType":1,"contentType":0,"relative":true,"name":"参数8_链接文本","desc":"","relativeXPath":"/a[3]","allXPaths":["/a[3]","//a[contains(., '厨具')]"],"exampleValues":[{"num":3,"value":"厨具"},{"num":4,"value":"灯具"},{"num":5,"value":"女装"},{"num":6,"value":"珠宝"},{"num":7,"value":"男鞋"},{"num":11,"value":"计生情趣"},{"num":12,"value":"文学"}],"unique_index":"/a[3]","default":"","beforeJS":"","beforeJSWaitTime":0,"JS":"","JSWaitTime":0,"afterJS":"","afterJSWaitTime":0,"downloadPic":0},{"nodeType":2,"contentType":0,"relative":true,"name":"参数9_链接地址","desc":"","relativeXPath":"/a[3]","allXPaths":["/a[3]","//a[contains(., '厨具')]"],"exampleValues":[{"num":3,"value":"https://channel.jd.com/kitchenware.html"},{"num":4,"value":"https://channel.jd.com/9855-9856.html"},{"num":5,"value":"https://channel.jd.com/women.html"},{"num":6,"value":"https://channel.jd.com/jewellery.html"},{"num":7,"value":"https://channel.jd.com/mensshoes.html"},{"num":11,"value":"https://channel.jd.com/9192-9196.html"},{"num":12,"value":"https://channel.jd.com/p_wenxuezongheguan.html"}],"unique_index":"/a[3]","default":"","beforeJS":"","beforeJSWaitTime":0,"JS":"","JSWaitTime":0,"afterJS":"","afterJSWaitTime":0,"downloadPic":0},{"nodeType":0,"contentType":1,"relative":true,"name":"参数10_文本","desc":"","relativeXPath":"/span[4]","allXPaths":["/span[4]","//span[contains(., '/')]","//SPAN[@class='LeftSide_cate_menu_line__vzQu9 undefined']"],"exampleValues":[{"num":4,"value":"/"},{"num":5,"value":"/"},{"num":6,"value":"/"}],"unique_index":"/span[4]","default":"","beforeJS":"","beforeJSWaitTime":0,"JS":"","JSWaitTime":0,"afterJS":"","afterJSWaitTime":0,"downloadPic":0},{"nodeType":1,"contentType":0,"relative":true,"name":"参数11_链接文本","desc":"","relativeXPath":"/a[4]","allXPaths":["/a[4]","//a[contains(., '工业品')]"],"exampleValues":[{"num":4,"value":"工业品"},{"num":5,"value":"童装"},{"num":6,"value":"女鞋"}],"unique_index":"/a[4]","default":"","beforeJS":"","beforeJSWaitTime":0,"JS":"","JSWaitTime":0,"afterJS":"","afterJSWaitTime":0,"downloadPic":0},{"nodeType":2,"contentType":0,"relative":true,"name":"参数12_链接地址","desc":"","relativeXPath":"/a[4]","allXPaths":["/a[4]","//a[contains(., '工业品')]"],"exampleValues":[{"num":4,"value":"https://pro.jd.com/mall/active/2u2DR1dUiK34csAE3DqmcG8aXvUK/index.html"},{"num":5,"value":"https://list.jd.com/list.html?cat=1319,11842"},{"num":6,"value":"https://channel.jd.com/womensshoes.html"}],"unique_index":"/a[4]","default":"","beforeJS":"","beforeJSWaitTime":0,"JS":"","JSWaitTime":0,"afterJS":"","afterJSWaitTime":0,"downloadPic":0}],"loopType":1}}]} \ No newline at end of file