From 1b261e0a2ef1e2177c4fe780d1283a07ecce9034 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Mon, 4 Mar 2019 14:09:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BD=91=E7=AB=99=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- class/core/site_api.py | 26 ++++++----- data/sql/default.sql | 1 + plugins/mysql/js/mysql.js | 9 ---- route/static/app/public.js | 32 ++++++------- route/static/app/site.js | 76 ++++++++++++++++++++++++++----- route/templates/default/site.html | 10 ++-- 6 files changed, 96 insertions(+), 58 deletions(-) diff --git a/class/core/site_api.py b/class/core/site_api.py index cf4e24fab..6f40b9389 100755 --- a/class/core/site_api.py +++ b/class/core/site_api.py @@ -51,9 +51,15 @@ class site_api: def listApi(self): limit = request.form.get('limit', '').encode('utf-8') p = request.form.get('p', '').encode('utf-8') + type_id = request.form.get('type_id', '').encode('utf-8') start = (int(p) - 1) * (int(limit)) - _list = public.M('sites').where('', ()).field('id,name,path,status,ps,addtime,edate').limit( + + siteM = public.M('sites') + if type_id != '' and type_id == '-1' and type_id == '0': + siteM.where('type_id=?', (type_id)) + + _list = siteM.field('id,name,path,status,ps,addtime,edate').limit( (str(start)) + ',' + limit).order('id desc').select() for i in range(len(_list)): @@ -63,7 +69,7 @@ class site_api: _ret = {} _ret['data'] = _list - count = public.M('sites').where('', ()).count() + count = siteM.count() _page = {} _page['count'] = count _page['tojs'] = 'getWeb' @@ -1215,7 +1221,7 @@ class site_api: mid = request.form.get('id', '').encode('utf-8') site_ids = json.loads(site_ids) for sid in site_ids: - public.M('sites').where('id=?', (sid,)).setField('type_id', mid) + print public.M('sites').where('id=?', (sid,)).setField('type_id', mid) return public.returnJson(True, "设置成功!") ##### ----- end ----- ### @@ -1625,13 +1631,12 @@ location /{ self.sitePort = port.strip().replace(' ', '') self.phpVersion = version - siteM = public.M('sites') - if siteM.where("name=?", (self.siteName,)).count(): + if public.M('sites').where("name=?", (self.siteName,)).count(): return public.returnJson(False, '您添加的站点已存在!') # 写入数据库 - pid = siteM.add('name,path,status,ps,edate,addtime', - (self.siteName, self.sitePath, '1', ps, '0000-00-00', public.getDate())) + pid = public.M('sites').add('name,path,status,ps,edate,addtime,type_id', + (self.siteName, self.sitePath, '1', ps, '0000-00-00', public.getDate(), 0,)) opid = public.M('domain').where( "name=?", (self.siteName,)).getField('pid') if opid: @@ -1643,14 +1648,13 @@ location /{ for domain in siteMenu['domainlist']: sdomain = domain swebname = self.siteName - spid = str(get.pid) + spid = str(pid) # self.addDomain(domain, webname, pid) public.M('domain').add('pid,name,port,addtime', (pid, self.siteName, self.sitePort, public.getDate())) self.createRootDir(self.sitePath) - self.nginxAddConf() data = {} @@ -1661,8 +1665,8 @@ location /{ def deleteWSLogs(self, webname): assLogPath = public.getLogsDir() + '/' + webname + '.log' errLogPath = public.getLogsDir() + '/' + webname + '.error.log' - confFile = self.setupPath + '/openresty/nginx/conf/vhost/' + webname + '.conf' - rewriteFile = self.setupPath + '/openresty/nginx/conf/rewrite/' + webname + '.conf' + confFile = self.setupPath + '/web_conf/nginx/conf/vhost/' + webname + '.conf' + rewriteFile = self.setupPath + '/web_conf/nginx/conf/rewrite/' + webname + '.conf' logs = [assLogPath, errLogPath, confFile, rewriteFile] for i in logs: public.deleteFile(i) diff --git a/data/sql/default.sql b/data/sql/default.sql index 286dfc3d3..3453d4978 100755 --- a/data/sql/default.sql +++ b/data/sql/default.sql @@ -65,6 +65,7 @@ CREATE TABLE IF NOT EXISTS `sites` ( `path` TEXT, `status` TEXT, `index` TEXT, + `type_id` INTEGER, `ps` TEXT, `edate` TEXT, `addtime` TEXT diff --git a/plugins/mysql/js/mysql.js b/plugins/mysql/js/mysql.js index 41fa45cc0..d8ed8ed4e 100755 --- a/plugins/mysql/js/mysql.js +++ b/plugins/mysql/js/mysql.js @@ -469,15 +469,6 @@ function copyPass(password){ $("#bt_copys").click(); } -function readerTableChecked(){ - $('table').find('th').find('input').bind('click',function(){ - $('table').find('td').find('input').each(function(i,obj){ - checked = $(this).prop('checked'); - $(this).prop('checked',!checked); - }); - }); -} - function checkSelect(){ setTimeout(function () { var num = $('input[type="checkbox"].check:checked').length; diff --git a/route/static/app/public.js b/route/static/app/public.js index b935a291b..88a28f07d 100755 --- a/route/static/app/public.js +++ b/route/static/app/public.js @@ -797,26 +797,20 @@ function fly(a) { }); }; +function readerTableChecked(){ + $('thead').find('input').bind('click',function(){ + $('tbody').find('tr').each(function(i,obj){ + var fin = $(this).find('td')[0]; + checked = $(fin).find('input').prop('checked'); + $(fin).find('input').prop('checked',!checked); + }); + }); +} //检查选中项 function checkSelect(){ setTimeout(function(){ - var checkList = $("input[name=id]"); - console.log(checkList); - var count = 0; - for(var i=0;i 0){ - $("#allDelete").show(); - } else { - $("#allDelete").hide(); - } - - var num = $('input[type="checkbox"]:checked'); - console.log(num); + var num = $('tbody').find('input[type="checkbox"]:checked').length; if (num == 1) { $('button[batch="true"]').hide(); $('button[batch="false"]').show(); @@ -1025,15 +1019,15 @@ function getSpeed(sele){ function messageBox() { layer.open({ type: 1, - title: lan.bt.task_title, + title: '消息盒子', area: "640px", closeBtn: 2, shadeClose: false, content: '
\
\
\ -

'+lan.bt.task_list+'(0)

\ -

'+lan.bt.task_msg+'(0)

\ +

任务列表(0)

\ +

消息列表(0)

\

执行日志

\
\
\ diff --git a/route/static/app/site.js b/route/static/app/site.js index afcb2bae5..3e835c3d4 100755 --- a/route/static/app/site.js +++ b/route/static/app/site.js @@ -3,7 +3,7 @@ * @param {Number} page 当前页 * @param {String} search 搜索条件 */ -function getWeb(page, search) { +function getWeb(page, search, type_id) { search = $("#SearchValue").prop("value"); page = page == undefined ? '1':page; var order = getCookie('order'); @@ -13,8 +13,15 @@ function getWeb(page, search) { order = ''; } + var type = ''; + if ( typeof(type_id) == 'undefined' ){ + type = '&type_id=0'; + } else { + type = '&type_id='+type_id; + } + var sUrl = '/site/list'; - var pdata = 'limit=10&p=' + page + '&search=' + search + order; + var pdata = 'limit=10&p=' + page + '&search=' + search + order + type; var loadT = layer.load(); //取回数据 $.post(sUrl, pdata, function(data) { @@ -124,6 +131,8 @@ function getWeb(page, search) { $(this).hide().after(""); $(".baktext").focus(); }); + + readerTableChecked(); },'json'); } @@ -141,7 +150,6 @@ function getBakPost(b) { } function setWebPs(b, e, a) { - console.log(b,e,a); var d = layer.load({shade: true,shadeClose: false}); var c = 'ps=' + a; $.post('/site/set_ps', 'id=' + e + "&" + c, function(data) { @@ -506,7 +514,7 @@ function webStart(wid, wname) { */ function webDelete(wid, wname){ var thtml = "
\ - \ + \
"; var info = '是否要删除同名根目录'; safeMessage('删除站点'+"["+wname+"]",info, function(){ @@ -514,7 +522,7 @@ function webDelete(wid, wname){ if($("#delpath").is(":checked")){ path='&path=1'; } - var loadT = layer.msg(lan.public.the,{icon:16,time:10000,shade: [0.3, '#000']}); + var loadT = layer.msg('正在处理,请稍候...',{icon:16,time:10000,shade: [0.3, '#000']}); $.post("/site/delete","id=" + wid + "&webname=" + wname + path, function(ret){ layer.closeAll(); layer.msg(ret.msg,{icon:ret.status?1:2}) @@ -2099,6 +2107,12 @@ function getClassType(){ for (var i = 0; i'+rdata[i]['name']+''); } + + $(select).bind('change',function(){ + var select_id = $(this).val(); + // console.log(select_id); + getWeb(1,'',select_id); + }) },'json'); } getClassType(); @@ -2108,7 +2122,6 @@ getClassType(); function setClassType(){ $.post('/site/get_site_types',function(rdata){ - var list = ''; for (var i = 0; i\ @@ -2134,8 +2147,6 @@ function setClassType(){
\
' }); - - },'json'); } @@ -2209,12 +2220,53 @@ function editClassType(id,name){ } +function moveClassTYpe(){ + $.post('/site/get_site_types',function(rdata){ + var option = ''; + for (var i = 0; i'+rdata[i]['name']+''; + } + layer.open({ + type: 1, + area: '350px', + title: '设置站点分类', + closeBtn: 2, + shift: 0, + content: '
\ +
\ +
默认站点\ +
\ + \ +
\ +
\ +
\ +
\ +
' + }); + },'json'); +} - - - - +function setSizeClassType(){ + var data = {}; + data['id'] = $('select[name=type_id]').val(); + var ids = []; + $('table').find('td').find('input').each(function(i,obj){ + checked = $(this).prop('checked'); + if (checked) { + ids.push($(this).val()); + } + }); + data['site_ids'] = JSON.stringify(ids); + $.post('/site/set_site_type',data, function(rdata){ + showMsg(rdata.msg,function(){ + if (rdata.status){ + layer.closeAll(); + } + },{icon:rdata.status?1:2}); + },'json'); +} diff --git a/route/templates/default/site.html b/route/templates/default/site.html index cc40cb317..a1f4e2873 100755 --- a/route/templates/default/site.html +++ b/route/templates/default/site.html @@ -23,16 +23,12 @@ - - + + -
- +
-