优化4.0.0

src/app/api/friends/data_delte.py

@@ -10,15 +10,13 @@ from src.modules.friend import FriendMessage, FriendGive, FriendComment
 
 def save_friends(data):
     try:
-        # if data['file_name']:
-        #     data['file_name'] = ','.join(data['file_name'])
         friendmessage = FriendMessage().set_attrs(data).direct_commit_()
         Logger().logger.info(f"发送朋友圈参数:{friendmessage}")
         data['fcmid'] = friendmessage.id
         Examinecontent().set_attrs(data).direct_commit_()
     except Exception as e:
-        print(e)
-        return 0
+        Logger().logger.info(f"发送朋友圈失败:{e}")
+        return None
     return friendmessage.id
 
 

src/app/api/friends/views.py

 # encoding=utf-8
 import os
 from werkzeug.utils import secure_filename
-
 from flask import request
-
 from src.app.api.friends.data_delte import FriendMessageNotice, save_friends, get_infoname, save_comment, \
     CircleOfFriends
 from src.app.api.friends.validaters import FriendSendAddFrom, FriendsListFrom, FriendCommentAddFrom, \
@@ -19,14 +17,16 @@ def friends_add():
     """朋友圈发送消息  视频文件存储到我的相册"""
     form = FriendSendAddFrom().validate_()
     fcmdata = save_friends(form.data)
+    if not fcmdata:
+        return result_format(code=500, message='发布失败')
     return result_format(code=200, message='发布成功', id=fcmdata)
 
 
 @api.route('/circle/list', methods=['GET'])
 def friends_list():
-    '''
+    """
     朋友圈列表
-    '''
+    """
     form = FriendsListFrom(request.args).validate_()
     page = request.args.get('page', default=1, type=int)
     limit = request.args.get('size', default=10, type=int)
@@ -42,9 +42,9 @@ def friends_list():
 
 @api.route('/circle/comment', methods=['POST'])
 def friends_comment():
-    '''
+    """
     朋友圈评论
-    '''
+    """
     form = FriendCommentAddFrom().validate_()
     fcmdata = save_comment(form.data)
     FriendMessageNotice(form.fcmid.data, fcmdata, form.uid.data).query_praise_comment()
@@ -53,18 +53,18 @@ def friends_comment():
 
 @api.route('/circle/comment/delete', methods=['GET'])
 def friends_comment_delete():
-    '''
+    """
     删除评论
-    '''
+    """
     FriendCommentDeleteFrom(request.args).validate_()
     return result_format(code=200, message='评论成功')
 
 
 @api.route('/circle/give', methods=['POST'])
 def friends_give():
-    '''
+    """
     朋友圈信息点赞
-    '''
+    """
     form = FriendGivetAddFrom().validate_()
     friend_info = FriendGive.query.order_by(FriendGive.id.desc()).filter(FriendGive.fcmid == form.fcmid.data,
                                                                          FriendGive.uid == form.uid.data,
@@ -91,9 +91,9 @@ def circle_of_friends():
 
 @api.route('/circle/delete', methods=['POST'])
 def friends_circle_delete():
-    '''
+    """
     删出发文内容
-    '''
+    """
     form = FriendGivetDeleteFrom().validate_()
     FriendGive().set_attrs(form.data).direct_commit_()
     return result_format(code=200, message='删除成功')
@@ -108,9 +108,9 @@ def friends_ground_edit():
 
 @api.route('/trends/list', methods=['GET'])
 def trends_list():
-    '''
+    """
     动态列表
-    '''
+    """
     page = request.args.get('page', default=1, type=int)
     limit = request.args.get('size', default=10, type=int)
     query_user = FriendMessage.query.filter().order_by(FriendMessage.id.desc())
@@ -123,9 +123,9 @@ def trends_list():
 
 @api.route('/circle/upload', methods=['POST'])
 def circle_upload():
-    '''
+    """
     图片视频上传到oss
-    '''
+    """
     file = request.files['file']
     # filename, suffix = file.filename.split('.')  # 获取上传文件的文件名
     file_strem = file.read()
@@ -135,9 +135,9 @@ def circle_upload():
 
 @api.route('/comment/list', methods=['GET'])
 def circle_comment():
-    '''
+    """
     评论列表
-    '''
+    """
     form = FriendsCommentListFrom(request.args).validate_()
     data = children_comment(form.fcmid.data, form.myUid.data)
     return result_format(code=200, data=data, message="操作成功")
@@ -145,9 +145,9 @@ def circle_comment():
 
 @api.route('/give/list', methods=['GET'])
 def give_list():
-    '''
+    """
     点赞列表
-    '''
+    """
     form = GiveCommentListFrom(request.args).validate_()
     data = list_give(form.fcmid.data, form.uid.data)
     return result_format(code=200, data=data, message="操作成功")
@@ -155,9 +155,9 @@ def give_list():
 
 @api.route('/circle/info', methods=['GET'])
 def circle_info_list():
-    '''
+    """
     获取用户朋友圈（详情）
-    '''
+    """
     page = request.args.get('page', default=1, type=int)
     limit = request.args.get('size', default=10, type=int)
     form = CircleListFrom(request.args).validate_()
@@ -171,8 +171,8 @@ def circle_info_list():
 
 @api.route('/content/delete', methods=['GET'])
 def friends_delete():
-    '''
+    """
     删除朋友圈信息
-    '''
+    """
     ContentListFrom(request.args).validate_()
     return result_format(code=200, message='删除成功')

src/libs/functions.py

@@ -201,9 +201,9 @@ def trans_str(data):
 
 
 def GetToken(room, create_user):
-    '''
+    """
     获取token
-    '''
+    """
     grant = VideoGrant(room_join=True, room=room, room_create=True, room_list=True, room_record=True, room_admin=True)
     access_token = AccessToken(SDK_CONFIG_APPID, SDK_CONFIG_APPSECRET, grant=grant, identity=create_user,
                                name=create_user)
@@ -212,9 +212,9 @@ def GetToken(room, create_user):
 
 
 def GetRoomList(token, names):
-    '''
+    """
     获取房间列表信息
-    '''
+    """
     url = 'http://live.zhubei.cn/twirp/livekit.RoomService/ListRooms'
     headers = {
         "Authorization": token,
@@ -229,9 +229,9 @@ def GetRoomList(token, names):
 
 
 def DeleteRoom(token, room):
-    '''
+    """
     删除房间
-    '''
+    """
     url = 'http://live.zhubei.cn/twirp/livekit.RoomService/DeleteRoom'
     room = room.split()
     headers = {
@@ -247,9 +247,9 @@ def DeleteRoom(token, room):
 
 
 def CreateRoom(token, name, max_participants, empty_timeout, user_ids):
-    '''
+    """
     新建房间
-    '''
+    """
     url = 'http://live.zhubei.cn/twirp/livekit.RoomService/CreateRoom'
     headers = {
         "Authorization": token,
@@ -283,9 +283,9 @@ def create_token(username, id, secret='temp'):
 
 
 def GetParticipantlist():
-    '''
+    """
     获取参与者信息
-    '''
+    """
     url = 'http://live.zhubei.cn/twirp/livekit.RoomService/ListParticipants'
     headers = {
         "Authorization": 'Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2aWRlbyI6eyJyb29tQ3JlYXRlIjp0cnVlLCJyb29tSm9pbiI6dHJ1ZSwicm9vbUxpc3QiOnRydWUsInJvb21SZWNvcmQiOnRydWUsInJvb21BZG1pbiI6dHJ1ZSwicm9vbSI6Ilx1NGUwMFx1NTNmN1x1NmQ0Ylx1OGJkNSJ9LCJpc3MiOiJBUElnU0JvczZ0ckVUSGEiLCJuYmYiOjE2ODEyNzA3NzQsImV4cCI6MTY4MTI5MjM3NCwic3ViIjoiMjMyMzIiLCJuYW1lIjoiMjMyMzIifQ.qv7BS3xp3EhkO9W7bu2rWBLF8-bz67XhOo9Iq88hMV4',
@@ -311,17 +311,17 @@ def get_now_timestamp():
 
 
 def create_folder():
-    '''
+    """
     时间创建文件
-    '''
+    """
     time_array = datetime.now().strftime('%Y-%m-%d')
     return time_array
 
 
 def upload_file(file_strem, file_name):
-    '''
+    """
     字节流上传到cos地址
-    '''
+    """
     dir_to_create = create_folder() + '/' + f'{file_name}'
     response = client.put_object(
         Bucket=Bucket,
@@ -334,7 +334,7 @@ def upload_file(file_strem, file_name):
 
 
 def frame_truncation(file_name):
-    '''视频截帧'''
+    """视频截帧"""
     response = client.get_snapshot(
         Bucket=Bucket,
         Key=file_name,
@@ -349,9 +349,9 @@ def frame_truncation(file_name):
 
 
 def upload_file_body(file_strem, file_name):
-    '''
+    """
     文件上传到cos地址
-    '''
+    """
     name = file_name.split('.mp4')[0] + '.png'
     dir_to_create = create_folder() + '/' + f'{name}'
     response = client.upload_file(
@@ -428,9 +428,9 @@ from Crypto.Cipher import AES
 
 
 def AES_Decrypt(data):
-    '''
+    """
     解密
-    '''
+    """
     unpad = lambda s: s[:-ord(s[len(s) - 1:])]
     key = "koukuai012345678".encode('utf8')
     data = base64.b64decode(data)
@@ -443,7 +443,7 @@ def AES_Decrypt(data):
 
 
 def AES_Encrypt(data):
-    '''加密'''
+    """加密"""
     pad = lambda s: s + (16 - len(s) % 16) * chr(16 - len(s) % 16)
     key = "koukuai012345678".encode('utf8')
     # 字符串补位