From a287cb90ec24fdafcc9d1649dc17c35a4cd3d38a Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Fri, 25 Jan 2019 19:08:22 +0800
Subject: [PATCH] update

---
 class/core/crontab_api.py   | 18 ++++++++++++++++--
 route/static/app/crontab.js | 17 ++++++++---------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/class/core/crontab_api.py b/class/core/crontab_api.py
index cbaeae3e6..ea1f7d3fd 100755
--- a/class/core/crontab_api.py
+++ b/class/core/crontab_api.py
@@ -204,10 +204,24 @@ class crontab_api:
         return public.returnJson(False, '添加失败')
 
     def delApi(self):
-        id = request.form.get('id', '')
+        sid = request.form.get('id', '')
         try:
+            find = public.M('crontab').where("id=?", (sid,)).delete()
+            if not self.removeForCrond(find['echo']):
+                return public.returnJson(False, '无法写入文件，请检查是否开启了系统加固功能!')
+
+            cronPath = public.getServerDir() + '/cron'
+            sfile = cronPath + '/' + find['echo']
+            if os.path.exists(sfile):
+                os.remove(sfile)
+            sfile = cronPath + '/' + find['echo'] + '.log'
+            if os.path.exists(sfile):
+                os.remove(sfile)
+
             public.M('crontab').where("id=?", (id,)).delete()
-            return public.returnJson(True, '添加成功')
+            public.writeLog('计划任务', public.getInfo(
+                '删除计划任务[{1}]成功!', (find['name'],)))
+            return public.returnJson(True, '删除成功')
         except Exception as e:
             return public.returnJson(False, '删除失败')
 
diff --git a/route/static/app/crontab.js b/route/static/app/crontab.js
index df26ba71c..d84c893d0 100755
--- a/route/static/app/crontab.js
+++ b/route/static/app/crontab.js
@@ -88,7 +88,7 @@ function startTask(id){
 
 //清空日志
 function closeLogs(id){
-	layer.msg(lan.public.the,{icon:16,time:0,shade: [0.3, '#000']});
+	layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']});
 	var data='id='+id;
 	$.post('/crontab/del_logs',data,function(rdata){
 		layer.closeAll();
@@ -100,17 +100,16 @@ function closeLogs(id){
 //删除
 function planDel(id,name){
 	safeMessage(lan.get('del',[name]),lan.crontab.del_task,function(){
-			layer.msg(lan.public.the,{icon:16,time:0,shade: [0.3, '#000']});
-			var data='id='+id;
-			$.post('/crontab/del',data,function(rdata){
-				layer.closeAll();
-				layer.msg(rdata.msg,{icon:rdata.status?1:2});
-				getCronData();
-			});
+		layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']});
+		var data='id='+id;
+		$.post('/crontab/del',data,function(rdata){
+			layer.closeAll();
+			layer.msg(rdata.msg,{icon:rdata.status?1:2,time:2000});
+			getCronData();
+		},'json');
 	});
 }
 
-
 //批量删除
 function allDeleteCron(){
 	var checkList = $("input[name=id]");