diff --git a/.DS_Store b/.DS_Store
index 3330b18..1ea8f75 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/ElectronJS/.DS_Store b/ElectronJS/.DS_Store
index 6141cf0..856a71c 100644
Binary files a/ElectronJS/.DS_Store and b/ElectronJS/.DS_Store differ
diff --git a/ElectronJS/main.js b/ElectronJS/main.js
index 0f261b2..7507271 100644
--- a/ElectronJS/main.js
+++ b/ElectronJS/main.js
@@ -94,7 +94,7 @@ function createWindow() {
}
-async function beginInvoke(msg) {
+async function beginInvoke(msg, ws) {
if (msg.type == 1) {
if (msg.message.id != -1) {
let url = "";
@@ -220,6 +220,8 @@ async function beginInvoke(msg) {
child_process.stdout.on('data', function (data) {
console.log(data.toString());
});
+ } else {
+ ws.send(task_server.getDir() + "/");
}
}
}
@@ -265,7 +267,7 @@ wss.on('connection', function (ws) {
}
}
else {
- await beginInvoke(msg);
+ await beginInvoke(msg, ws);
}
});
});
diff --git a/ElectronJS/package_macos.sh b/ElectronJS/package_macos.sh
index 1def8cb..a170f1b 100755
--- a/ElectronJS/package_macos.sh
+++ b/ElectronJS/package_macos.sh
@@ -3,12 +3,12 @@
# This script is used to build.md the package for Linux 64-bit.
rm -rf out
rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app
-npm run package
-# unzip out/EasySpider-darwin-x64 -d ../Releases/EasySpider_MacOS_all_arch/
-mv out/EasySpider-darwin-x64/EasySpider.app ../Releases/EasySpider_MacOS_all_arch/
+npm run make
+unzip out/make/zip/darwin/x64/EasySpider-darwin-x64* -d ../Releases/EasySpider_MacOS_all_arch/
+# mv out/EasySpider-darwin-x64/EasySpider.app ../Releases/EasySpider_MacOS_all_arch/
rm ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/VS_BuildTools.exe
rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/chrome_win64
-# rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/Data
+rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/Data
rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/.idea
# rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/tasks
# rm -r ../Releases/EasySpider_MacOS_all_arch/EasySpider.app/Contents/Resources/app/execution_instances
diff --git a/ElectronJS/server.js b/ElectronJS/server.js
index 1306479..9a6719d 100644
--- a/ElectronJS/server.js
+++ b/ElectronJS/server.js
@@ -3,6 +3,7 @@ const querystring = require('querystring');
const url = require('url');
const fs = require('fs');
const path=require('path');
+const {app, dialog} = require('electron');
function travel(dir,callback){
fs.readdirSync(dir).forEach((file)=>{
const pathname=path.join(dir,file)
@@ -24,7 +25,7 @@ function compare(p){ //这是比较函数
function getDir(){
if(__dirname.indexOf("app") >= 0 && __dirname.indexOf("sources") >= 0){
if(process.platform == "darwin"){
- return __dirname;
+ return app.getPath("userData");
} else {
return path.join(__dirname,"../../..");
}
@@ -32,6 +33,15 @@ function getDir(){
return __dirname;
}
}
+if(!fs.existsSync(path.join(getDir(), "tasks"))){
+ fs.mkdirSync(path.join(getDir(), "tasks"));
+}
+if(!fs.existsSync(path.join(getDir(), "execution_instances"))){
+ fs.mkdirSync(path.join(getDir(), "execution_instances"));
+}
+if(!fs.existsSync(path.join(getDir(), "config.json"))){
+ fs.writeFileSync(path.join(getDir(), "config.json"), JSON.stringify({"webserver_address":"http://localhost","webserver_port":8074,"user_data_folder":"./user_data","absolute_user_data_folder":""}));
+}
exports.getDir = getDir;
FileMimes = JSON.parse(fs.readFileSync(path.join(__dirname,'mime.json')).toString());
diff --git a/ElectronJS/src/taskGrid/invokeTask.html b/ElectronJS/src/taskGrid/invokeTask.html
index 48f2b77..77f3a57 100644
--- a/ElectronJS/src/taskGrid/invokeTask.html
+++ b/ElectronJS/src/taskGrid/invokeTask.html
@@ -50,7 +50,7 @@
-
+