提交 ed0f806f 编写于 作者: H hjdhnx

增加了检测升级如果反向升级的错误提示

上级 f2ef5244
...@@ -67,8 +67,8 @@ def admin_get_ver(): ...@@ -67,8 +67,8 @@ def admin_get_ver():
if not verfy_token(): if not verfy_token():
# return render_template('login.html') # return render_template('login.html')
return R.error('请登录后再试') return R.error('请登录后再试')
online_ver,msg = getOnlineVer()
return jsonify({'local_ver':getLocalVer(),'online_ver':getOnlineVer()}) return jsonify({'local_ver':getLocalVer(),'online_ver':online_ver,'msg':msg})
@admin.route('/update_ver') @admin.route('/update_ver')
def admin_update_ver(): def admin_update_ver():
......
3.3.5 3.4.0
\ No newline at end of file \ No newline at end of file
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
alert(data.msg); alert(data.msg);
return false return false
}else{ }else{
if(data.local_ver && data.online_ver){ if(data.local_ver && data.online_ver && !data.msg){
if(data.local_ver !== data.online_ver){ if(data.local_ver !== data.online_ver){
msg = `本地版本:${data.local_ver}\n线上版本:${data.online_ver}\n是否立即执行升级?`; msg = `本地版本:${data.local_ver}\n线上版本:${data.online_ver}\n是否立即执行升级?`;
if(confirm(msg)){ if(confirm(msg)){
...@@ -52,6 +52,8 @@ ...@@ -52,6 +52,8 @@
}else{ }else{
alert('已经是最新版,无需升级!') alert('已经是最新版,无需升级!')
} }
}else if(data.msg){
alert('检测升级疑似发生了问题:\n'+data.msg);
}else{ }else{
alert('已经是最新版,无需升级!') alert('已经是最新版,无需升级!')
} }
......
...@@ -32,17 +32,19 @@ def getLocalVer(): ...@@ -32,17 +32,19 @@ def getLocalVer():
def getOnlineVer(): def getOnlineVer():
ver = '1.0.1' ver = '1.0.1'
msg = ''
try: try:
r = requests.get('https://gitcode.net/qq_32394351/dr_py/-/raw/master/js/version.txt',timeout=(2,2)) r = requests.get('https://gitcode.net/qq_32394351/dr_py/-/raw/master/js/version.txt',timeout=(2,2))
ver = r.text ver = r.text
except Exception as e: except Exception as e:
# print(f'{e}') # print(f'{e}')
logger.info(f'{e}') msg = f'{e}'
return ver logger.info(msg)
return ver,msg
def checkUpdate(): def checkUpdate():
local_ver = getLocalVer() local_ver = getLocalVer()
online_ver = getOnlineVer() online_ver,msg = getOnlineVer()
if local_ver != online_ver: if local_ver != online_ver:
return True return True
return False return False
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册