update

src/app/api/friends/data_delte.py

@@ -2,41 +2,32 @@ import datetime
 import json
 from configs.config import env
 from src.libs.db_link import LinkMysql
-from src.libs.functions import get_now_timestamp, str_to_time, AES_Encrypt, call_im_interface, get_timestamp, \
-    query_is_check
+from src.libs.functions import get_now_timestamp, str_to_time, AES_Encrypt, call_im_interface
 from src.libs.log_utils import Logger
 from src.modules.examine import Examinecontent, Examinecomment
 from src.modules.friend import FriendMessage, FriendGive, FriendComment
 
 
 def save_friends(data):
-    is_check = query_is_check()
     try:
-        if is_check:
-            data['audit_status'] = 2
+        data['audit_status'] = 2
         friendmessage = FriendMessage().set_attrs(data).direct_commit_()
         Logger().logger.info(f"发送朋友圈参数:{friendmessage}")
         data['fcmid'] = friendmessage.id
-        if is_check:
-            data['examine_people'] = 0
-            data['examine_time'] = get_timestamp()
         Examinecontent().set_attrs(data).direct_commit_()
     except Exception as e:
         Logger().logger.info(f"发送朋友圈失败:{e}")
-        return 0
+        return None
     return friendmessage.id
 
 
 def save_comment(data):
-    is_check = query_is_check()
     try:
         data['create_time'] = datetime.datetime.now()
         Logger().logger.info(f"评论存入参数:{data}")
         friendcomment = FriendComment().set_attrs(data).direct_commit_()
-        if is_check:
-            data['audit_status'] = 2
-            data['examine_people'] = 0
-            data['examine_time'] = get_timestamp()
+        print(data)
+        data['audit_status'] = 2
         Examinecomment().set_attrs(data).direct_commit_()
     except Exception as e:
         print(e)
@@ -169,3 +160,4 @@ class CircleOfFriends(object):
             friend['create_time'] = str_to_time(str(friend['create_time']))
             return friend
         return {}
+

src/app/api/friends/validaters.py

@@ -29,16 +29,16 @@ class FriendSendAddFrom(RequestBaseForm):
         if val.data:
             self.content.data = val.data
 
-    def validate_file_name(self, val):
-        if val.data:
-            if len(val.data) >= 9:
-                raise APIException(code=500, message='超出数量,无法保存')
+#    def validate_file_name(self, val):
+#        if val.data:
+#            if len(val.data) >= 9:
+#                raise APIException(code=500, message='超出数量,无法保存')
 
 
 class FriendsListFrom(BaseForm):
-    """
+    '''
     朋友圈列表
-    """
+    '''
     uid = StringField(validators=[DataRequired(message="uid不能为空")])
 
     def validate_uid(self, val):
@@ -132,9 +132,9 @@ class FriendGivetDeleteFrom(BaseForm):
 
 
 class FriendBackgroundFrom(BaseForm):
-    """
+    '''
     朋友圈背景修改
-    """
+    '''
     uid = StringField(validators=[DataRequired(message="uid不能为空")])
     images = StringField(validators=[DataRequired(message="图片名地址不能为空")])
 
@@ -146,9 +146,9 @@ class FriendBackgroundFrom(BaseForm):
 
 
 class FriendsCommentListFrom(BaseForm):
-    """
+    '''
     评论列表
-    """
+    '''
     uid = StringField(validators=[DataRequired(message="uid不能为空")])
     fcmid = StringField(validators=[DataRequired(message="朋友圈信息id不能为空")])
     myUid = StringField(validators=[DataRequired(message="访问者id不能为空")])
@@ -162,9 +162,9 @@ class FriendsCommentListFrom(BaseForm):
 
 
 class GiveCommentListFrom(BaseForm):
-    """
-    点赞列表
-    """
+    '''
+    点赞
+    '''
     uid = StringField(validators=[DataRequired(message="uid不能为空")])
     fcmid = StringField(validators=[DataRequired(message="朋友圈信息id不能为空")])
 
@@ -177,9 +177,9 @@ class GiveCommentListFrom(BaseForm):
 
 
 class CircleListFrom(BaseForm):
-    """
+    '''
     获取朋友圈详情
-    """
+    '''
     uid = StringField(validators=[DataRequired(message="uid不能为空")])
 
     def validate_uid(self, val):
@@ -194,9 +194,9 @@ class CircleListFrom(BaseForm):
 
 
 class ContentListFrom(BaseForm):
-    """
+    '''
     内容
-    """
+    '''
     uid = StringField(validators=[DataRequired(message="uid不能为空")])
     fcmid = StringField(validators=[DataRequired(message="朋友圈信息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, \
@@ -17,16 +19,14 @@ 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,13 +108,12 @@ 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(FriendMessage.status != 1,
-                                            FriendMessage.audit_status != 3).order_by(FriendMessage.id.desc())
+    query_user = FriendMessage.query.filter().order_by(FriendMessage.id.desc())
     paginate = query_user.paginate(page=page, per_page=limit, error_out=True)
     data = [item.serialization(increase={'create_time', 'uid', 'status'}, ) for item in paginate.items]
     datas = get_infoname(data)
@@ -124,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()
@@ -136,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="操作成功")
@@ -146,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="操作成功")
@@ -156,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_()
@@ -172,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='删除成功')