From 14c35dd380a8807f68b4489ebf2052ac2a194d8c Mon Sep 17 00:00:00 2001 From: midoks Date: Wed, 15 Jul 2020 11:36:30 +0800 Subject: [PATCH] up --- class/core/system_api.py | 7 ++++--- requirements.txt | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/class/core/system_api.py b/class/core/system_api.py index b1ac395ed..78cde7c93 100755 --- a/class/core/system_api.py +++ b/class/core/system_api.py @@ -12,6 +12,7 @@ from flask import request import db import mw +import requests import config_api @@ -619,8 +620,9 @@ class system_api: def getServerInfo(self): upAddr = 'https://raw.githubusercontent.com/midoks/mdserver-web/master/version/info.json' try: - version = mw.httpGet(upAddr) - version = json.loads(version) + requests.adapters.DEFAULT_RETRIES = 2 + r = requests.get(upAddr, verify=False) + version = json.loads(r.content) return version[0] except Exception as e: print 'getServerInfo', e @@ -640,7 +642,6 @@ class system_api: diff = self.versionDiff( version_now, version_new_info['version']) - print diff if diff == 'new': return mw.returnJson(True, '有新版本!', version_new_info['version']) elif diff == 'test': diff --git a/requirements.txt b/requirements.txt index c6cd2cd41..f3ce0cb11 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,6 +14,7 @@ psutil pillow chardet flask-sqlalchemy +requests ConfigParser MySQL-python==1.2.5 # pytest-shutil \ No newline at end of file