From e572a70dd68b872ec398d14402a7ce72ae206d50 Mon Sep 17 00:00:00 2001 From: Yuyang Wang Date: Mon, 7 May 2018 21:18:13 +0800 Subject: [PATCH] 3.0 (#5) --- src/service/plugins/ssrs_server/__init__.py | 23 ++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/service/plugins/ssrs_server/__init__.py b/src/service/plugins/ssrs_server/__init__.py index 65d49a3..0582963 100644 --- a/src/service/plugins/ssrs_server/__init__.py +++ b/src/service/plugins/ssrs_server/__init__.py @@ -31,6 +31,8 @@ def index(): print(pw) return flask.json.dumps({'code': -300, 'msg': 'password error'}) d = get_data() + if int(time.time() - d['last_time']) <= 60 * 5 and d['last'] and d['last'] != '': + return d['last'] ths = [] for key, value in d['SSR'].items(): ths.append(ResultThread(get, (value['url'],), name=key)) @@ -52,8 +54,9 @@ def index(): urls_list.extend(urls) ret = '\n'.join(urls_list) set_time() + d['last'] = base64.urlsafe_b64encode(ret.encode('utf-8')).decode().rstrip('=') save_data() - return base64.urlsafe_b64encode(ret.encode('utf-8')).decode().rstrip('=') + return d['last'] @blueprint.route('/reg', methods=['POST']) @@ -68,7 +71,7 @@ def reg(): if args.get('token', '') != conf.get('token', ''): return flask.json.dumps({'code': -101, 'msg': 'token error'}) add_ssr(args['server'], args['url']) - server(args['server']) + index() save_data() return flask.json.dumps({'code': 0, 'msg': ''}) except Exception as e: @@ -134,11 +137,14 @@ def get_data(): global data if data is None or type(data) is not dict: data = { - 'last_time': None, - 'SSR': {}, + 'last_time': 0, + 'last': '', + 'SSR': {} } - if 'last_time' not in data: - data['last_time'] = None + if 'last_time' not in data or data['last_time']: + data['last_time'] = 0 + if 'last' not in data: + data['last'] = '' if 'SSR' not in data or type(data['SSR']) is not dict: data['SSR'] = {} return data @@ -232,4 +238,7 @@ def get_result(self): return self.result def get_name(self): - return self.name \ No newline at end of file + return self.name + + +init()