diff --git a/electron/controller/example.js b/electron/controller/example.js index e4e5a44..0a4463f 100644 --- a/electron/controller/example.js +++ b/electron/controller/example.js @@ -688,15 +688,15 @@ class ExampleController extends Controller { let myjob = new ChildJob(); // 执行任务及监听进度 - let timerTask = myjob.exec('./jobs/example/timer', {jobId}); const channel = 'controller.example.timerJobProgress'; + const timerTask = myjob.exec('./jobs/example/timer', {jobId}); timerTask.emitter.on('job-timer-progress', (data) => { Log.info('[main-process] timerTask, from TimerJob data:', data); // 发送数据到渲染进程 event.reply(`${channel}`, data) }) - + // 执行任务及监听进度 异步 // myjob.execPromise('./jobs/example/timer', {jobId}).then(task => { // task.emitter.on('job-timer-progress', (data) => { diff --git a/electron/jobs/example/timer.js b/electron/jobs/example/timer.js index 4c24cf8..e0e6e6d 100644 --- a/electron/jobs/example/timer.js +++ b/electron/jobs/example/timer.js @@ -2,7 +2,7 @@ const Job = require('ee-core/jobs/baseJobClass'); const Loader = require('ee-core/loader'); const Log = require('ee-core/log'); const Ps = require('ee-core/ps'); -const Message = require('ee-core/message'); +const { childMessage } = require('ee-core/message'); const Hello = Loader.requireJobsModule('./example/hello'); /** @@ -23,14 +23,13 @@ class TimerJob extends Job { Log.info("[child-process] TimerJob params: ", this.params); // 计时器任务 - let childMessage = Message.childMessage; let eventName = 'job-timer-progress'; let number = 0; let jobId = this.params.jobId; setInterval(function() { Hello.welcome(); - childMessage.sendToMain(eventName, {jobId, number}); + childMessage.send(eventName, {jobId, number}); number++; }, 1000);