From c720876fe8562417596be367e71812615b4b2319 Mon Sep 17 00:00:00 2001 From: suwings Date: Sat, 2 Jun 2018 22:00:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=20-=20=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- helper/Schedule.js | 6 +++--- route/websocket/schedule.js | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/helper/Schedule.js b/helper/Schedule.js index e8bbbd6e..942399c2 100644 --- a/helper/Schedule.js +++ b/helper/Schedule.js @@ -11,9 +11,9 @@ MCSERVER.Schedule.container = {}; MCSERVER.Schedule.dataModel = new DataModel(PATH) MCSERVER.Schedule.dataModel.list = []; +//任务具体执行函数 function serverExe(servername, commande) { if (commande.length == 0) return; - // MCSERVER.log("[ Schedule ] [", servername, "] 服务器计划执行: ", commande); try { if (commande == "__start__") { serverModel.startServer(servername); @@ -27,10 +27,10 @@ function serverExe(servername, commande) { serverModel.startServer(servername); }, 15000) } - //默认执行命令 + // 默认执行命令 serverModel.sendCommand(servername, commande); } catch (err) { - //默认忽略定时计划任务错误 + // 默认忽略定时计划任务错误 // MCSERVER.log("[ Schedule ] [", servername, "] 服务器计划执行时报错 | 已忽略"); } diff --git a/route/websocket/schedule.js b/route/websocket/schedule.js index fcbbf644..f49f3462 100644 --- a/route/websocket/schedule.js +++ b/route/websocket/schedule.js @@ -4,13 +4,15 @@ const { const permssion = require('../../helper/Permission'); const response = require('../../helper/Response'); const schedulejob = require('../../helper/Schedule'); -const UUID = require('uuid'); const tools = require('../../core/tools'); const serverModel = require('../../model/ServerModel'); -//每个服务器最大数量 +const UUID = require('uuid'); + +//每个服务器最大数量计划任务 const MAX_MASK = MCSERVER.localProperty.schedule_max || 10; +//创建计划任务函数 function CreateScheduleJob(obj) { let id = tools.randomString(6) + "_" + new Date().getTime(); let thisServer = serverModel.ServerManager().getServer(obj.servername); @@ -19,6 +21,7 @@ function CreateScheduleJob(obj) { } +//过滤计划任务列表 function getMineScheduleList(servername) { let list = MCSERVER.Schedule.dataModel.list; sendlist = []; @@ -74,7 +77,6 @@ WebSocketObserver().listener('schedule/delete', (data) => { if (permssion.isCanServer(username, obj.servername || "")) { try { - schedulejob.deleteScheduleJob(obj.id || ""); response.wsMsgWindow(data.ws, "删除序号:" + obj.id + "计划任务"); } catch (err) {