pull/109/head
Mr Chen 7 years ago
parent cf742621c8
commit 6ac73a8d28
  1. 17
      class/core/system_api.py
  2. 3
      route/system.py
  3. 8
      static/js/index.js

@ -537,6 +537,7 @@ class system_api:
return ret
def getServerInfo(self):
upAddr = 'https://raw.githubusercontent.com/midoks/mdserver-web/master/version'
try:
version = public.httpGet(
@ -548,7 +549,7 @@ class system_api:
return {}
# 更新服务
def updateServer(self, stype):
def updateServer(self, stype, version=''):
try:
if not public.isRestart():
@ -579,7 +580,19 @@ class system_api:
return public.returnJson(True, '更新信息!', version_new_info)
if stype == 'update':
pass
if version == '':
return public.returnJson(False, '缺少版本信息!')
v_new_info = self.getServerInfo()
if v_new_info['version'] != version:
return public.returnJson(False, '更新失败,请重试!')
if not 'path' in v_new_info or v_new_info['path'] == '':
return public.returnJson(False, '下载地址不存在!')
public.downloadFile(
v_new_info['path'], 'mdserver-web.zip')
print v_new_info
return public.returnJson(False, '已经是最新,无需更新!')
except Exception as ex:

@ -26,7 +26,8 @@ def network():
@system.route("/update_server")
def updateServer():
stype = request.args.get('type', 'check')
data = system_api.system_api().updateServer(stype)
version = request.args.get('version', '')
data = system_api.system_api().updateServer(stype, version)
return data

@ -518,8 +518,8 @@ function updateMsg(){
content:'<div class="setchmod bt-form pd20 pb70">'
+'<p style="padding: 0 0 10px;line-height: 24px;">'+rdata.data.content+'</p>'
+'<div class="bt-form-submit-btn">'
+'<button type="button" class="btn btn-danger btn-sm btn-title" onclick="layer.closeAll()">'+lan.public.cancel+'</button>'
+'<button type="button" class="btn btn-success btn-sm btn-title" onclick="updateVersion(\''+rdata.version+'\')" >'+lan.index.update_go+'</button>'
+'<button type="button" class="btn btn-danger btn-sm btn-title" onclick="layer.closeAll()">取消</button>'
+'<button type="button" class="btn btn-success btn-sm btn-title" onclick="updateVersion(\''+rdata.data.version+'\')" >立即更新</button>'
+'</div>'
+'</div>'
});
@ -529,8 +529,8 @@ function updateMsg(){
//开始升级
function updateVersion(version) {
var loadT = layer.msg(lan.index.update_the, { icon: 16, time: 0, shade: [0.3, '#000'] });
$.get('/system/update_server?type=update', function(rdata) {
var loadT = layer.msg('正在升级面板..', { icon: 16, time: 0, shade: [0.3, '#000'] });
$.get('/system/update_server?type=update&version='+version, function(rdata) {
layer.closeAll();
if (rdata.status === false) {
layer.msg(rdata.msg, { icon: 5, time: 5000 });

Loading…
Cancel
Save