diff --git a/.gitignore b/.gitignore
index f39ffbc..df48b7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,7 @@ build/extraResources/goapp.exe
go/go.sum
build/extraResources/java-app.jar
build/extraResources/jre1.8.0_201/
+python/.venv/
+python/*.spec
+python/build/
+python/dist/
diff --git a/electron/addon/autoUpdater/index.js b/electron/addon/autoUpdater/index.js
index 2ab4cf3..63baf58 100644
--- a/electron/addon/autoUpdater/index.js
+++ b/electron/addon/autoUpdater/index.js
@@ -4,6 +4,7 @@ const is = require('ee-core/utils/is');
const Log = require('ee-core/log');
const Conf = require('ee-core/config');
const CoreWindow = require('ee-core/electron/window');
+const Electron = require('ee-core/electron');
/**
* 自动升级插件
@@ -102,6 +103,10 @@ class AutoUpdaterAddon {
info.status = status.downloaded;
info.desc = '下载完成';
this.sendStatusToWindow(info);
+
+ // 托盘插件默认会阻止窗口关闭，这里设置允许关闭窗口
+ Electron.extra.closeWindow = true;
+
autoUpdater.quitAndInstall();
// const mainWindow = CoreWindow.getMainWindow();
// if (mainWindow) {
diff --git a/electron/addon/javaServer/index.js b/electron/addon/javaServer/index.js
deleted file mode 100644
index 14be9dd..0000000
--- a/electron/addon/javaServer/index.js
+++ /dev/null
@@ -1,93 +0,0 @@
-const server = require("./server");
-const { app: electronApp } = require('electron');
-const Log = require('ee-core/log');
-const Conf = require('ee-core/config');
-const GetPort = require('ee-core/utils/get-port');
-
-/**
- * java server插件
- * @class
- */
-class JavaServerAddon {
-
- constructor() {
- this.cfg;
- this.javaServer;
- }
-
- /**
- * 创建java服务
- *
- * @function
- * @since 1.0.0
- */
- async createServer () {
-
- this.cfg = Conf.getValue('addons.javaServer');
- await this.createJavaPorts();
-
- this.javaServer = new server();
- await this.javaServer.create(this.cfg);
-
- // kill
- electronApp.on("before-quit", async () => {
- Log.info("[addon:javaServer] before-quit: kill-----------");
- await this.javaServer.kill();
- });
-
- return;
- }
-
- /**
- * todo 检查服务是否启动
- *
- * @function
- * @since 1.0.0
- */
- async check () {
- Log.info("进入-----检查服务是否启动------"+this.javaServer);
- if(this.javaServer == undefined){
- Log.info("[addon:javaServer:check] status-----------"+false);
- return false;
- }
-
- const flag = await this.javaServer.isRun(Conf.getValue('addons.javaServer'));
- Log.info("[addon:javaServer:check] status-----------"+flag);
-
- return flag;
- }
-
- /**
- * 创建服务端口
- *
- * @function
- * @since 1.0.0
- */
- async createJavaPorts() {
- if (!this.cfg.enable) {
- return;
- }
- const javaPort = await GetPort({ port: this.cfg.port });
- process.env.EE_JAVA_PORT = javaPort;
- this.cfg.port = javaPort;
-
- // 更新config配置
- Conf.setValue('addons.javaServer', this.cfg);
- }
-
- /**
- * 杀掉进程
- *
- * @function
- * @since 1.0.0
- */
- async kill() {
- if (!this.cfg.enable) {
- return;
- }
- await this.javaServer.kill();
- }
-}
-
-JavaServerAddon.toString = () => '[class JavaServerAddon]';
-module.exports = JavaServerAddon;
\ No newline at end of file
diff --git a/electron/addon/javaServer/ps.js b/electron/addon/javaServer/ps.js
deleted file mode 100644
index 9005463..0000000
--- a/electron/addon/javaServer/ps.js
+++ /dev/null
@@ -1,257 +0,0 @@
-var ChildProcess = require("child_process");
-var IS_WIN = process.platform === "win32";
-var TableParser = require("table-parser");
-/**
- * End of line.
- * Basically, the EOL should be:
- * - windows: \r\n
- * - *nix: \n
- * But i'm trying to get every possibilities covered.
- */
-var EOL = /(\r\n)|(\n\r)|\n|\r/;
-var SystemEOL = require("os").EOL;
-
-/**
- * Execute child process
- * @type {Function}
- * @param {String[]} args
- * @param {String} where
- * @param {Function} callback
- * @param {Object=null} callback.err
- * @param {Object[]} callback.stdout
- */
-var Exec = function (args, where) {
- var spawnSync = ChildProcess.spawnSync;
- var execSync = ChildProcess.execSync;
-
- // on windows, if use ChildProcess.exec(`wmic process get`), the stdout will gives you nothing
- // that's why I use `cmd` instead
- if (IS_WIN) {
- const cmd = `wmic process where ${where} get ProcessId,ParentProcessId,CommandLine \n`;
- const result = execSync(cmd);
- if (!result) {
- throw new Error(result);
- }
-
- var stdout = result.toString();
-
- var beginRow;
- stdout = stdout.split(EOL);
-
- // Find the line index for the titles
- stdout.forEach(function (out, index) {
- if (
- out &&
- typeof beginRow == "undefined" &&
- out.indexOf("CommandLine") === 0
- ) {
- beginRow = index;
- }
- });
-
- // get rid of the start (copyright) and the end (current pwd)
- stdout.splice(stdout.length - 1, 1);
- stdout.splice(0, beginRow);
-
- return stdout.join(SystemEOL) || false;
- } else {
- if (typeof args === "string") {
- args = args.split(/\s+/);
- }
- const result = spawnSync("ps", args);
- if (result.stderr && !!result.stderr.toString()) {
- throw new Error(result.stderr);
- } else {
- return result.stdout.toString();
- }
- }
-};
-
-/**
- * Query Process: Focus on pid & cmd
- * @param query
- * @param {String|String[]} query.pid
- * @param {String} query.command RegExp String
- * @param {String} query.arguments RegExp String
- * @param {String|array} query.psargs
- * @param {String|array} query.where where 条件
- * @param {Function} callback
- * @param {Object=null} callback.err
- * @param {Object[]} callback.processList
- * @return {Object}
- */
-
-exports.lookup = function (query) {
- /**
- * add 'lx' as default ps arguments, since the default ps output in linux like "ubuntu", wont include command arguments
- */
- var exeArgs = query.psargs || ["lx"];
- var where = query.where || 'name="javaw.exe"';
- var filter = {};
- var idList;
-
- // Lookup by PID
- if (query.pid) {
- if (Array.isArray(query.pid)) {
- idList = query.pid;
- } else {
- idList = [query.pid];
- }
-
- // Cast all PIDs as Strings
- idList = idList.map(function (v) {
- return String(v);
- });
- }
-
- if (query.command) {
- filter["command"] = new RegExp(query.command, "i");
- }
-
- if (query.arguments) {
- filter["arguments"] = new RegExp(query.arguments, "i");
- }
-
- if (query.ppid) {
- filter["ppid"] = new RegExp(query.ppid);
- }
-
- const result = Exec(exeArgs, where);
-
- var processList = parseGrid(result);
- var resultList = [];
-
- processList.forEach(function (p) {
- var flt;
- var type;
- var result = true;
-
- if (idList && idList.indexOf(String(p.pid)) < 0) {
- return;
- }
-
- for (type in filter) {
- flt = filter[type];
- result = flt.test(p[type]) ? result : false;
- }
-
- if (result) {
- resultList.push(p);
- }
- });
-
- return resultList;
-};
-
-/**
- * Kill process
- * @param pid
- * @param {Object|String} signal
- * @param {String} signal.signal
- * @param {number} signal.timeout
- * @param next
- */
-
-exports.kill = function (pid, signal, next) {
- //opts are optional
- if (arguments.length == 2 && typeof signal == "function") {
- next = signal;
- signal = undefined;
- }
-
- var checkTimeoutSeconds = (signal && signal.timeout) || 30;
-
- if (typeof signal === "object") {
- signal = signal.signal;
- }
-
- try {
- process.kill(pid, signal);
- } catch (e) {
- return next && next(e);
- }
-
- var checkConfident = 0;
- var checkTimeoutTimer = null;
- var checkIsTimeout = false;
-
- function checkKilled(finishCallback) {
- exports.lookup({ pid: pid }, function (err, list) {
- if (checkIsTimeout) return;
-
- if (err) {
- clearTimeout(checkTimeoutTimer);
- finishCallback && finishCallback(err);
- } else if (list.length > 0) {
- checkConfident = checkConfident - 1 || 0;
- checkKilled(finishCallback);
- } else {
- checkConfident++;
- if (checkConfident === 5) {
- clearTimeout(checkTimeoutTimer);
- finishCallback && finishCallback();
- } else {
- checkKilled(finishCallback);
- }
- }
- });
- }
-
- next && checkKilled(next);
-
- checkTimeoutTimer =
- next &&
- setTimeout(function () {
- checkIsTimeout = true;
- next(new Error("Kill process timeout"));
- }, checkTimeoutSeconds * 1000);
-};
-
-/**
- * Parse the stdout into readable object.
- * @param {String} output
- */
-
-function parseGrid(output) {
- if (!output) {
- return [];
- }
- return formatOutput(TableParser.parse(output));
-}
-
-/**
- * format the structure, extract pid, command, arguments, ppid
- * @param data
- * @return {Array}
- */
-
-function formatOutput(data) {
- var formatedData = [];
- data.forEach(function (d) {
- var pid =
- (d.PID && d.PID[0]) || (d.ProcessId && d.ProcessId[0]) || undefined;
- var cmd = d.CMD || d.CommandLine || d.COMMAND || undefined;
- var ppid =
- (d.PPID && d.PPID[0]) ||
- (d.ParentProcessId && d.ParentProcessId[0]) ||
- undefined;
-
- if (pid && cmd) {
- var command = cmd[0];
- var args = "";
-
- if (cmd.length > 1) {
- args = cmd.slice(1);
- }
-
- formatedData.push({
- pid: pid,
- command: command,
- arguments: args,
- ppid: ppid,
- });
- }
- });
-
- return formatedData;
-}
diff --git a/electron/addon/javaServer/server.js b/electron/addon/javaServer/server.js
deleted file mode 100644
index 8e162e2..0000000
--- a/electron/addon/javaServer/server.js
+++ /dev/null
@@ -1,126 +0,0 @@
-const _ = require("lodash");
-const assert = require("assert");
-const fs = require("fs");
-const path = require("path");
-const { exec, execSync } = require("child_process");
-const ps = require("./ps");
-const Log = require('ee-core/log');
-const is = require('ee-core/utils/is');
-const UtilsPs = require('ee-core/ps');
-
-/**
- * java server
- */
-class JavaServer {
- constructor () {
- this.options;
- }
-
- /**
- * 创建服务
- */
- async create (cfg) {
- this.options = cfg;
- if (this.options.enable == false) {
- return;
- }
-
- let port = process.env.EE_JAVA_PORT ? parseInt(process.env.EE_JAVA_PORT) : parseInt(this.options.port);
- assert(typeof port === "number", "java port required, and must be a number");
-
- try {
- const jarName = this.options.name;
- let softwarePath = path.join(UtilsPs.getExtraResourcesDir(), jarName);
- let javaOptStr = this.options.opt;
- let jrePath = path.join(UtilsPs.getExtraResourcesDir(), this.options.jreVersion);
- let cmdStr = '';
-
- Log.info("[addon:javaServer] jar file path:", softwarePath);
- if (!fs.existsSync(softwarePath)) throw new Error('java program does not exist');
-
- // 替换opt参数
- javaOptStr = _.replace(javaOptStr, "${port}", port);
- javaOptStr = _.replace(javaOptStr, "${path}", UtilsPs.getLogDir());
-
- if (is.windows()) {
- jrePath = path.join(jrePath, "bin", "javaw.exe");
- cmdStr = `start ${jrePath} -jar ${javaOptStr} ${softwarePath}`;
- } else if (is.macOS()) {
- // 如果提示：不受信任，请执行： sudo spctl --master-disable
- jrePath = path.join(jrePath, "Contents", "Home", "bin", "java");
- //cmdStr = `nohup ${jrePath} -jar ${javaOptStr} ${softwarePath} >/dev/null 2>&1 &`;
- cmdStr = `${jrePath} -jar ${javaOptStr} ${softwarePath}`;
- } else {
- // todo linux
- }
-
- Log.info("[addon:javaServer] cmdStr:", cmdStr);
- exec(cmdStr);
-
- } catch (err) {
- Log.error('[addon:javaServer] throw error:', err);
- }
- }
-
- /**
- * 关闭服务
- */
- async kill () {
- const jarName = this.options.name;
- if (is.windows()) {
- const resultList = ps.lookup({
- command: "java",
- where: 'caption="javaw.exe"',
- arguments: jarName,
- });
-
- //Log.info("[addon:javaServer] resultList:", resultList);
- resultList.forEach((item) => {
- ps.kill(item.pid, "SIGKILL", (err) => {
- if (err) {
- throw new Error(err);
- }
- Log.info("[addon:javaServer] java程序退出 pid: ", item.pid);
- });
- });
-
- // const cmd = `for /f "tokens=1-5" %i in ('netstat -ano ^| findstr ":${port}"') do taskkill /F /T /PID %m`;
- // const a = await execSync(cmd, {encoding: 'utf-8'});
- // Log.info("[javaServer] kill:", a);
- } else if (is.macOS()) {
- const cmd = `ps -ef | grep java | grep ${jarName} | grep -v grep | awk '{print $2}' | xargs kill -9`;
- const result = await execSync(cmd);
- Log.info("[addon:javaServer] kill:", result != null ? result.toString(): '');
- } else {
- // todo linux
- }
- }
-
- /**
- * 服务是否运行中
- */
- async isRun(cfg){
- const jarName = cfg.name;
- if (is.windows()) {
- const resultList = ps.lookup({
- command: "java",
- where: 'caption="javaw.exe"',
- arguments: jarName,
- });
-
- Log.info("[addon:javaServer] resultList:", resultList);
- return resultList.length>0;
- } else if (is.macOS()) {
- const cmd = `ps -ef | grep java | grep ${jarName} | grep -v grep | awk '{print $2}' `;
- Log.info("[addon:javaServer:isRun] cmdStr:", cmd);
- const result = execSync(cmd);
- Log.info('[addon:javaServer:isRun] result:', result.toString());
- //不等于空说明正在运行
- return result.toString()!==""
- } else {
- // todo linux
- }
- }
-}
-
-module.exports = JavaServer;
\ No newline at end of file
diff --git a/electron/addon/tray/index.js b/electron/addon/tray/index.js
index 57dbdf8..44bd208 100644
--- a/electron/addon/tray/index.js
+++ b/electron/addon/tray/index.js
@@ -62,6 +62,10 @@ class TrayAddon {
this.tray.setToolTip(cfg.title);
const contextMenu = Menu.buildFromTemplate(trayMenuTemplate);
this.tray.setContextMenu(contextMenu);
+ // 左键双击的时候能够显示主窗口
+ this.tray.on('double-click', () => {
+ mainWindow.show()
+ })
}
}
diff --git a/electron/config/bin.js b/electron/config/bin.js
index 4842216..74b2d5e 100644
--- a/electron/config/bin.js
+++ b/electron/config/bin.js
@@ -15,7 +15,7 @@ module.exports = {
protocol: 'http://',
hostname: 'localhost',
port: 8080,
- indexPath: 'index.html'
+ indexPath: 'index.html',
},
electron: {
directory: './',
@@ -35,21 +35,31 @@ module.exports = {
cmd: 'npm',
args: ['run', 'build'],
},
- go_build_w: {
+ go_w: {
directory: './go',
cmd: 'go',
args: ['build', '-o=../build/extraResources/goapp.exe'],
},
- go_build_m: {
+ go_m: {
directory: './go',
cmd: 'go',
args: ['build', '-o=../build/extraResources/goapp'],
},
- go_build_l: {
+ go_l: {
directory: './go',
cmd: 'go',
args: ['build', '-o=../build/extraResources/goapp'],
- }
+ },
+ python_w: {
+ directory: './python',
+ cmd: 'pyinstaller',
+ args: ['-n=pyapp', '-F', './main.py'],
+ },
+ python_m: {
+ directory: './python',
+ cmd: 'pyinstaller',
+ args: ['-n=pyapp', '-F', './main.py'],
+ },
},
/**
@@ -76,7 +86,11 @@ module.exports = {
go_images: {
dist: './public/images',
target: './go/public/images'
- }
+ },
+ python_dist: {
+ dist: './python/dist',
+ target: './build/extraResources/py'
+ },
},
/**
@@ -125,5 +139,11 @@ module.exports = {
cmd: 'npm',
args: ['-v'],
},
+ python: {
+ directory: './python',
+ cmd: 'python',
+ args: ['./main.py', '--port=7074'],
+ stdio: "inherit", // ignore
+ },
},
};
\ No newline at end of file
diff --git a/electron/config/config.default.js b/electron/config/config.default.js
index c038bcf..744a262 100644
--- a/electron/config/config.default.js
+++ b/electron/config/config.default.js
@@ -119,7 +119,7 @@ module.exports = (appInfo) => {
/**
* Cross-language service
* 跨语言服务
- * 例如：执行go的二进制程序
+ * 例如：执行go的二进制程序，默认目录为 ./extraResources/
*/
config.cross = {
go: {
@@ -128,6 +128,14 @@ module.exports = (appInfo) => {
args: ['--port=7073'],
appExit: true,
},
+ python: {
+ enable: false,
+ name: 'pyapp',
+ cmd: './py/pyapp',
+ directory: './py',
+ args: ['--port=7074'],
+ appExit: true,
+ },
};
/**
diff --git a/electron/config/config.local.js b/electron/config/config.local.js
index 49fe802..4de28b9 100644
--- a/electron/config/config.local.js
+++ b/electron/config/config.local.js
@@ -41,7 +41,16 @@ module.exports = (appInfo) => {
directory: './go',
args: ['run', './main.go', '--env=dev','--basedir=../', '--port=7073'],
appExit: true,
- }
+ },
+ python: {
+ enable: false,
+ name: 'pyapp',
+ cmd: 'python',
+ directory: './python',
+ args: ['./main.py', '--port=7074'],
+ stdio: "inherit",
+ appExit: true,
+ },
};
return {
diff --git a/electron/controller/cross.js b/electron/controller/cross.js
index 8b40b9e..b67f85a 100644
--- a/electron/controller/cross.js
+++ b/electron/controller/cross.js
@@ -67,6 +67,8 @@ class CrossController extends Controller {
Services.get('cross').createGoServer();
} else if (program == 'java') {
Services.get('cross').createJavaServer();
+ } else if (program == 'python') {
+ Services.get('cross').createPythonServer();
}
return;
diff --git a/electron/preload/index.js b/electron/preload/index.js
index e9e2bf9..85d732a 100644
--- a/electron/preload/index.js
+++ b/electron/preload/index.js
@@ -2,6 +2,7 @@
** preload为预加载模块，该文件将会在程序启动时加载 **
*************************************************/
const Addon = require('ee-core/addon');
+const Services = require('ee-core/services');
/**
* 预加载模块入口
@@ -13,4 +14,6 @@ module.exports = async () => {
Addon.get('security').create();
Addon.get('awaken').create();
Addon.get('autoUpdater').create();
+
+ //Services.get('cross').createGoServer();
}
\ No newline at end of file
diff --git a/electron/service/cross.js b/electron/service/cross.js
index 1a5e4c0..733fcb4 100644
--- a/electron/service/cross.js
+++ b/electron/service/cross.js
@@ -30,12 +30,15 @@ class CrossService extends Service {
const serviceName = "go";
const opt = {
name: 'goapp',
- appExit: false,
+ cmd: path.join(Ps.getExtraResourcesDir(), 'goapp'),
+ directory: Ps.getExtraResourcesDir(),
+ args: ['--port=7073'],
+ appExit: true,
}
const entity = await Cross.run(serviceName, opt);
Log.info('server name:', entity.name);
Log.info('server config:', entity.config);
- Log.info('server url:', Cross.getUrl(entity.name));
+ Log.info('server url:', entity.getUrl());
return;
}
@@ -68,6 +71,33 @@ class CrossService extends Service {
return;
}
+
+ /**
+ * create python service
+ * In the default configuration, services can be started with applications.
+ * Developers can turn off the configuration and create it manually.
+ */
+ async createPythonServer() {
+ // method 1: Use the default Settings
+ //const entity = await Cross.run(serviceName);
+
+ // method 2: Use custom configuration
+ const serviceName = "python";
+ const opt = {
+ name: 'pyapp',
+ cmd: path.join(Ps.getExtraResourcesDir(), 'py', 'pyapp'),
+ directory: path.join(Ps.getExtraResourcesDir(), 'py'),
+ args: ['--port=7074'],
+ windowsExtname: true,
+ appExit: true,
+ }
+ const entity = await Cross.run(serviceName, opt);
+ Log.info('server name:', entity.name);
+ Log.info('server config:', entity.config);
+ Log.info('server url:', entity.getUrl());
+
+ return;
+ }
}
CrossService.toString = () => '[class CrossService]';
diff --git a/frontend/src/router/routerMap.js b/frontend/src/router/routerMap.js
index 9506a92..2c4d39a 100644
--- a/frontend/src/router/routerMap.js
+++ b/frontend/src/router/routerMap.js
@@ -171,7 +171,12 @@ const constantRouterMap = [
path: '/cross/java/index',
name: 'CrossJavaIndex',
component: () => import('@/views/cross/java/Index.vue')
- }
+ },
+ {
+ path: '/cross/python/index',
+ name: 'CrossPythonIndex',
+ component: () => import('@/views/cross/python/Index.vue')
+ },
]
},
]
diff --git a/frontend/src/router/subMenu.js b/frontend/src/router/subMenu.js
index 562967e..3201e7e 100644
--- a/frontend/src/router/subMenu.js
+++ b/frontend/src/router/subMenu.js
@@ -142,6 +142,12 @@ export default {
title: 'java服务',
pageName: 'CrossJavaIndex',
params: {}
- },
+ },
+ 'menu_120' : {
+ icon: 'profile',
+ title: 'python服务',
+ pageName: 'CrossPythonIndex',
+ params: {}
+ },
},
}
diff --git a/frontend/src/views/cross/go/Index.vue b/frontend/src/views/cross/go/Index.vue
index cf9c015..7dde041 100644
--- a/frontend/src/views/cross/go/Index.vue
+++ b/frontend/src/views/cross/go/Index.vue
@@ -81,7 +81,7 @@
const cfg = {
method: 'get',
url: testApi,
- params: { id: '1111111'},
+ params: { id: '111'},
timeout: 1000,
}
axios(cfg).then(res => {
diff --git a/frontend/src/views/cross/java/Index.vue b/frontend/src/views/cross/java/Index.vue
index 2380d53..777ae1e 100644
--- a/frontend/src/views/cross/java/Index.vue
+++ b/frontend/src/views/cross/java/Index.vue
@@ -31,7 +31,7 @@
diff --git a/frontend/src/views/cross/python/Index.vue b/frontend/src/views/cross/python/Index.vue
new file mode 100644
index 0000000..cd56a23
--- /dev/null
+++ b/frontend/src/views/cross/python/Index.vue
@@ -0,0 +1,117 @@
+
+
+
+
+ 1. 基础控制
+
+
+
+
+ 启动
+ 获取地址
+ kill
+ test
+
+
+
+
+ 2. 发送http请求
+
+
+
+
+
+ 3. 多个服务
+
+
+
+