diff --git a/web/admin/crontab/__init__.py b/web/admin/crontab/__init__.py index 0b5bd1064..2fd69344b 100644 --- a/web/admin/crontab/__init__.py +++ b/web/admin/crontab/__init__.py @@ -89,6 +89,7 @@ def modify_crond(): request_data['sname'] = request.form.get('sname', '') request_data['sbody'] = request.form.get('sbody', '') request_data['url_address'] = request.form.get('url_address', '') + request_data['attr'] = request.form.get('attr', '') cron_id = request.form.get('id', '') data = MwCrontab.instance().modifyCrond(cron_id,request_data) return data diff --git a/web/static/app/crontab.js b/web/static/app/crontab.js index e1ed4b067..738afca5e 100755 --- a/web/static/app/crontab.js +++ b/web/static/app/crontab.js @@ -365,6 +365,7 @@ function planAdd(){ initDropdownMenu(); function initDropdownMenu(){ $(".dropdown ul li a").click(function(){ + $('#tag_exclude_dir').hide(); var txt = $(this).text(); var type = $(this).attr("value"); $(this).parents(".dropdown").find("button b").text(txt).attr("val",type); @@ -418,8 +419,15 @@ function initDropdownMenu(){ break; case 'site': toBackup('sites'); + $('#tag_exclude_dir').show(); $(".controls").html('备份网站'); break; + case 'path': + $('#tag_exclude_dir').show(); + console.log("path"); + toBackup('path'); + $(".controls").html('备份目录'); + break; case 'database_mariadb': case 'database_mongodb': case 'database_postgresql': @@ -429,10 +437,6 @@ function initDropdownMenu(){ toBackup(type); $(".controls").html('备份数据库'); break; - case 'path': - toBackup('path'); - $(".controls").html('备份目录'); - break; case 'logs': toLogsHtml('logs'); $(".controls").html('切割网站'); @@ -670,6 +674,7 @@ function editTaskInfo(id){ backup_to: rdata.backup_to, save: rdata.save, url_address: rdata.url_address, + attr:rdata.attr, }, sTypeArray:[['toShell','Shell脚本'],['site','备份网站'],['database','备份数据库'],['logs','日志切割'],['path','备份目录'],['rememory','释放内存'],['toUrl','访问URL']], cycleArray:[['day','每天'],['day-n','N天'],['hour','每小时'],['hour-n','N小时'],['minute-n','N分钟'],['week','每星期'],['month','每月']], @@ -753,7 +758,7 @@ function editTaskInfo(id){ \
\ 任务名称\ -
\ +
\
\
\ 执行周期\ @@ -806,7 +811,11 @@ function editTaskInfo(id){
\
\ 脚本内容\ -
\ +
\ +
\ +
\ + 排除目录\ +
\
\
\ 提示\ @@ -845,7 +854,7 @@ function editTaskInfo(id){ obj.from.hour = $('.hour_create').val(); obj.from.where1 = $('.where1_create').val(); - $('.sName_create').blur(function () { + $('.sname_create').blur(function () { obj.from.name = $(this).val(); }); $('.where1_create').blur(function () { @@ -864,9 +873,15 @@ function editTaskInfo(id){ obj.from.save = $(this).val(); }); - $('.sBody_create').blur(function () { + $('.sbody_create').blur(function () { obj.from.sbody = $(this).val(); }); + + $('.attr_create').blur(function () { + obj.from.attr = $(this).val(); + }); + + $('.url_create').blur(function () { obj.from.url_address = $(this).val(); }); diff --git a/web/templates/default/crontab.html b/web/templates/default/crontab.html index 420655449..359a4b47f 100755 --- a/web/templates/default/crontab.html +++ b/web/templates/default/crontab.html @@ -86,7 +86,15 @@
脚本内容 -
+
+ +
+
+
添加任务
diff --git a/web/thisdb/crontab.py b/web/thisdb/crontab.py index c9c3d98e0..023b57e00 100644 --- a/web/thisdb/crontab.py +++ b/web/thisdb/crontab.py @@ -12,7 +12,7 @@ import os import core.mw as mw -__field = 'id,name,type,where1,where_hour,where_minute,echo,status,save,backup_to,stype,sname,sbody,url_address,add_time,update_time' +__field = 'id,name,type,where1,where_hour,where_minute,echo,status,save,backup_to,stype,sname,sbody,url_address,attr,add_time,update_time' def addCrontab(data): now_time = mw.formatDate() diff --git a/web/utils/crontab.py b/web/utils/crontab.py index 625ad40d8..0bca433bd 100644 --- a/web/utils/crontab.py +++ b/web/utils/crontab.py @@ -54,6 +54,7 @@ class crontab(object): dbdata['sbody'] = data['sbody'] dbdata['stype'] = data['stype'] dbdata['url_address'] = data['url_address'] + dbdata['attr'] = data['attr'] if not self.removeForCrond(info['echo']): return mw.returnData(False, '无法写入文件,是否开启了系统加固功能!')