github
/
spug
mirror of https://github.com/openspug/spug
1
0
Fork 0
Code Issues Releases Wiki Activity

U - 优化用户接口返回的数据

pull/15/head
雷二猛 2019-07-22 10:42:12 +08:00
parent 2561d821c9
commit 512f87950a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spug_api/apps/account/user.py
View File

@ -27,12 +27,12 @@ def get():
users = [] users = []
now_time = datetime.now() now_time = datetime.now()
for item in user.limit(form.pagesize).offset((form.page - 1) * form.pagesize).all(): for item in user.limit(form.pagesize).offset((form.page - 1) * form.pagesize).all():
item = item.to_json() data = item.to_json(excludes=('password_hash', 'access_token', 'token_expired'))
if item['token_expired']: if item.token_expired:
item['last_login'] = human_diff_time(now_time, datetime.fromtimestamp(item['token_expired'] - 8 * 60 * 60)) + '前' data['last_login'] = human_diff_time(now_time, datetime.fromtimestamp(item.token_expired - 8 * 60 * 60)) + '前'
else: else:
item['last_login'] = '从未登录' data['last_login'] = '从未登录'
users.append(item) users.append(data)
return json_response({'data': users, 'total': total}) return json_response({'data': users, 'total': total})
return json_response(message=error) return json_response(message=error)
@ -125,7 +125,8 @@ def login():
if user.is_active: if user.is_active:
if user.verify_password(form.password): if user.verify_password(form.password):
login_limit.pop(form.username, None) login_limit.pop(form.username, None)
token = uuid.uuid4().hex # token = uuid.uuid4().hex
token = user.access_token
user.access_token = token user.access_token = token
user.token_expired = time.time() + 8 * 60 * 60 user.token_expired = time.time() + 8 * 60 * 60
user.save() user.save()