Commit 04cfccce authored by xianyang's avatar xianyang

优化时间戳

parent 46acfc12
#encoding=utf-8 # encoding=utf-8
import random import random
from flask import request, g from flask import request, g
from src.app.api.rooms import api from src.app.api.rooms import api
from src.app.api.rooms.validaters import RoomAddFrom, RoomListFrom, RoomDeleteFrom, RoomCreateTokenFrom from src.app.api.rooms.validaters import RoomAddFrom, RoomListFrom, RoomDeleteFrom, RoomCreateTokenFrom
from src.libs.functions import result_format, GetRoomList, DeleteRoom, GetToken, CreateRoom, create_token from src.libs.functions import result_format, GetRoomList, DeleteRoom, GetToken, CreateRoom, create_token
from src.libs.log_utils import Logger
from src.modules.room import Room from src.modules.room import Room
...@@ -14,58 +14,60 @@ from src.modules.room import Room ...@@ -14,58 +14,60 @@ from src.modules.room import Room
def rome_add(): def rome_add():
"""新建房间""" """新建房间"""
form = RoomAddFrom().validate_() form = RoomAddFrom().validate_()
token_list=[] Logger().logger.info(f"新建房间参数;{form.data}")
user_ids=form.user_ids.data token_list = []
names=form.name.data user_ids = form.user_ids.data
user_ids = user_ids.split(',')
names = form.name.data
RoomId = ''.join([str(random.randint(0, 999)).zfill(3) for _ in range(2)]) RoomId = ''.join([str(random.randint(0, 999)).zfill(3) for _ in range(2)])
if isinstance(user_ids,list): if isinstance(user_ids, list):
token = create_token(names,'') token = create_token(names, '')
for name in range(len(user_ids)): for name in range(len(user_ids)):
item = {} item = {}
token = GetToken(names,user_ids[name]) token = GetToken(names, user_ids[name])
CreateRoom(token,user_ids[name],form.max_participants.data,form.empty_timeout.data,user_ids[name]) CreateRoom(token, user_ids[name], form.max_participants.data, form.empty_timeout.data, user_ids[name])
# item['Name']=names # item['Name']=names
item['RoomToken']=token item['RoomToken'] = token
item['UserId']=user_ids[name] item['UserId'] = user_ids[name]
token_list.append(item) token_list.append(item)
form.name.data=user_ids[name] form.name.data = user_ids[name]
Room().set_attrs(form.data).direct_commit_() Room().set_attrs(form.data).direct_commit_()
else: else:
token = GetToken(names,user_ids) token = GetToken(names, user_ids)
item = {} item = {}
# item['Name'] = form.data.get('name') # item['Name'] = form.data.get('name')
item['RoomToken'] = token item['RoomToken'] = token
item['UserId'] = user_ids item['UserId'] = user_ids
token_list.append(item) token_list.append(item)
CreateRoom(token,form.name.data,form.max_participants.data,form.empty_timeout.data,form.user_ids.data) CreateRoom(token, form.name.data, form.max_participants.data, form.empty_timeout.data, form.user_ids.data)
return result_format(code=200,sign=token,data=token_list,roomid=RoomId,name=names) Room().set_attrs(form.data).direct_commit_()
return result_format(code=200, sign=token, data=token_list, roomid=RoomId, name=names)
@api.route('/gettoken', methods=['POST']) @api.route('/gettoken', methods=['POST'])
def get_token(): def get_token():
"""生成token""" """生成token"""
form = RoomCreateTokenFrom().validate_() form = RoomCreateTokenFrom().validate_()
token =GetToken(form.name.data,form.name.data) token = GetToken(form.name.data, form.name.data)
return result_format(code=200,token=token) return result_format(code=200, token=token)
@api.route('/list', methods=['GET']) @api.route('/list', methods=['GET'])
def rome_list(): def rome_list():
"""房间列表""" """房间列表"""
token=request.headers.get("Authorization") token = request.headers.get("Authorization")
form = RoomListFrom(request.args).validate_() form = RoomListFrom(request.args).validate_()
data=GetRoomList(token,form.names.data) data = GetRoomList(token, form.names.data)
return result_format(code=200, data=data) return result_format(code=200, data=data)
@api.route('/delte', methods=['DELETE']) @api.route('/delte', methods=['DELETE'])
def rome_delte(): def rome_delte():
"""删除房间""" """删除房间"""
token=request.headers.get("Authorization") token = request.headers.get("Authorization")
form = RoomDeleteFrom().validate_() form = RoomDeleteFrom().validate_()
data=DeleteRoom(token,form.names.data) data = DeleteRoom(token, form.names.data)
if data=={}: if data == {}:
room_info = Room.query.filter(Room.name == form.names.data).first() room_info = Room.query.filter(Room.name == form.names.data).first()
if room_info: if room_info:
room_info.delete().stop_true() room_info.delete().stop_true()
......
...@@ -265,6 +265,7 @@ def CreateRoom(token, name, max_participants, empty_timeout, user_ids): ...@@ -265,6 +265,7 @@ def CreateRoom(token, name, max_participants, empty_timeout, user_ids):
"empty_timeout": empty_timeout "empty_timeout": empty_timeout
} }
response = requests.post(url=url, headers=headers, json=data) response = requests.post(url=url, headers=headers, json=data)
Logger().logger.info(f"新建房间结果;{response.status_code}")
return response.text return response.text
...@@ -280,7 +281,7 @@ def create_token(username, id, secret='temp'): ...@@ -280,7 +281,7 @@ def create_token(username, id, secret='temp'):
'name': username, 'name': username,
'ip': ip, 'ip': ip,
'id': id, 'id': id,
'iat': datetime.datetime.now() 'iat': datetime.now().strftime("%Y-%m-%d %H:%M:%S")
} }
encoded = jwt.encode(payload, secret, algorithm='HS256') encoded = jwt.encode(payload, secret, algorithm='HS256')
return encoded return encoded
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment