midoks
/
mdserver-web
mirror of https://github.com/midoks/mdserver-web
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

u

Browse Source
pull/109/head
Mr Chen 6 years ago
parent 28fc507522
commit d448ebfbdb
2 changed files with 25 additions and 36 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 11
      class/core/site_api.py
  2. 50
      route/static/app/site.js

11
class/core/site_api.py
Unescape View File

@ -55,6 +55,11 @@ class site_api:
start = (int(p) - 1) * (int(limit)) start = (int(p) - 1) * (int(limit))
_list = public.M('sites').where('', ()).field('id,name,path,status,ps,addtime,edate').limit( _list = public.M('sites').where('', ()).field('id,name,path,status,ps,addtime,edate').limit(
(str(start)) + ',' + limit).order('id desc').select() (str(start)) + ',' + limit).order('id desc').select()
for i in range(len(_list)):
_list[i]['backup_count'] = public.M('backup').where(
"pid=? AND type=?", (_list[i]['id'], 0)).count()
_ret = {} _ret = {}
_ret['data'] = _list _ret['data'] = _list
@ -84,7 +89,7 @@ class site_api:
"id,name,path,status,ps,addtime,edate").find() "id,name,path,status,ps,addtime,edate").find()
start = (int(p) - 1) * (int(limit)) start = (int(p) - 1) * (int(limit))
_list = public.M('backup').where('type=?', (mid,)).field('id,type,name,pid,filename,size,addtime').limit( _list = public.M('backup').where('pid=?', (mid,)).field('id,type,name,pid,filename,size,addtime').limit(
(str(start)) + ',' + limit).order('id desc').select() (str(start)) + ',' + limit).order('id desc').select()
_ret = {} _ret = {}
_ret['data'] = _list _ret['data'] = _list
@ -113,14 +118,14 @@ class site_api:
execStr = "cd '" + find['path'] + "' && zip '" + \ execStr = "cd '" + find['path'] + "' && zip '" + \
zipName + "' -r ./* > " + tmps + " 2>&1" zipName + "' -r ./* > " + tmps + " 2>&1"
# print execStr # print execStr
# print public.execShell(execStr) public.execShell(execStr)
if os.path.exists(zipName): if os.path.exists(zipName):
fsize = os.path.getsize(zipName) fsize = os.path.getsize(zipName)
else: else:
fsize = 0 fsize = 0
sql = public.M('backup').add('type,name,pid,filename,size,addtime', sql = public.M('backup').add('type,name,pid,filename,size,addtime',
(mid, fileName, find['id'], zipName, fsize, public.getDate())) (0, fileName, find['id'], zipName, fsize, public.getDate()))
msg = public.getInfo('备份网站[{1}]成功!', (find['name'],)) msg = public.getInfo('备份网站[{1}]成功!', (find['name'],))
public.writeLog('网站管理', msg) public.writeLog('网站管理', msg)

50
route/static/app/site.js
Unescape View File

@ -597,14 +597,18 @@ function domainEdit(id, name, msg, status) {
var echoHtml = ""; var echoHtml = "";
for (var i = 0; i < domain.length; i++) { for (var i = 0; i < domain.length; i++) {
echoHtml += "<tr><td><a title='"+lan.site.click_access+"' target='_blank' href='http://" + domain[i].name + ":" + domain[i].port + "' class='btlinkbed'>" + domain[i].name + "</a></td><td><a class='btlinkbed'>" + domain[i].port + "</a></td><td class='text-center'><a class='table-btn-del' href='javascript:;' onclick=\"delDomain(" + id + ",'" + name + "','" + domain[i].name + "','" + domain[i].port + "',1)\"><span class='glyphicon glyphicon-trash'></span></a></td></tr>"; echoHtml += "<tr>\
<td><a title='"+lan.site.click_access+"' target='_blank' href='http://" + domain[i].name + ":" + domain[i].port + "' class='btlinkbed'>" + domain[i].name + "</a></td>\
<td><a class='btlinkbed'>" + domain[i].port + "</a></td>\
<td class='text-center'><a class='table-btn-del' href='javascript:;' onclick=\"delDomain(" + id + ",'" + name + "','" + domain[i].name + "','" + domain[i].port + "',1)\"><span class='glyphicon glyphicon-trash'></span></a></td>\
</tr>";
} }
var bodyHtml = "<textarea id='newdomain' class='bt-input-text' style='height: 100px; width: 340px;padding:5px 10px;line-height:20px'></textarea>\ var bodyHtml = "<textarea id='newdomain' class='bt-input-text' style='height: 100px; width: 340px;padding:5px 10px;line-height:20px'></textarea>\
<input type='hidden' id='newport' value='80' />\ <input type='hidden' id='newport' value='80' />\
<button type='button' class='btn btn-success btn-sm pull-right' style='margin:30px 35px 0 0' onclick=\"domainAdd(" + id + ",'" + name + "',1)\">"+lan.public.add+"</button>\ <button type='button' class='btn btn-success btn-sm pull-right' style='margin:30px 35px 0 0' onclick=\"domainAdd(" + id + ",'" + name + "',1)\">添加</button>\
<div class='divtable mtb15' style='height:350px;overflow:auto'>\ <div class='divtable mtb15' style='height:350px;overflow:auto'>\
<table class='table table-hover' width='100%'>\ <table class='table table-hover' width='100%'>\
<thead><tr><th>"+lan.site.domain+"</th><th width='70px'>"+lan.site.port+"</th><th width='50px' class='text-center'>"+lan.site.operate+"</th></tr></thead>\ <thead><tr><th>"+lan.site.domain+"</th><th width='70px'>端口</th><th width='50px' class='text-center'>操作</th></tr></thead>\
<tbody id='checkDomain'>" + echoHtml + "</tbody>\ <tbody id='checkDomain'>" + echoHtml + "</tbody>\
</table>\ </table>\
</div>"; </div>";
@ -612,7 +616,7 @@ function domainEdit(id, name, msg, status) {
if(msg != undefined){ if(msg != undefined){
layer.msg(msg,{icon:status?1:5}); layer.msg(msg,{icon:status?1:5});
} }
var placeholder = "<div class='placeholder c9' style='left:28px;width:330px;top:16px;'>"+lan.site.domain_help+"</div>"; var placeholder = "<div class='placeholder c9' style='left:28px;width:330px;top:16px;'>每行填写一个域名，默认为80端口<br>泛解析添加方法 *.domain.com<br>如另加端口格式为 www.domain.com:88</div>";
$('#newdomain').after(placeholder); $('#newdomain').after(placeholder);
$(".placeholder").click(function(){ $(".placeholder").click(function(){
$(this).hide(); $(this).hide();
@ -699,33 +703,7 @@ function checkDomain() {
var $this = $(this); var $this = $(this);
var domain = $(this).find("td:first-child").text(); var domain = $(this).find("td:first-child").text();
$(this).find("td:first-child").append("<i class='lading'></i>"); $(this).find("td:first-child").append("<i class='lading'></i>");
checkDomainWebsize($this,domain); });
})
}
//检查域名是否解析备案
function checkDomainWebsize(obj,domain){
var gurl = "http://api.bt.cn/ipaddess";
var ip = getCookie('iplist');
var data = "domain=" + domain+"&ip="+ip;
$.ajax({ url: gurl,data:data,type:"get",dataType:"jsonp",async:true ,success: function(rdata){
obj.find("td:first-child").find(".lading").remove();
if (rdata.code == -1) {
obj.find("td:first-child").append("<i class='yf' data-title='"+lan.site.this_domain_un+"'>"+lan.site.unresolved+"</i>");
} else {
obj.find("td:first-child").append("<i class='f' data-title='"+lan.site.analytic_ip+"：" + rdata.data.ip + "<br>"+lan.site.current_server_ip+"：" + rdata.data.main_ip + "("+lan.site.parsed_info+")'>"+lan.site.parsed+"</i>");
}
obj.find("i").mouseover(function() {
var tipsTitle = $(this).attr("data-title");
layer.tips(tipsTitle, this, {
tips: [1, '#3c8dbc'],
time: 0
})
})
obj.find("i").mouseout(function() {
$(".layui-layer-tips").remove();
})
}})
} }
/** /**
@ -1486,8 +1464,14 @@ function to301(siteName,type){
//文件验证 //文件验证
function file_check(){ function file_check(){
$(".check_message").html('<div style="margin-left:100px"><input type="checkbox" name="checkDomain" id="checkDomain" checked=""><label class="mr20" for="checkDomain" style="font-weight:normal">提前校验域名(提前发现问题,减少失败率)</label></div>'); $(".check_message").html('<div style="margin-left:100px">\
$("#lets_help").html('<li>'+lan.site.bt_ssl_help_5+'</li><li>'+lan.site.bt_ssl_help_8+'</li><li>'+lan.site.bt_ssl_help_9+'</li><li>在未指定SSL默认站点时,未开启SSL的站点使用HTTPS会直接访问到已开启SSL的站点</li>'); <input type="checkbox" name="checkDomain" id="checkDomain" checked="">\
<label class="mr20" for="checkDomain" style="font-weight:normal">提前校验域名(提前发现问题,减少失败率)</label>\
</div>');
$("#lets_help").html('<li>申请之前，请确保域名已解析，如未解析会导致审核失败</li>\
<li>Let\'s Encrypt免费证书，有效期3个月，支持多域名。默认会自动续签</li>\
<li>若您的站点使用了CDN或301重定向会导致续签失败</li>\
<li>在未指定SSL默认站点时,未开启SSL的站点使用HTTPS会直接访问到已开启SSL的站点</li>');
} }
dnsapis = {}; dnsapis = {};

Write Preview
Loading…
Cancel
Save