From 7916c1eb16de56b079ecaf99936e9f53f08da669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=93=86=E5=95=A6=E5=A5=BD=E6=A2=A6?= <530353222@qq.com>
Date: Sun, 23 Apr 2023 12:03:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A8=E6=80=81=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=A3=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/addon/javaServer/index.js |  4 ++--
 electron/preload/index.js          | 24 ------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/electron/addon/javaServer/index.js b/electron/addon/javaServer/index.js
index eaacc96..b60545f 100644
--- a/electron/addon/javaServer/index.js
+++ b/electron/addon/javaServer/index.js
@@ -1,8 +1,8 @@
-const getPort = require('get-port');
 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插件
@@ -59,7 +59,7 @@ class JavaServerAddon {
     if (!this.cfg.enable) {
       return;
     }
-    const javaPort = await getPort({ port: this.cfg.port });
+    const javaPort = await GetPort({ port: this.cfg.port });
     process.env.EE_JAVA_PORT = javaPort;
     this.cfg.port = javaPort;
 
diff --git a/electron/preload/index.js b/electron/preload/index.js
index 765b098..a4af709 100644
--- a/electron/preload/index.js
+++ b/electron/preload/index.js
@@ -7,30 +7,6 @@
  */
 module.exports = async (app) => {
 
-  // const { ChildPoolJob } = require('ee-core/jobs');
-  // const pool = new ChildPoolJob();
-  // //let pids = pool.create(4);
-
-  
-  // setTimeout(()=>{
-  //   pool.create(3).then(pids => {
-  //     console.log('pids:', pids);
-  //   });
-  // }, 1000)
-
-  // setTimeout(()=>{
-  //   let myjob = pool.exec('./jobs/example/timer', {jobId});
-  
-  //   // 监听任务进度
-  //   const channel = 'controller.example.timerJobProgress';
-  //   myjob.on('job-timer-progress', (data) => {
-  //     Log.info('[main-process] from TimerJob data:', data);
-
-  //   })
-  // }, 5000)
-
-
-
   //已实现的功能模块，可选择性使用和修改
   const trayAddon = app.addon.tray;
   const securityAddon = app.addon.security;