|
@@ -282,14 +282,10 @@ async def register(request: util.models.register_req):
|
|
|
user_obj = first(db.query('SELECT * FROM users where username ="'+str(request.username)+'"'))
|
|
|
|
|
|
if user_obj == None:
|
|
|
- reg_model = util.models.register_addition()
|
|
|
- reg_model.username = request.username
|
|
|
- reg_model.email = request.email
|
|
|
- reg_model.password =request.password
|
|
|
- reg_model.left_time = 60
|
|
|
-
|
|
|
- id = user_register(reg_model)
|
|
|
|
|
|
+ id = user_register(request)
|
|
|
+ udata = dict(id=id, left_time=60)
|
|
|
+ db['users'].update(udata, ['id'])
|
|
|
result = util.user.add_to_basic_role(id)
|
|
|
print(result)
|
|
|
if type(id) is int:
|
|
@@ -317,6 +313,8 @@ async def register_by_invite(request: util.models.register_invite_req):
|
|
|
request.invite_code = sha.hexdigest()
|
|
|
id = user_register(request)
|
|
|
result = util.user.add_to_basic_role(id)
|
|
|
+ udata = dict(id=id, left_time=60)
|
|
|
+ db['users'].update(udata, ['id'])
|
|
|
if type(id) is int:
|
|
|
code = str(time.time()).replace('.','')
|
|
|
db['register_veri_code'].insert({'code':code,'user_id':id})
|