diff --git a/class/core/crontab_api.py b/class/core/crontab_api.py index 72c114f01..c9f7d682d 100755 --- a/class/core/crontab_api.py +++ b/class/core/crontab_api.py @@ -539,6 +539,10 @@ fi''' % (mw.getRunDir(),) head = head + start_head + source_bin_activate + "\n" log = '.log' + #所有 + if param['sname'] == 'ALL': + log = '' + script_dir = mw.getRunDir() + "/scripts" source_stype = 'database' if stype.find('database_') > -1: @@ -575,7 +579,7 @@ fi''' % (mw.getRunDir(),) else: shell = head + param['sbody'].replace("\r\n", "\n") - shell += ''' + shell += ''' echo "----------------------------------------------------------------------------" endDate=`date +"%Y-%m-%d %H:%M:%S"` END_MW_SHELL_TIME=`date +"%s"` diff --git a/route/static/app/crontab.js b/route/static/app/crontab.js index 9da6b049e..887deb69d 100755 --- a/route/static/app/crontab.js +++ b/route/static/app/crontab.js @@ -209,10 +209,10 @@ function planAdd(){ layer.msg('任务名称不能为空!',{icon:2}); return; } - $("#set-Config input[name='name']").val(name); + $("#cronConfig input[name='name']").val(name); var type = $(".plancycle").find("b").attr("val"); - $("#set-Config input[name='type']").val(type); + $("#cronConfig input[name='type']").val(type); var is1; @@ -233,7 +233,7 @@ function planAdd(){ } var where1 = $('#excode_week b').attr('val'); - $("#set-Config input[name='where1']").val(where1); + $("#cronConfig input[name='where1']").val(where1); if(where1 > is1 || where1 < is2){ $("#ptime input[name='where1']").focus(); @@ -247,14 +247,14 @@ function planAdd(){ layer.msg('小时值不合法!',{icon:2}); return; } - $("#set-Config input[name='hour']").val(hour); + $("#cronConfig input[name='hour']").val(hour); var minute = $("#ptime input[name='minute']").val(); if(minute > 59 || minute < 0){ $("#ptime input[name='minute']").focus(); layer.msg('分钟值不合法!',{icon:2}); return; } - $("#set-Config input[name='minute']").val(minute); + $("#cronConfig input[name='minute']").val(minute); var save = $("#save").val(); if(save < 0){ @@ -262,8 +262,8 @@ function planAdd(){ return; } - $("#set-Config input[name='save']").val(save); - $("#set-Config input[name='week']").val($(".planweek").find("b").attr("val")); + $("#cronConfig input[name='save']").val(save); + $("#cronConfig input[name='week']").val($(".planweek").find("b").attr("val")); var sType = $(".planjs").find("b").attr("val"); var sBody = encodeURIComponent($("#implement textarea[name='sBody']").val()); @@ -292,9 +292,9 @@ function planAdd(){ } } // urladdress = encodeURIComponent(urladdress); - $("#set-Config input[name='urladdress']").val(urladdress); - $("#set-Config input[name='sType']").val(sType); - $("#set-Config textarea[name='sBody']").val(decodeURIComponent(sBody)); + $("#cronConfig input[name='urladdress']").val(urladdress); + $("#cronConfig input[name='sType']").val(sType); + $("#cronConfig textarea[name='sBody']").val(decodeURIComponent(sBody)); if(sType == 'site' || sType == 'database' || sType == 'path'){ var backupTo = $(".planBackupTo").find("b").attr("val"); @@ -303,45 +303,45 @@ function planAdd(){ var sName = $("#sName").attr("val"); - if(sName == 'backupAll'){ - var alist = $("ul[aria-labelledby='backdata'] li a"); - var dataList = new Array(); - for(var i=1;i 59){ if(hour >= 23) hour = 0; - $("#set-Config input[name='hour']").val(hour+1); + $("#cronConfig input[name='hour']").val(hour+1); minute = 5; } - $("#set-Config input[name='minute']").val(minute); - $("#set-Config input[name='name']").val(sTitle + '['+dataList[0]+']'); - $("#set-Config input[name='sName']").val(dataList[0]); - var pdata = $("#set-Config").serialize() + '&sBody=&urladdress='; + $("#cronConfig input[name='minute']").val(minute); + $("#cronConfig input[name='name']").val(sTitle + '['+dataList[0]+']'); + $("#cronConfig input[name='sName']").val(dataList[0]); + var pdata = $("#cronConfig").serialize() + '&sBody=&urladdress='; $.ajax({ type:'POST', url:'/crontab/add', @@ -536,7 +536,7 @@ function toBackup(type){ if (sType != 'path'){ - sOpt = '
  • 所有
  • ' + sOpt; + sOpt = '
  • 所有
  • ' + sOpt; } var orderOpt = ''; diff --git a/route/templates/default/crontab.html b/route/templates/default/crontab.html index b1f24ecad..7284ec8ee 100755 --- a/route/templates/default/crontab.html +++ b/route/templates/default/crontab.html @@ -96,7 +96,7 @@
  • 磁盘容量不够、数据库密码错误、网络不稳定等原因,可能导致数据备份不完整
  • -