From 0ebe7dddbb280f1a2f5836b98c78681ff011e892 Mon Sep 17 00:00:00 2001 From: gaoshuaixing Date: Mon, 15 Jan 2024 15:43:21 +0800 Subject: [PATCH 1/2] config --- electron/config/config.default.js | 9 +-------- electron/config/config.local.js | 8 -------- frontend/src/views/cross/go/Index.vue | 2 +- frontend/src/views/cross/java/Index.vue | 2 +- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/electron/config/config.default.js b/electron/config/config.default.js index 54e4a57..c038bcf 100644 --- a/electron/config/config.default.js +++ b/electron/config/config.default.js @@ -134,7 +134,7 @@ module.exports = (appInfo) => { * 硬件加速 */ config.hardGpu = { - enable: false + enable: true }; /** @@ -184,13 +184,6 @@ module.exports = (appInfo) => { }, force: false, }, - javaServer: { - enable: true, - port: 18080, - jreVersion: 'jre1.8.0_201', - opt: '-server -Xms512M -Xmx512M -Xss512k -Dspring.profiles.active=prod -Dserver.port=${port} -Dlogging.file.path="${path}" ', - name: 'java-app.jar' - } }; return { diff --git a/electron/config/config.local.js b/electron/config/config.local.js index 4d6f23e..1c083a6 100644 --- a/electron/config/config.local.js +++ b/electron/config/config.local.js @@ -42,14 +42,6 @@ module.exports = (appInfo) => { args: ['run', './main.go', '--env=dev','--basedir=../', '--port=7073'], appExit: true, }, - // java: { - // enable: true, - // name: 'goapp', - // cmd: 'go', - // directory: './go', - // args: ['run', './main.go', '--env=dev','--basedir=../', '--port=7073'], - // appExit: true, - // } }; return { diff --git a/frontend/src/views/cross/go/Index.vue b/frontend/src/views/cross/go/Index.vue index 9c7fbee..f8b1e0c 100644 --- a/frontend/src/views/cross/go/Index.vue +++ b/frontend/src/views/cross/go/Index.vue @@ -7,9 +7,9 @@
+ 启动 获取地址 kill - 启动 test
diff --git a/frontend/src/views/cross/java/Index.vue b/frontend/src/views/cross/java/Index.vue index 5af511a..23fb7ae 100644 --- a/frontend/src/views/cross/java/Index.vue +++ b/frontend/src/views/cross/java/Index.vue @@ -7,9 +7,9 @@
+ 启动 获取地址 kill - 启动 查看
From 7b512128a5e218e9f9be7e82dc21d3735dbdaffb Mon Sep 17 00:00:00 2001 From: gaoshuaixing Date: Mon, 29 Jan 2024 18:20:14 +0800 Subject: [PATCH 2/2] cross service --- electron/controller/cross.js | 54 +++--------------- electron/service/cross.js | 74 +++++++++++++++++++++++++ frontend/src/api/main.js | 1 - frontend/src/views/cross/go/Index.vue | 2 +- frontend/src/views/cross/java/Index.vue | 2 +- 5 files changed, 83 insertions(+), 50 deletions(-) create mode 100644 electron/service/cross.js diff --git a/electron/controller/cross.js b/electron/controller/cross.js index 92a0676..8b40b9e 100644 --- a/electron/controller/cross.js +++ b/electron/controller/cross.js @@ -4,9 +4,7 @@ const { Controller } = require('ee-core'); const Cross = require('ee-core/cross'); const Log = require('ee-core/log'); const HttpClient = require('ee-core/httpclient'); -const Ps = require('ee-core/ps'); -const path = require("path"); -const Is = require('ee-core/utils/is'); +const Services = require('ee-core/services'); /** * Cross @@ -62,52 +60,14 @@ class CrossController extends Controller { /** * create service - * In the default configuration, services can be started with applications. - * Developers can turn off the configuration and create it manually. */ - async createServer() { - // method 1: Use the default Settings - //const entity = await Cross.run(serviceName); - - // method 2: Use custom configuration - const serviceName = "go"; - const opt = { - name: 'goapp', - appExit: false, + async createServer(args) { + const { program } = args; + if (program == 'go') { + Services.get('cross').createGoServer(); + } else if (program == 'java') { + Services.get('cross').createJavaServer(); } - 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)); - - return; - } - - /** - * create java server - */ - async createJavaServer() { - const serviceName = "java"; - const jarPath = path.join(Ps.getExtraResourcesDir(), 'java-app.jar'); - const opt = { - name: 'javaapp', - cmd: path.join(Ps.getExtraResourcesDir(), 'jre1.8.0_201/bin/javaw.exe'), - directory: Ps.getExtraResourcesDir(), - args: ['-jar', '-server', '-Xms512M', '-Xmx512M', '-Xss512k', '-Dspring.profiles.active=prod', `-Dserver.port=18080`, `-Dlogging.file.path=${Ps.getLogDir()}`, `${jarPath}`], - appExit: false, - } - if (Is.macOS()) { - // Setup Java program - opt.cmd = path.join(Ps.getExtraResourcesDir(), 'jre1.8.0_201/Contents/Home/bin/java'); - } - if (Is.linux()) { - // Setup Java program - } - - 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)); return; } diff --git a/electron/service/cross.js b/electron/service/cross.js new file mode 100644 index 0000000..1a5e4c0 --- /dev/null +++ b/electron/service/cross.js @@ -0,0 +1,74 @@ +'use strict'; + +const { Service } = require('ee-core'); +const Cross = require('ee-core/cross'); +const Log = require('ee-core/log'); +const Ps = require('ee-core/ps'); +const path = require("path"); +const Is = require('ee-core/utils/is'); + +/** + * cross（service层为单例） + * @class + */ +class CrossService extends Service { + + constructor(ctx) { + super(ctx); + } + + /** + * create go service + * In the default configuration, services can be started with applications. + * Developers can turn off the configuration and create it manually. + */ + async createGoServer() { + // method 1: Use the default Settings + //const entity = await Cross.run(serviceName); + + // method 2: Use custom configuration + const serviceName = "go"; + const opt = { + name: 'goapp', + appExit: false, + } + 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)); + + return; + } + + /** + * create java server + */ + async createJavaServer() { + const serviceName = "java"; + const jarPath = path.join(Ps.getExtraResourcesDir(), 'java-app.jar'); + const opt = { + name: 'javaapp', + cmd: path.join(Ps.getExtraResourcesDir(), 'jre1.8.0_201/bin/javaw.exe'), + directory: Ps.getExtraResourcesDir(), + args: ['-jar', '-server', '-Xms512M', '-Xmx512M', '-Xss512k', '-Dspring.profiles.active=prod', `-Dserver.port=18080`, `-Dlogging.file.path=${Ps.getLogDir()}`, `${jarPath}`], + appExit: false, + } + if (Is.macOS()) { + // Setup Java program + opt.cmd = path.join(Ps.getExtraResourcesDir(), 'jre1.8.0_201/Contents/Home/bin/java'); + } + if (Is.linux()) { + // Setup Java program + } + + 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)); + + return; + } +} + +CrossService.toString = () => '[class CrossService]'; +module.exports = CrossService; \ No newline at end of file diff --git a/frontend/src/api/main.js b/frontend/src/api/main.js index 2b536bf..29c83fc 100644 --- a/frontend/src/api/main.js +++ b/frontend/src/api/main.js @@ -59,7 +59,6 @@ const ipcApiRoute = { getCrossUrl: 'controller.cross.getUrl', killCrossServer: 'controller.cross.killServer', createCrossServer: 'controller.cross.createServer', - createJavaServer: 'controller.cross.createJavaServer', requestApi: 'controller.cross.requestApi', } diff --git a/frontend/src/views/cross/go/Index.vue b/frontend/src/views/cross/go/Index.vue index f8b1e0c..cf9c015 100644 --- a/frontend/src/views/cross/go/Index.vue +++ b/frontend/src/views/cross/go/Index.vue @@ -69,7 +69,7 @@ ipc.invoke(ipcApiRoute.killCrossServer, {type: 'all', name: 'goapp'}) }, create() { - ipc.invoke(ipcApiRoute.createCrossServer) + ipc.invoke(ipcApiRoute.createCrossServer, { program: 'go' }) }, request(type) { if (type == 1 && this.serverUrl == "") { diff --git a/frontend/src/views/cross/java/Index.vue b/frontend/src/views/cross/java/Index.vue index 23fb7ae..2380d53 100644 --- a/frontend/src/views/cross/java/Index.vue +++ b/frontend/src/views/cross/java/Index.vue @@ -69,7 +69,7 @@ ipc.invoke(ipcApiRoute.killCrossServer, {type: 'all', name: 'javaapp'}) }, create() { - ipc.invoke(ipcApiRoute.createJavaServer) + ipc.invoke(ipcApiRoute.createCrossServer, { program: 'java' }) }, request(type) { if (type == 1 && this.serverUrl == "") {