From 2ec60bf8b25e5580496bbabc195db936725bbc46 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Mon, 17 Dec 2018 17:21:33 +0800 Subject: [PATCH] update --- class/core/site_api.py | 14 ++++++++++---- route/site.py | 6 ++---- static/app/site.js | 30 ++++++++++++++++++------------ templates/default/site.html | 17 +++++++++-------- 4 files changed, 39 insertions(+), 28 deletions(-) diff --git a/class/core/site_api.py b/class/core/site_api.py index 9bb95fb66..31680fa7f 100755 --- a/class/core/site_api.py +++ b/class/core/site_api.py @@ -11,6 +11,12 @@ import pwd class site_api: + siteName = None # 网站名称 + sitePath = None # 根目录 + sitePort = None # 端口 + phpVersion = None # PHP版本 + setupPath = None # 安装路径 + isWriteLogs = None # 是否写日志 def __init__(self): pass @@ -85,9 +91,9 @@ class site_api: return public.getJson(data) - def add(self, webname, ps, path, version): + def add(self, webname, port, ps, path, version): - self.siteMenu = json.loads(webname) + siteMenu = json.loads(webname) self.siteName = self.toPunycode( siteMenu['domain'].strip().split(':')[0]).strip() self.sitePath = self.toPunycodePath( @@ -95,8 +101,8 @@ class site_api: self.sitePort = port.strip().replace(' ', '') # 写入数据库 - # pid = public.M('sites').add('name,path,status,ps,addtime', - # (self.siteName, self.sitePath, '1', ps, '')) + pid = public.M('sites').add('name,path,status,ps,addtime', + (self.siteName, self.sitePath, '1', ps, '')) # public.M('domain').add('pid,name,port,addtime', # (get.pid, self.siteName, self.sitePort, public.getDate())) diff --git a/route/site.py b/route/site.py index 5d8349a32..3a8c82b7e 100644 --- a/route/site.py +++ b/route/site.py @@ -33,11 +33,9 @@ def getPhpVersion(): @site.route('add', methods=['POST']) def add(): - webname = request.form.get('webname', '').encode('utf-8') + webname = request.form.get('webinfo', '').encode('utf-8') ps = request.form.get('ps', '').encode('utf-8') path = request.form.get('path', '').encode('utf-8') version = request.form.get('version', '').encode('utf-8') port = request.form.get('port', '').encode('utf-8') - webname = request.form.get('webname', '').encode('utf-8') - print webname - return site_api.site_api().add(webname, ps, path, version) + return site_api.site_api().add(webname, port, ps, path, version) diff --git a/static/app/site.js b/static/app/site.js index a3d49e107..2d406c6db 100755 --- a/static/app/site.js +++ b/static/app/site.js @@ -19,8 +19,8 @@ function getWeb(page, search) { $.post(sUrl, pdata, function(data) { layer.close(loadT); //构造数据列表 - var Body = ''; - $("#webBody").html(Body); + var body = ''; + $("#webBody").html(body); for (var i = 0; i < data.data.length; i++) { //当前站点状态 if (data.data[i].status == lan.site.running || data.data[i].status == '1') { @@ -40,22 +40,28 @@ function getWeb(page, search) { //表格主体 var shortwebname = data.data[i].name; var shortpath = data.data[i].path; - if(data.data[i].name.length > 30) shortwebname = data.data[i].name.substring(0, 30) + "..."; - if(data.data[i].path.length > 30) shortpath = data.data[i].path.substring(0, 30) + "..."; + if(data.data[i].name.length > 30) { + shortwebname = data.data[i].name.substring(0, 30) + "..."; + } + if(data.data[i].path.length > 30){ + shortpath = data.data[i].path.substring(0, 30) + "..."; + } + var idname = data.data[i].name.replace(/\./g,'_'); - Body = "\ + body = "\ " + shortwebname + "\ " + status + "\ " + backup + "\ " + shortpath + "\ " + web_end_time + "\ " + data.data[i].ps + "\ + \ \ "+lan.site.set+" \ | "+lan.public.del+"\ " - $("#webBody").append(Body); + $("#webBody").append(body); //setEdate(data.data[i].id,data.data[i].edate); //设置到期日期 function getDate(a) { @@ -93,10 +99,10 @@ function getWeb(page, search) { this.click(); }); } - if(Body.length < 10){ - Body = ""+lan.site.site_no_data+""; + if(body.length < 10){ + body = ""+lan.site.site_no_data+""; $(".dataTables_paginate").hide(); - $("#webBody").html(Body); + $("#webBody").html(body); } //输出数据列表 $(".btn-more").hover(function(){ @@ -119,8 +125,6 @@ function getWeb(page, search) { },'json'); } - - //添加站点 function webAdd(type) { if (type == 1) { @@ -146,7 +150,9 @@ function webAdd(type) { domainlist = domainlist.substring(0,domainlist.length-1);//子域名json domain ='{"domain":"'+domain[0]+'","domainlist":['+domainlist+'],"count":'+domain.length+'}';//拼接joson var loadT = layer.msg(lan.public.the_get,{icon:16,time:0,shade: [0.3, "#000"]}) - var data = $("#addweb").serialize()+"&port="+webport+"&webname="+domain; + var data = $("#addweb").serialize()+"&port="+webport+"&webinfo="+domain; + + console.log(data); $.post('/site/add', data, function(ret) { if(ret.status === false){ diff --git a/templates/default/site.html b/templates/default/site.html index 67cd0904c..d82e55663 100755 --- a/templates/default/site.html +++ b/templates/default/site.html @@ -54,12 +54,13 @@ - - - - + + + + + {% endblock %} \ No newline at end of file