From 5517bfe1dbea7362effc8f126f396e1ff7a4072e Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 19 Apr 2019 23:18:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4=E5=9C=B0?= =?UTF-8?q?=E5=9D=80-DONE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- class/core/site_api.py | 51 +++++++++++++++++++++++++++++++++++++++++------- data/defaultSite.pl | 1 + route/static/app/site.js | 30 ++++++++++++++-------------- 3 files changed, 60 insertions(+), 22 deletions(-) create mode 100644 data/defaultSite.pl diff --git a/class/core/site_api.py b/class/core/site_api.py index 286d68a30..a716a2f1a 100755 --- a/class/core/site_api.py +++ b/class/core/site_api.py @@ -81,6 +81,41 @@ class site_api: _ret['page'] = public.getPage(_page) return public.getJson(_ret) + def setDefaultSiteApi(self): + name = request.form.get('name', '').encode('utf-8') + import time + # 清理旧的 + defaultSite = public.readFile('data/defaultSite.pl') + if defaultSite: + path = self.getHostConf(defaultSite) + if os.path.exists(path): + conf = public.readFile(path) + rep = "listen\s+80.+;" + conf = re.sub(rep, 'listen 80;', conf, 1) + rep = "listen\s+443.+;" + conf = re.sub(rep, 'listen 443 ssl;', conf, 1) + public.writeFile(path, conf) + + path = self.getHostConf(name) + if os.path.exists(path): + conf = public.readFile(path) + rep = "listen\s+80\s*;" + conf = re.sub(rep, 'listen 80 default_server;', conf, 1) + rep = "listen\s+443\s*ssl\s*\w*\s*;" + conf = re.sub(rep, 'listen 443 ssl default_server;', conf, 1) + public.writeFile(path, conf) + + public.writeFile('data/defaultSite.pl', name) + public.restartWeb() + return public.returnJson(True, '设置成功!') + + def getDefaultSiteApi(self): + data = {} + data['sites'] = public.M('sites').field( + 'name').order('id desc').select() + data['defaultSite'] = public.readFile('data/defaultSite.pl') + return public.getJson(data) + def setPsApi(self): mid = request.form.get('id', '').encode('utf-8') ps = request.form.get('ps', '').encode('utf-8') @@ -665,11 +700,11 @@ class site_api: # if conf.find('ssl_certificate') == -1: # return public.returnJson(False, '当前未开启SSL') to = """#error_page 404/404.html; - #HTTP_TO_HTTPS_START + # HTTP_TO_HTTPS_START if ($server_port !~ 443){ rewrite ^(/.*)$ https://$host$1 permanent; } - #HTTP_TO_HTTPS_END""" + # HTTP_TO_HTTPS_END""" conf = conf.replace('#error_page 404/404.html;', to) public.writeFile(file, conf) @@ -1182,13 +1217,15 @@ class site_api: stype = request.form.get('type', '0').strip().encode('utf-8') vlist = [] vlist.append('') - vlist.append(public.getServerDir()+'/openresty/nginx/html/index.html') - vlist.append(public.getServerDir()+'/openresty/nginx/html/404.html') - vlist.append(public.getServerDir()+'/openresty/nginx/html/index.html') - vlist.append(public.getServerDir()+'/web_conf/stop/index.html') + vlist.append(public.getServerDir() + + '/openresty/nginx/html/index.html') + vlist.append(public.getServerDir() + '/openresty/nginx/html/404.html') + vlist.append(public.getServerDir() + + '/openresty/nginx/html/index.html') + vlist.append(public.getServerDir() + '/web_conf/stop/index.html') data = {} data['path'] = vlist[int(stype)] - return public.returnJson(True, 'ok', data) + return public.returnJson(True, 'ok', data) def addSiteTypeApi(self): name = request.form.get('name', '').strip().encode('utf-8') diff --git a/data/defaultSite.pl b/data/defaultSite.pl new file mode 100644 index 000000000..26ba64bc4 --- /dev/null +++ b/data/defaultSite.pl @@ -0,0 +1 @@ +t2.cachecha.com \ No newline at end of file diff --git a/route/static/app/site.js b/route/static/app/site.js index b1e9ea4a0..92cfa1d83 100755 --- a/route/static/app/site.js +++ b/route/static/app/site.js @@ -920,20 +920,20 @@ function setIndex(id){ } //设置默认站点 -function SetDefaultSite(){ +function setDefaultSite(){ var name = $("#defaultSite").val(); - var loadT = layer.msg(lan.public.the,{icon:16,time:0,shade: [0.3, '#000']}); - $.post('/site?action=SetDefaultSite','name='+name,function(rdata){ + var loadT = layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']}); + $.post('/site/set_default_site','name='+name,function(rdata){ layer.closeAll(); layer.msg(rdata.msg,{icon:rdata.status?1:5}); - }); + },'json'); } //默认站点 -function GetDefaultSite(){ - $.post('/site?action=GetDefaultSite','',function(rdata){ - var opt = ''; +function getDefaultSite(){ + $.post('/site/get_default_site','',function(rdata){ + var opt = ''; var selected = ''; for(var i=0;i\

\ - '+lan.site.default_site+'\ + 默认站点\ \

\ \
\ - \ - \ + \ + \
\ ' }); - }); + },'json'); } function setIndexList(id){