From ee26d79b0e28e3b47567c5a4464c8c14122c0f9b Mon Sep 17 00:00:00 2001 From: midoks Date: Fri, 12 Nov 2021 19:29:01 +0800 Subject: [PATCH] up --- class/core/system_api.py | 9 ++++++--- setting.py | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/class/core/system_api.py b/class/core/system_api.py index 1bdf2d8e3..aa0ee0817 100755 --- a/class/core/system_api.py +++ b/class/core/system_api.py @@ -616,9 +616,12 @@ class system_api: def getServerInfo(self): upAddr = 'https://raw.githubusercontent.com/midoks/mdserver-web/master/version/info.json' try: - requests.adapters.DEFAULT_RETRIES = 2 - r = requests.get(upAddr, verify=False) - version = json.loads(r.content) + # requests.adapters.DEFAULT_RETRIES = 2 + # r = requests.get(upAddr, verify=False) + + req = urllib.request.urlopen(upAddr, timeout=timeout) + result = req.read().decode('utf-8') + version = json.loads(result) return version[0] except Exception as e: print('getServerInfo', e) diff --git a/setting.py b/setting.py index 15426d5ba..50a40a3d0 100755 --- a/setting.py +++ b/setting.py @@ -48,6 +48,6 @@ loglevel = 'info' errorlog = chdir + '/logs/error.log' accesslog = chdir + '/logs/access.log' pidfile = chdir + '/logs/mw.pid' -# if os.path.exists(os.getcwd() + '/data/ssl.pl'): -# certfile = 'ssl/certificate.pem' -# keyfile = 'ssl/privateKey.pem' +if os.path.exists(os.getcwd() + '/data/ssl.pl'): + certfile = 'ssl/certificate.pem' + keyfile = 'ssl/privateKey.pem'