public/electron-egg
1
0
Fork 0
mirror of https://gitee.com/dromara/electron-egg.git synced 2026-05-14 19:52:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

使用新的api

Browse Source
This commit is contained in:
哆啦好梦
2023-03-03 11:54:49 +08:00
parent 9fed01c753
commit 2473e17de1
14 changed files with 49 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
electron/addon/javaServer/index.js
View File

@@ -1,6 +1,7 @@
const getPort = require('get-port');
const server = require("./server");
const electronApp = require('electron').app;
const Log = require('ee-core/module/log');
/**
* java server插件
@@ -28,7 +29,7 @@ class JavaServerAddon {
// kill
electronApp.on("before-quit", async () => {
this.app.logger.info("[addon:javaServer] before-quit: kill-----------");
Log.info("[addon:javaServer] before-quit: kill-----------");
await this.javaServer.kill();
});

11
electron/addon/javaServer/server.js
View File

@@ -6,6 +6,7 @@ const path = require("path");
const { exec, execSync } = require("child_process");
const Utils = require("ee-core").Utils;
const ps = require("./ps");
const Log = require('ee-core/module/log');
/**
* java server
@@ -53,11 +54,11 @@ class JavaServer {
// todo linux
}
this.app.logger.info("[addon:javaServer] cmdStr:", cmdStr);
Log.info("[addon:javaServer] cmdStr:", cmdStr);
exec(cmdStr);
} catch (err) {
this.app.logger.error('[addon:javaServer] throw error:', err);
Log.error('[addon:javaServer] throw error:', err);
}
}
@@ -73,7 +74,7 @@ class JavaServer {
arguments: jarName,
});
//this.app.logger.info("[addon:javaServer] resultList:", resultList);
//Log.info("[addon:javaServer] resultList:", resultList);
resultList.forEach((item) => {
ps.kill(item.pid, "SIGKILL", (err) => {
if (err) {
@@ -85,11 +86,11 @@ class JavaServer {
// 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'});
// app.logger.info("[javaServer] kill:", a);
// 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);
this.app.logger.info("[addon:javaServer] kill:", result != null ? result.toString(): '');
Log.info("[addon:javaServer] kill:", result != null ? result.toString(): '');
} else {
// todo linux
}