Merge branch 'master' of ssh://43.138.132.9:8222/xianyang/fj-livekit

src/app/api/friends/data_delte.py

@@ -2,32 +2,41 @@ 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
+from src.libs.functions import get_now_timestamp, str_to_time, AES_Encrypt, call_im_interface, get_timestamp, \
+    query_is_check
 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:
-        data['audit_status'] = 2
+        if is_check:
+            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 None
+        return 0
     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_()
-        print(data)
-        data['audit_status'] = 2
+        if is_check:
+            data['audit_status'] = 2
+            data['examine_people'] = 0
+            data['examine_time'] = get_timestamp()
         Examinecomment().set_attrs(data).direct_commit_()
     except Exception as e:
         print(e)

src/app/api/friends/views.py

@@ -113,7 +113,8 @@ 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())
+    query_user = FriendMessage.query.filter(FriendMessage.status != 1,
+                                            FriendMessage.audit_status != 3).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)

src/libs/functions.py

@@ -310,6 +310,16 @@ def get_now_timestamp():
     return time_array
 
 
+def get_timestamp():
+    """
+    获取现在时间戳
+    """
+    time_str = get_now_timestamp()
+    time_array = time.strptime(time_str, "%Y-%m-%d %H:%M:%S")
+    time_stamp = int(time.mktime(time_array))
+    return time_stamp
+
+
 def create_folder():
     """
     时间创建文件
@@ -367,7 +377,7 @@ def upload_file_body(file_strem, file_name):
 def children_comment(fcmid, uid):
     result = []
     fs = []
-    friend_data = FriendComment.query.filter(or_(and_(FriendComment.status == 0,
+    friend_data = FriendComment.query.filter(or_(and_(FriendComment.status != 1,
                                              FriendComment.fcmid == int(fcmid)),
                                              and_(FriendComment.uid == int(uid),
                                              FriendComment.fcmid == int(fcmid))
@@ -467,3 +477,15 @@ def call_im_interface(aes):
         Logger().logger.info(f'请求IM接口失败：{e}')
         return {}
     return result
+
+
+def query_is_check():
+    """查看后台是否免审核"""
+    sql = "select value from missu_system_config where menu_name='FriendsReview'"
+    is_examine = LinkMysql(env.BUSINESS).query_mysql(sql)
+    if not is_examine:
+        return 0
+    value = is_examine[0]['value']
+    if not value:
+        return 0
+    return 1