From 2f258d3e1c0d426859cb03694e469e18983ae260 Mon Sep 17 00:00:00 2001 From: jonnyan404 <475634114@qq.com> Date: Fri, 2 Apr 2021 17:50:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app_admin/views.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app_admin/views.py b/app_admin/views.py index 47fd821..4aa31cd 100644 --- a/app_admin/views.py +++ b/app_admin/views.py @@ -931,9 +931,15 @@ def admin_setting(request): # 检测版本更新 def check_update(request): - url = 'https://gitee.com/api/v5/repos/zmister/MrDoc/tags' - resp = requests.get(url,timeout=5).json() - return JsonResponse({'status':True,'data':resp[-1]}) + url = ['https://gitee.com/api/v5/repos/zmister/MrDoc/tags','https://api.github.com/repos/zmister2016/MrDoc/tags'] + resp1 = requests.get(url[0],timeout=5) + resp2 = requests.get(url[1],timeout=5) + if resp1.status_code == 200: + return JsonResponse({'status':True,'data':resp[-1]}) + elif resp2.status_code == 200: + return JsonResponse({'status':True,'data':resp[0]}) + else: + return JsonResponse({'status':True,'data':"{'name': 'v0.0.1'}"}) # 后台管理 From c102081379994b7838fadb50a5ffeeffb7c484db Mon Sep 17 00:00:00 2001 From: jonnyan404 <475634114@qq.com> Date: Fri, 2 Apr 2021 17:55:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app_admin/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app_admin/views.py b/app_admin/views.py index 4aa31cd..04db61f 100644 --- a/app_admin/views.py +++ b/app_admin/views.py @@ -939,7 +939,7 @@ def check_update(request): elif resp2.status_code == 200: return JsonResponse({'status':True,'data':resp[0]}) else: - return JsonResponse({'status':True,'data':"{'name': 'v0.0.1'}"}) + return JsonResponse({'status':True,'data':{'name': 'v0.0.1'}}) # 后台管理 From a7a0e9618815bc464459ce2fcad2fcd882e8e10a Mon Sep 17 00:00:00 2001 From: jonnyan404 <475634114@qq.com> Date: Fri, 2 Apr 2021 18:02:50 +0800 Subject: [PATCH 3/3] update app_admin/views.py. --- app_admin/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app_admin/views.py b/app_admin/views.py index 04db61f..9758f43 100644 --- a/app_admin/views.py +++ b/app_admin/views.py @@ -935,9 +935,9 @@ def check_update(request): resp1 = requests.get(url[0],timeout=5) resp2 = requests.get(url[1],timeout=5) if resp1.status_code == 200: - return JsonResponse({'status':True,'data':resp[-1]}) + return JsonResponse({'status':True,'data':resp.json()[-1]}) elif resp2.status_code == 200: - return JsonResponse({'status':True,'data':resp[0]}) + return JsonResponse({'status':True,'data':resp.json()[0]}) else: return JsonResponse({'status':True,'data':{'name': 'v0.0.1'}})