From 80acb7a95a38f00360bfb2322c33800034bbfc48 Mon Sep 17 00:00:00 2001 From: luoning Date: Fri, 2 Feb 2018 22:23:45 +0800 Subject: [PATCH] =?UTF-8?q?[x]=20=E5=A5=96=E5=93=81id=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/README.md | 3 ++- src/lottery.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/README.md b/doc/README.md index 64f1a11..c1ffb30 100644 --- a/doc/README.md +++ b/doc/README.md @@ -10,6 +10,7 @@ | /users | GET | | {"status": 200, "msg": "success", "data": [{"uid":uid, "name":name, "role":role}]} | 获取所有用户列表 | | /luckless_users | GET | | {"status": 200, "msg": "success", "data": [{"uid":uid, "name":name, "role":role}]} | 获取未中奖用户列表 | | /add_awards | POST | [{"award_name":string, "award_capacity":int}] | {"status": 200, "msg": "success", "data": None} | 添加新奖品 | +| /add_award | GET | award_name=string& award_capacity=int | {"status": 200, "msg": "success", "data": None} | 添加单个奖品 | | /award | GET | award_id=int | {"status": 200, "msg": "success", "data": {"award_id":award_id, "award_name":award_name, "award_capacity":award_capacity}} | 获取指定奖项信息 | | /awards | GET | | {"status": 200, "msg": "success", "data": [{"award_id":award_id, "award_name":award_name, "award_capacity":award_capacity}]} | 获取所有奖项列表 | | /reset | GET | | {"status": 200, "msg": "success", "data": None} | 重置所有数据 | @@ -30,7 +31,7 @@ | 字段值 | 字段类型 | 字段描述 | | -------------- | ------ | --------- | -| award_id | int | 奖项id | +| award_id | string | 奖项id | | award_name | string | 奖项名称 | | award_size | int | 剩余可抽取奖品数量 | | award_capacity | int | 奖品总数 | diff --git a/src/lottery.py b/src/lottery.py index ca21d44..0f1f5d7 100644 --- a/src/lottery.py +++ b/src/lottery.py @@ -4,6 +4,7 @@ import tinydb as d import os import time from . import CURRENT_DIR, random_selector, users_db +import uuid db = d.TinyDB(os.path.join(CURRENT_DIR, "lottery.db")) t_users = db.table('users') @@ -87,8 +88,8 @@ def revoke(uid): def add_awards(awards): t_awards.clear_cache() - for id, award in enumerate(awards): - t_awards.insert({'award_id': id, + for award in awards: + t_awards.insert({'award_id': uuid.uuid4().hex, 'award_name': award['award_name'], 'award_size': award['award_capacity'], 'award_capacity': award['award_capacity']})