From 512f87950a7610ea4046ed95110a9f4d82ca3ace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E4=BA=8C=E7=8C=9B?= Date: Mon, 22 Jul 2019 10:42:12 +0800 Subject: [PATCH] =?UTF-8?q?U=20-=20=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spug_api/apps/account/user.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/spug_api/apps/account/user.py b/spug_api/apps/account/user.py index bac1b70..3faddfd 100644 --- a/spug_api/apps/account/user.py +++ b/spug_api/apps/account/user.py @@ -27,12 +27,12 @@ def get(): users = [] now_time = datetime.now() for item in user.limit(form.pagesize).offset((form.page - 1) * form.pagesize).all(): - item = item.to_json() - if item['token_expired']: - item['last_login'] = human_diff_time(now_time, datetime.fromtimestamp(item['token_expired'] - 8 * 60 * 60)) + '前' + data = item.to_json(excludes=('password_hash', 'access_token', 'token_expired')) + if item.token_expired: + data['last_login'] = human_diff_time(now_time, datetime.fromtimestamp(item.token_expired - 8 * 60 * 60)) + '前' else: - item['last_login'] = '从未登录' - users.append(item) + data['last_login'] = '从未登录' + users.append(data) return json_response({'data': users, 'total': total}) return json_response(message=error) @@ -125,7 +125,8 @@ def login(): if user.is_active: if user.verify_password(form.password): login_limit.pop(form.username, None) - token = uuid.uuid4().hex + # token = uuid.uuid4().hex + token = user.access_token user.access_token = token user.token_expired = time.time() + 8 * 60 * 60 user.save()