This commit is contained in:
parent
3a850a31a1
commit
3979820eae
|
|
@ -28,7 +28,7 @@ from flask import request
|
|||
|
||||
class config_api:
|
||||
|
||||
__version = '0.16.2.3'
|
||||
__version = '0.16.2.4'
|
||||
__api_addr = 'data/api.json'
|
||||
|
||||
def __init__(self):
|
||||
|
|
@ -936,13 +936,6 @@ class config_api:
|
|||
sformat = 'date +"%Y-%m-%d %H:%M:%S %Z %z"'
|
||||
data['systemdate'] = mw.execShell(sformat)[0].strip()
|
||||
|
||||
# 获取时区
|
||||
import datetime
|
||||
import pytz
|
||||
now = datetime.datetime.now()
|
||||
tz_name = now.astimezone().tzinfo
|
||||
data['systemdatezone'] = tz_name
|
||||
|
||||
data['port'] = mw.getHostPort()
|
||||
data['ip'] = mw.getHostAddr()
|
||||
|
||||
|
|
|
|||
|
|
@ -338,16 +338,6 @@ function setUserName(a) {
|
|||
})
|
||||
}
|
||||
|
||||
|
||||
function syncDate(){
|
||||
var loadT = layer.msg('正在同步时间...',{icon:16,time:0,shade: [0.3, '#000']});
|
||||
$.post('/config/sync_date','',function(rdata){
|
||||
layer.close(loadT);
|
||||
layer.msg(rdata.msg,{icon:rdata.status?1:2});
|
||||
setTimeout(function(){window.location.reload();},1500);
|
||||
},'json');
|
||||
}
|
||||
|
||||
function setTimezone(){
|
||||
layer.open({
|
||||
type: 1,
|
||||
|
|
@ -356,7 +346,7 @@ function setTimezone(){
|
|||
closeBtn: 1,
|
||||
shift: 5,
|
||||
shadeClose: false,
|
||||
btn:["确定","取消"],
|
||||
btn:["确定","取消","同步"],
|
||||
content: "<div class='bt-form pd20'>\
|
||||
<div class='line'>\
|
||||
<span class='tname'>时区</span>\
|
||||
|
|
@ -366,26 +356,14 @@ function setTimezone(){
|
|||
</div>\
|
||||
</div>",
|
||||
success:function(){
|
||||
|
||||
var tbody = '';
|
||||
$.post('/config/get_timezone_list', {}, function (rdata) {
|
||||
|
||||
for (var i = 0; i < rdata.length; i++) {
|
||||
tbody += '<option value="'+rdata[i]+'">'+rdata[i]+'</option>';
|
||||
}
|
||||
$('select[name="timezone"]').append(tbody);
|
||||
|
||||
},'json');
|
||||
|
||||
// for(i in msg_list){
|
||||
// if (msg_list[i]['code'] == ''){
|
||||
// tbody += '<option value="'+msg_list[i]['code']+'" selected>'+msg_list[i]['msg']+'</option>';
|
||||
// } else{
|
||||
// tbody += '<option value="'+msg_list[i]['code']+'">'+msg_list[i]['msg']+'</option>';
|
||||
// }
|
||||
// }
|
||||
|
||||
},
|
||||
},
|
||||
yes:function(index){
|
||||
var loadT = layer.msg("正在设置时区...", { icon: 16, time: 0, shade: [0.3, '#000'] });
|
||||
var timezone = $('select[name="timezone"]').val();
|
||||
|
|
@ -396,6 +374,14 @@ function setTimezone(){
|
|||
location.reload();
|
||||
},{ icon: rdata.status ? 1 : 2 }, 2000);
|
||||
},'json');
|
||||
},
|
||||
btn3:function(){
|
||||
var loadT = layer.msg('正在同步时间...',{icon:16,time:0,shade: [0.3, '#000']});
|
||||
$.post('/config/sync_date','',function(rdata){
|
||||
layer.close(loadT);
|
||||
layer.msg(rdata.msg,{icon:rdata.status?1:2});
|
||||
setTimeout(function(){window.location.reload();},1500);
|
||||
},'json');
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -83,15 +83,8 @@
|
|||
<p class="mtb15">
|
||||
<span class="set-tit text-right" title="服务器时间">服务器时间</span>
|
||||
<input id="systemdate" name="systemdate" class="inputtxt bt-input-text disable" type="text" value="{{data['systemdate']}}">
|
||||
<button type="button" class="btn btn-success btn-sm ml5" onclick="syncDate()">同步</button>
|
||||
<span class="set-info c7">同步当前服务器时间</span>
|
||||
</p>
|
||||
|
||||
<p class="mtb15">
|
||||
<span class="set-tit text-right" title="服务器时间">服务器时区</span>
|
||||
<input id="systemdatezone" name="systemdatezone" class="inputtxt bt-input-text disable" type="text" value="{{data['systemdatezone']}}">
|
||||
<button type="button" class="btn btn-success btn-sm ml5" onclick="setTimezone()">设置</button>
|
||||
<span class="set-info c7">设置当前服务器时区</span>
|
||||
<span class="set-info c7">同步当前服务器时间</span>
|
||||
</p>
|
||||
<p class="mtb15">
|
||||
<span class="set-tit text-right" title="面板用户">面板用户</span>
|
||||
|
|
|
|||
Loading…
Reference in New Issue