diff --git a/controllers/admin.py b/controllers/admin.py index 6610954ed44c3e1f1c8bb96ec4614b0125be3c19..a40ca519ce75f84a34d06e13a31859ce48266d4b 100644 --- a/controllers/admin.py +++ b/controllers/admin.py @@ -67,8 +67,8 @@ def admin_get_ver(): if not verfy_token(): # return render_template('login.html') return R.error('请登录后再试') - - return jsonify({'local_ver':getLocalVer(),'online_ver':getOnlineVer()}) + online_ver,msg = getOnlineVer() + return jsonify({'local_ver':getLocalVer(),'online_ver':online_ver,'msg':msg}) @admin.route('/update_ver') def admin_update_ver(): diff --git a/js/version.txt b/js/version.txt index 0163af7e8633af23b9fa6e2b6ba05047510ae060..fbcbf7380658d02bca7addb53878f58b4c5d89db 100644 --- a/js/version.txt +++ b/js/version.txt @@ -1 +1 @@ -3.3.5 \ No newline at end of file +3.4.0 \ No newline at end of file diff --git a/templates/admin.html b/templates/admin.html index 8ca94d135e8129e14f947be25afa3232a3213e9c..74b0188b1ad3b3cafaf571e7f92912d71056bb5b 100644 --- a/templates/admin.html +++ b/templates/admin.html @@ -33,7 +33,7 @@ alert(data.msg); return false }else{ - if(data.local_ver && data.online_ver){ + if(data.local_ver && data.online_ver && !data.msg){ if(data.local_ver !== data.online_ver){ msg = `本地版本:${data.local_ver}\n线上版本:${data.online_ver}\n是否立即执行升级?`; if(confirm(msg)){ @@ -52,6 +52,8 @@ }else{ alert('已经是最新版,无需升级!') } + }else if(data.msg){ + alert('检测升级疑似发生了问题:\n'+data.msg); }else{ alert('已经是最新版,无需升级!') } diff --git a/utils/update.py b/utils/update.py index 385f9a35d2ddd9690e2cd4b356a723e05fb7e66e..4ae579a9bdbb171e96ccf6d9cf7a0141e13ab314 100644 --- a/utils/update.py +++ b/utils/update.py @@ -32,17 +32,19 @@ def getLocalVer(): def getOnlineVer(): ver = '1.0.1' + msg = '' try: r = requests.get('https://gitcode.net/qq_32394351/dr_py/-/raw/master/js/version.txt',timeout=(2,2)) ver = r.text except Exception as e: # print(f'{e}') - logger.info(f'{e}') - return ver + msg = f'{e}' + logger.info(msg) + return ver,msg def checkUpdate(): local_ver = getLocalVer() - online_ver = getOnlineVer() + online_ver,msg = getOnlineVer() if local_ver != online_ver: return True return False