Skip to content

F
fj-livekit
Commit eeb25f4d authored by xianyang's avatar xianyang
Browse files
Options

优化

parent efcb2c83
Hide whitespace changes
Inline Side-by-side
Showing with 174 additions and 200 deletions
bin/runtime/yaml/config.yaml
View file @ eeb25f4d
...@@ -5,7 +5,6 @@ LOG_CONFIG: ...@@ -5,7 +5,6 @@ LOG_CONFIG:
name: 目录 name: 目录
- LOG_PATH: os.path.join(SITE_ROOT, "bin", "runtime", "logs", ) - LOG_PATH: os.path.join(SITE_ROOT, "bin", "runtime", "logs", )
name: 日志路径 name: 日志路径
SQLALCHEMY_CONFIG: SQLALCHEMY_CONFIG:
- DATABASE_URI: mysql+mysqlconnector://rainbowchat_pro:MK44tZZy2pzwbend@122.9.167.192:4999/rainbowchat_pro?charset=utf8 - DATABASE_URI: mysql+mysqlconnector://rainbowchat_pro:MK44tZZy2pzwbend@122.9.167.192:4999/rainbowchat_pro?charset=utf8
name: sqlchemy的url name: sqlchemy的url
......
configs/config.py
View file @ eeb25f4d
...@@ -49,7 +49,7 @@ class Env(BaseSettings): ...@@ -49,7 +49,7 @@ class Env(BaseSettings):
"pwd": "MK44tZZy2pzwbend", "pwd": "MK44tZZy2pzwbend",
"user": "rainbowchat_pro" "user": "rainbowchat_pro"
} }
JAVA_PATH = "https://chat.pro.zhubei.cn" JAVA_PATH = "https://chat.pro.zhubei.cn/rainbowchat_pro_test"
env = Env() env = Env()
src/app/api/friends/data_delte.py
View file @ eeb25f4d
...@@ -10,38 +10,44 @@ from src.modules.friend import FriendMessage, FriendGive, FriendComment ...@@ -10,38 +10,44 @@ from src.modules.friend import FriendMessage, FriendGive, FriendComment
def save_friends(data): def save_friends(data):
try: try:
if data['file_name']: if data['file_name']:
data['file_name']=','.join(data['file_name']) data['file_name'] = ','.join(data['file_name'])
friendmessage=FriendMessage().set_attrs(data).direct_commit_() friendmessage = FriendMessage().set_attrs(data).direct_commit_()
Logger().logger.info(f"发送朋友圈参数:{friendmessage}")
data['fcmid'] = friendmessage.id
Examinecontent().set_attrs(data).direct_commit_() Examinecontent().set_attrs(data).direct_commit_()
except Exception as e : except Exception as e:
print(e) print(e)
return 0 return 0
return friendmessage return friendmessage.id
def save_comment(data): def save_comment(data):
try: try:
data['create_time'] = datetime.datetime.now()
Logger().logger.info(f"评论存入参数:{data}")
friendcomment = FriendComment().set_attrs(data).direct_commit_() friendcomment = FriendComment().set_attrs(data).direct_commit_()
print(data) print(data)
Examinecomment().set_attrs(data).direct_commit_() Examinecomment().set_attrs(data).direct_commit_()
except Exception as e : except Exception as e:
print(e) print(e)
return 0 return 0
return friendcomment return friendcomment
def get_infoname(data): def get_infoname(data):
result=[] result = []
uids = [item.get("uid", "") for item in data] uids = [item.get("uid", "") for item in data]
if uids: if uids:
sql = f"SELECT nickname,user_avatar_file_name,bg_image,user_uid FROM `missu_users` where user_uid in{tuple(uids)}" sql = f"SELECT nickname,user_avatar_file_name,bg_image,user_uid FROM `missu_users` where user_uid in{tuple(uids)}"
user_info = LinkMysql(env.BUSINESS).query_mysql(sql) user_info = LinkMysql(env.BUSINESS).query_mysql(sql)
for i in range(len(data)): for i in range(len(data)):
for s in range(len(user_info)): for s in range(len(user_info)):
if data[i].get("uid")==user_info[s].get("user_uid"): if data[i].get("uid") == user_info[s].get("user_uid"):
data[i]['create_time'] = str_to_time(data[i].get("create_time", "")) data[i]['create_time'] = str_to_time(data[i].get("create_time", ""))
data[i]['nick_name'] = user_info[s].get("nickname", "") data[i]['nick_name'] = user_info[s].get("nickname", "")
data[i]['user_avatar_file_name'] = user_info[s].get("user_avatar_file_name", "") data[i]['user_avatar_file_name'] = user_info[s].get("user_avatar_file_name", "")
data[i]['bg_image'] = data[s].get("bg_image", "") data[i]['bg_image'] = data[s].get("bg_image", "")
result.append(data[i]) result.append(data[i])
return result return result
...@@ -51,6 +57,8 @@ class FriendMessageNotice(object): ...@@ -51,6 +57,8 @@ class FriendMessageNotice(object):
self.praise = praise self.praise = praise
self.uid = uid self.uid = uid
self.to_uuid = None # 朋友圈发送者id self.to_uuid = None # 朋友圈发送者id
Logger().logger.info(f"FriendMessageNotice接受参数:{self.fcmid}，，，praise：{self.praise},,,uid{self.uid}，，"
f"to_uuid:{self.to_uuid}")
def query_friends_info(self, user_id): def query_friends_info(self, user_id):
"""获取朋友圈发送者""" """获取朋友圈发送者"""
...@@ -69,24 +77,6 @@ class FriendMessageNotice(object): ...@@ -69,24 +77,6 @@ class FriendMessageNotice(object):
return user_info[0] return user_info[0]
return {} return {}
def public_method(self):
first_data = self.query_friends_info()
if first_data:
query_user = FriendGive.query.filter(FriendGive.is_look == 0,
FriendGive.uid == first_data.fcmid,
FriendGive.status == 0).order_by(FriendGive.id.desc())
paginate = query_user.paginate(error_out=True)
query_com = FriendComment.query.filter(FriendComment.is_look == 0,
FriendComment.status == 0,
FriendComment.uid != first_data.uid,
FriendComment.fcmid == self.fcmid,
FriendComment.review_to != None).order_by(FriendComment.id.desc())
paginate_com = query_com.paginate(error_out=True)
return paginate.items, paginate_com.items
return [], []
def query_praise_comment(self): def query_praise_comment(self):
"""查看用户收到点赞，评论""" """查看用户收到点赞，评论"""
...@@ -95,7 +85,7 @@ class FriendMessageNotice(object): ...@@ -95,7 +85,7 @@ class FriendMessageNotice(object):
user_data = self.query_user_head_portrait() user_data = self.query_user_head_portrait()
source_user = self.query_user_head_portrait(self.to_uuid) source_user = self.query_user_head_portrait(self.to_uuid)
friend_info = CircleOfFriends().query_info(self.praise.fcmid) friend_info = CircleOfFriends().query_info(self.praise.fcmid)
friend_img_str = friend_info.get('file_name','') friend_img_str = friend_info.get('file_name', '')
friend_img_list = friend_img_str.split(',') friend_img_list = friend_img_str.split(',')
if friend_img_list: if friend_img_list:
img_str = friend_img_list[0] img_str = friend_img_list[0]
...@@ -111,37 +101,37 @@ class FriendMessageNotice(object): ...@@ -111,37 +101,37 @@ class FriendMessageNotice(object):
content = "" content = ""
if not content: # 点赞数据 if not content: # 点赞数据
add_data = { add_data = {
"id":self.praise.id, "id": self.praise.id,
"fcmid":self.praise.fcmid, "fcmid": self.praise.fcmid,
"uid":self.praise.uid, "uid": self.praise.uid,
"head_path":user_data.get('user_avatar_file_name'), # 点赞者头像 "head_path": user_data.get('user_avatar_file_name'), # 点赞者头像
"nick_name":user_data.get('nickname'), # 点赞者名字 "nick_name": user_data.get('nickname'), # 点赞者名字
"source_head_path":source_user.get('user_avatar_file_name'), # 朋友圈发送者头像 "source_head_path": source_user.get('user_avatar_file_name'), # 朋友圈发送者头像
"source_name":source_user.get('nickname'), # 朋友圈发送者名字 "source_name": source_user.get('nickname'), # 朋友圈发送者名字
"friend_path":img_str, "friend_path": img_str,
"coding":"1", "coding": "1",
"create_time":str_to_time(str(self.praise.create_time)) "create_time": str_to_time(str(self.praise.create_time))
} }
else: # 评论数据 else: # 评论数据
add_data = { add_data = {
"id":self.praise.id, "id": self.praise.id,
"review_to":self.praise.review_to, "review_to": self.praise.review_to,
"fcmid":self.praise.fcmid, "fcmid": self.praise.fcmid,
"uid":self.praise.uid, "uid": self.praise.uid,
"content":self.praise.content, "content": self.praise.content,
"head_path":user_data.get('user_avatar_file_name'), "head_path": user_data.get('user_avatar_file_name'),
"nick_name":user_data.get('nickname'), "nick_name": user_data.get('nickname'),
"source_head_path":source_user.get('user_avatar_file_name'), "source_head_path": source_user.get('user_avatar_file_name'),
"source_name":source_user.get('nickname'), "source_name": source_user.get('nickname'),
"friend_path":img_str, "friend_path": img_str,
"coding": "2", "coding": "2",
"create_time":str_to_time(str(self.praise.create_time)) "create_time": str_to_time(str(self.praise.create_time))
} }
data = { data = {
"processorId":1008, "processorId": 1008,
"jobDispatchId":1, "jobDispatchId": 1,
"actionId":3, "actionId": 3,
"newData":json.dumps({"to_uid":self.to_uuid,"typeu": "53","msg":add_data}) "newData": json.dumps({"to_uid": self.to_uuid, "typeu": "53", "msg": add_data})
} }
aes = AES_Encrypt(json.dumps(data)) aes = AES_Encrypt(json.dumps(data))
Logger().logger.info(f'请求IM参数:{data}，，，密文：{aes}') Logger().logger.info(f'请求IM参数:{data}，，，密文：{aes}')
...@@ -154,6 +144,7 @@ class FriendMessageNotice(object): ...@@ -154,6 +144,7 @@ class FriendMessageNotice(object):
class CircleOfFriends(object): class CircleOfFriends(object):
"""朋友圈详情""" """朋友圈详情"""
@staticmethod @staticmethod
def query_info(fc_mid): def query_info(fc_mid):
sql = f"select uid,res_type,content,file_name,location,create_time from missu_friend_message where id={fc_mid}" sql = f"select uid,res_type,content,file_name,location,create_time from missu_friend_message where id={fc_mid}"
......
src/libs/functions.py
View file @ eeb25f4d
...@@ -9,15 +9,12 @@ import decimal ...@@ -9,15 +9,12 @@ import decimal
import time import time
import requests import requests
from livekit import AccessToken, VideoGrant from livekit import AccessToken, VideoGrant
# 时间戳转成字符串
from qcloud_cos import CosS3Client, CosConfig
from configs.config import SDK_CONFIG_APPSECRET, SDK_CONFIG_APPID, client, Bucket, env, SecretKey, Region, UPLOAD_FOLDER from configs.config import SDK_CONFIG_APPSECRET, SDK_CONFIG_APPID, client, Bucket, env, SecretKey, Region, UPLOAD_FOLDER
from src.libs.db_link import LinkMysql from src.libs.db_link import LinkMysql
from src.libs.log_utils import Logger from src.libs.log_utils import Logger
from src.modules.friend import FriendComment, FriendGive from src.modules.friend import FriendComment, FriendGive
# 时间戳转成字符串
def time_to_datetime(sp): def time_to_datetime(sp):
import datetime import datetime
str_time = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(sp)) str_time = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(sp))
...@@ -187,7 +184,6 @@ def datetime_to_time(dtime): ...@@ -187,7 +184,6 @@ def datetime_to_time(dtime):
return int(un_time) return int(un_time)
def trans_str(data): def trans_str(data):
data_str = {} data_str = {}
for i, j in data.items(): for i, j in data.items():
...@@ -202,7 +198,6 @@ def trans_str(data): ...@@ -202,7 +198,6 @@ def trans_str(data):
return data_str return data_str
def GetToken(room, create_user): def GetToken(room, create_user):
''' '''
获取token 获取token
...@@ -313,21 +308,19 @@ def get_now_timestamp(): ...@@ -313,21 +308,19 @@ def get_now_timestamp():
return time_array return time_array
def create_folder(): def create_folder():
''' '''
时间创建文件 时间创建文件
''' '''
time_array = datetime.now().strftime('%Y-%m-%d') time_array = datetime.now().strftime('%Y-%m-%d')
return time_array return time_array
def upload_file(file_strem, file_name): def upload_file(file_strem, file_name):
''' '''
字节流上传到cos地址 字节流上传到cos地址
''' '''
dir_to_create = create_folder() +'/'+ f'{file_name}' dir_to_create = create_folder() + '/' + f'{file_name}'
response = client.put_object( response = client.put_object(
Bucket=Bucket, Bucket=Bucket,
Key=dir_to_create, Key=dir_to_create,
...@@ -337,6 +330,7 @@ def upload_file(file_strem, file_name): ...@@ -337,6 +330,7 @@ def upload_file(file_strem, file_name):
print("上传成功") print("上传成功")
return dir_to_create return dir_to_create
def frame_truncation(file_name): def frame_truncation(file_name):
'''视频截帧''' '''视频截帧'''
response = client.get_snapshot( response = client.get_snapshot(
...@@ -352,13 +346,12 @@ def frame_truncation(file_name): ...@@ -352,13 +346,12 @@ def frame_truncation(file_name):
return file_path, name return file_path, name
def upload_file_body(file_strem, file_name): def upload_file_body(file_strem, file_name):
''' '''
文件上传到cos地址 文件上传到cos地址
''' '''
name = file_name.split('.mp4')[0] + '.png' name = file_name.split('.mp4')[0] + '.png'
dir_to_create = create_folder() +'/'+ f'{name}' dir_to_create = create_folder() + '/' + f'{name}'
response = client.upload_file( response = client.upload_file(
Bucket=Bucket, Bucket=Bucket,
Key=dir_to_create, Key=dir_to_create,
...@@ -369,64 +362,64 @@ def upload_file_body(file_strem, file_name): ...@@ -369,64 +362,64 @@ def upload_file_body(file_strem, file_name):
return dir_to_create return dir_to_create
def children_comment(fcmid): def children_comment(fcmid):
result=[] result = []
fs = [] fs = []
friend_data = FriendComment.query.filter(FriendComment.status==0,FriendComment.fcmid == fcmid).all() friend_data = FriendComment.query.filter(FriendComment.fcmid == fcmid).all()
for infos in friend_data: for infos in friend_data:
result.append(infos.serialization()) result.append(infos.serialization())
ds = sorted(result, key=lambda x: x['review_to'] if x['review_to'] else 0, reverse=True) ds = sorted(result, key=lambda x: x['review_to'] if x['review_to'] else 0, reverse=True)
datas = one_tree_comment(ds, fs) datas = one_tree_comment(ds, fs)
return datas return datas
def one_tree_comment(data,fs): def one_tree_comment(data, fs):
kong = [] kong = []
for s in data: for s in data:
uid=s.get("uid") uid = s.get("uid")
sql = f"SELECT nickname,user_avatar_file_name,bg_image FROM `missu_users` where user_uid='{uid}'" sql = f"SELECT nickname,user_avatar_file_name,bg_image FROM `missu_users` where user_uid='{uid}'"
friend_info='' friend_info = ''
if s.get("review_to")!=None: if s.get("review_to") != None:
friend_info = FriendComment.query.filter(FriendComment.review_to == s.get("review_to"),FriendComment.fcmid==s.get("fcmid"), friend_info = FriendComment.query.filter(FriendComment.review_to == s.get("review_to"),
FriendComment.status == 0).first() FriendComment.fcmid == s.get("fcmid"),
user_info = LinkMysql(env.BUSINESS).query_mysql(sql) ).first()
if friend_info: user_info = LinkMysql(env.BUSINESS).query_mysql(sql)
s['review_to_uid'] =friend_info.uid if friend_info:
s['review_to_nicke_name'] =user_info[0].get("nickname","") s['review_to_uid'] = friend_info.uid
s['review_user_avatar_file_name'] =user_info[0].get("user_avatar_file_name","") s['review_to_nicke_name'] = user_info[0].get("nickname", "")
s['review_bg_image'] =user_info[0].get("bg_image","") s['review_user_avatar_file_name'] = user_info[0].get("user_avatar_file_name", "")
else: s['review_bg_image'] = user_info[0].get("bg_image", "")
s['review_to_uid'] = '' else:
s['review_to_nicke_name'] = '' s['review_to_uid'] = ''
s['review_user_avatar_file_name'] = '' s['review_to_nicke_name'] = ''
s['review_bg_image'] = '' s['review_user_avatar_file_name'] = ''
s['nick_name']=user_info[0].get("nickname","") s['review_bg_image'] = ''
s['create_time']=str_to_time(s.get("create_time","")) s['nick_name'] = user_info[0].get("nickname", "")
s['user_avatar_file_name']=user_info[0].get("user_avatar_file_name","") s['create_time'] = str_to_time(s.get("create_time", ""))
s['bg_image']=user_info[0].get("bg_image","") s['user_avatar_file_name'] = user_info[0].get("user_avatar_file_name", "")
kong.append(s) s['bg_image'] = user_info[0].get("bg_image", "")
kong.append(s)
return kong return kong
def list_give(fcmid, uid):
def list_give(fcmid,uid): result = []
result=[] friend_data = FriendGive.query.filter(FriendGive.status == 0, FriendGive.fcmid == fcmid).all()
friend_data = FriendGive.query.filter(FriendGive.status==0,FriendGive.fcmid == fcmid).all() for infos in friend_data:
for infos in friend_data: user_data = infos.serialization()
user_data=infos.serialization() uid = user_data.get("uid")
uid=user_data.get("uid") sql = f"SELECT nickname,user_avatar_file_name,bg_image FROM `missu_users` where user_uid='{uid}'"
sql = f"SELECT nickname,user_avatar_file_name,bg_image FROM `missu_users` where user_uid='{uid}'" user_info = LinkMysql(env.BUSINESS).query_mysql(sql)
user_info = LinkMysql(env.BUSINESS).query_mysql(sql) user_data['nick_name'] = user_info[0].get("nickname", "")
user_data['nick_name'] = user_info[0].get("nickname", "") user_data['user_avatar_file_name'] = user_info[0].get("user_avatar_file_name", "")
user_data['user_avatar_file_name'] = user_info[0].get("user_avatar_file_name", "") user_data['bg_image'] = user_info[0].get("bg_image", "")
user_data['bg_image'] = user_info[0].get("bg_image", "") result.append(user_data)
result.append(user_data) return result
return result
from Crypto.Cipher import AES from Crypto.Cipher import AES
def AES_Decrypt(data): def AES_Decrypt(data):
''' '''
解密 解密
...@@ -443,21 +436,21 @@ def AES_Decrypt(data): ...@@ -443,21 +436,21 @@ def AES_Decrypt(data):
def AES_Encrypt(data): def AES_Encrypt(data):
'''加密''' '''加密'''
pad = lambda s: s + (16 - len(s) % 16) * chr(16 - len(s) % 16) pad = lambda s: s + (16 - len(s) % 16) * chr(16 - len(s) % 16)
key = "koukuai012345678".encode('utf8') key = "koukuai012345678".encode('utf8')
# 字符串补位 # 字符串补位
data = pad(data) data = pad(data)
cipher = AES.new(key, AES.MODE_ECB) cipher = AES.new(key, AES.MODE_ECB)
# 加密后得到的是bytes类型的数据，使用Base64进行编码,返回byte字符串 # 加密后得到的是bytes类型的数据，使用Base64进行编码,返回byte字符串
result = cipher.encrypt(data.encode()) result = cipher.encrypt(data.encode())
encodestrs = base64.b64encode(result) encodestrs = base64.b64encode(result)
enctext = encodestrs.decode('utf8') enctext = encodestrs.decode('utf8')
return enctext return enctext
def call_im_interface(aes): def call_im_interface(aes):
url = f"{env.JAVA_PATH}/rainbowchat_pro/rest_post" url = f"{env.JAVA_PATH}/rest_post"
try: try:
result = requests.post(url=url, data=aes) result = requests.post(url=url, data=aes)
except Exception as e: except Exception as e:
......
src/modules/examine.py
View file @ eeb25f4d
import datetime import datetime
from sqlalchemy import TIMESTAMP, Integer, BIGINT, String, Text
from sqlalchemy import TIMESTAMP, Integer, BIGINT,String,Text
from src.app.orm import Common, db from src.app.orm import Common, db
...@@ -9,42 +8,41 @@ from src.app.orm import Common, db ...@@ -9,42 +8,41 @@ from src.app.orm import Common, db
class Examineline(Common, db.Model): class Examineline(Common, db.Model):
"""审核表""" """审核表"""
__tablename__ = 'missu_examine_line' __tablename__ = 'missu_examine_line'
id = db.Column(db.Integer, primary_key=True,autoincrement=True) id = db.Column(db.Integer, primary_key=True, autoincrement=True)
content_old = db.Column(db.Text, comment="原内容") content_old = db.Column(db.Text, comment="原内容")
content_new = db.Column(db.Text, comment="新内容") content_new = db.Column(db.Text, comment="新内容")
create_time=db.Column(TIMESTAMP,default=datetime.datetime.now(), comment="提交时间") create_time = db.Column(TIMESTAMP, default=datetime.datetime.now(), comment="提交时间")
type = db.Column(db.Integer, comment="1是昵称2头像地址3.个签4.手机号") type = db.Column(db.Integer, comment="1是昵称2头像地址3.个签4.手机号")
# 0是未审核，1.是审核中。2.是审核成功。3.审核失败 # 0是未审核，1.是审核中。2.是审核成功。3.审核失败
examine_people = db.Column(db.String(100), comment="审核人") examine_people = db.Column(db.String(100), comment="审核人")
examine_time=db.Column(TIMESTAMP,comment="审核时间") examine_time = db.Column(TIMESTAMP, comment="审核时间")
class Examinecontent(Common,db.Model): class Examinecontent(Common, db.Model):
"""审核朋友圈记录表""" """审核朋友圈记录表"""
__tablename__ = 'missu_examine_content' __tablename__ = 'missu_examine_content'
id = db.Column(Integer, primary_key=True,autoincrement=True) id = db.Column(Integer, primary_key=True, autoincrement=True)
uid = db.Column(BIGINT, comment="用户id") fcmid = db.Column(Integer, comment="朋友圈信息id")
uid = db.Column(BIGINT, comment="用户id")
content = db.Column(db.Text, comment="内容") content = db.Column(db.Text, comment="内容")
create_time=db.Column(TIMESTAMP,default=datetime.datetime.now(), comment="提交时间") create_time = db.Column(TIMESTAMP, default=datetime.datetime.now(), comment="提交时间")
res_type = db.Column(Integer, comment="0 图片， 1 视频 2文字") res_type = db.Column(Integer, comment="0 图片， 1 视频 2文字")
examine_people = db.Column(String(225), comment="审核人") examine_people = db.Column(String(225), comment="审核人")
file_name = db.Column(String(225), comment="文件地址") file_name = db.Column(String(225), comment="文件地址")
examine_time=db.Column(TIMESTAMP,comment="审核时间") examine_time = db.Column(TIMESTAMP, comment="审核时间")
audit_status = db.Column(Integer, default=0, comment="0是未审核，1.是审核中。2.是审核成功。3.审核失败") audit_status = db.Column(Integer, default=0, comment="0是未审核，1.是审核中。2.是审核成功。3.审核失败")
status = db.Column(Integer, default=0, comment="") status = db.Column(Integer, default=0, comment="")
class Examinecomment(Common, db.Model):
class Examinecomment(Common,db.Model):
"""朋友圈评论记录表""" """朋友圈评论记录表"""
__tablename__ = 'missu_comment_content' __tablename__ = 'missu_comment_content'
id = db.Column(Integer, primary_key=True,autoincrement=True) id = db.Column(Integer, primary_key=True, autoincrement=True)
uid = db.Column(BIGINT, comment="用户id") uid = db.Column(BIGINT, comment="用户id")
content = db.Column(Text, comment="评论内容") content = db.Column(Text, comment="评论内容")
create_time=db.Column(TIMESTAMP,default=datetime.datetime.now(), comment="提交时间") create_time = db.Column(TIMESTAMP, default=datetime.datetime.now(), comment="提交时间")
examine_people = db.Column(String(225), comment="审核人") examine_people = db.Column(String(225), comment="审核人")
examine_time=db.Column(TIMESTAMP,comment="审核时间") examine_time = db.Column(TIMESTAMP, comment="审核时间")
audit_status = db.Column(Integer, default=0, comment="0是未审核，1.是审核中。2.是审核成功。3.审核失败") audit_status = db.Column(Integer, default=0, comment="0是未审核，1.是审核中。2.是审核成功。3.审核失败")
failed_reason=db.Column(String(225), comment="驳回原因") failed_reason = db.Column(String(225), comment="驳回原因")
status = db.Column(Integer, default=0, comment="") status = db.Column(Integer, default=0, comment="")
src/modules/friend.py
View file @ eeb25f4d
import datetime import datetime
from sqlalchemy import TIMESTAMP, SmallInteger
from sqlalchemy import TIMESTAMP
from src.app.orm import Common, db from src.app.orm import Common, db
class FriendTimeline(Common, db.Model): class FriendTimeline(Common, db.Model):
"""朋友圈时间轴表""" """朋友圈时间轴表"""
__tablename__ = 'missu_friend_timeline' __tablename__ = 'missu_friend_timeline'
id = db.Column(db.Integer, primary_key=True,autoincrement=True) id = db.Column(db.Integer, primary_key=True, autoincrement=True)
uid = db.Column(db.BIGINT, comment="用户id") uid = db.Column(db.BIGINT, comment="用户id")
fcmid = db.Column(db.Integer, comment="朋友圈信息id") fcmid = db.Column(db.Integer, comment="朋友圈信息id")
is_own = db.Column(db.Integer, comment="是否是自己的 0是1不是") is_own = db.Column(db.Integer, comment="是否是自己的 0是1不是")
create_time=db.Column(TIMESTAMP,default=datetime.datetime.now(), comment="创建时间") create_time = db.Column(TIMESTAMP, default=datetime.datetime.now(), comment="创建时间")
# missu_roster 好友表 # missu_roster 好友表
...@@ -20,56 +18,51 @@ class FriendTimeline(Common, db.Model): ...@@ -20,56 +18,51 @@ class FriendTimeline(Common, db.Model):
# missu_users_binary 相册表 # missu_users_binary 相册表
class FriendMessage(Common,db.Model): class FriendMessage(Common, db.Model):
""" """
发送消息 发布朋友圈
""" """
__tablename__='missu_friend_message' __tablename__ = 'missu_friend_message'
id =db.Column(db.Integer,primary_key=True,autoincrement=True) id = db.Column(db.Integer, primary_key=True, autoincrement=True)
uid =db.Column(db.BIGINT,comment="用户id") uid = db.Column(db.BIGINT, comment="用户id")
res_type=db.Column(db.Integer,comment="0 图片， 1 视频 2文字") res_type = db.Column(db.Integer, comment="0 图片， 1 视频 2文字")
content=db.Column(db.String(500),comment="内容文字") content = db.Column(db.String(500), comment="内容文字")
file_name=db.Column(db.String(500),comment="文件地址") file_name = db.Column(db.String(500), comment="文件地址")
location =db.Column(db.String(100),comment="ip位置") location = db.Column(db.String(100), comment="ip位置")
create_time = db.Column(TIMESTAMP, default=datetime.datetime.now(), comment="创建时间") create_time = db.Column(TIMESTAMP, default=datetime.datetime.now(), comment="创建时间")
audit_status=db.Column(db.Integer,comment="0是未审核，1.是审核中。2.是审核成功。3.审核失败") status = db.Column(SmallInteger, default=2)
watch_uid=db.Column(db.String(500),comment="权限uid用户id") audit_status = db.Column(db.Integer, default=0, comment="0是未审核，1.是审核中。2.是审核成功。3.审核失败")
watch_uid = db.Column(db.String(500), comment="权限uid用户id")
class FriendComment(Common, db.Model): class FriendComment(Common, db.Model):
"""评论表""" """评论表"""
__tablename__ = 'missu_friend_comment' __tablename__ = 'missu_friend_comment'
id =db.Column(db.Integer, primary_key=True,autoincrement=True) id = db.Column(db.Integer, primary_key=True, autoincrement=True)
fcmid =db.Column(db.BIGINT, comment="朋友圈信息id") fcmid = db.Column(db.BIGINT, comment="朋友圈信息id")
review_to =db.Column(db.BIGINT, comment="回复对象id") review_to = db.Column(db.BIGINT, comment="回复对象id")
uid =db.Column(db.BIGINT, comment="评论者id") uid = db.Column(db.BIGINT, comment="评论者id")
content =db.Column(db.String(500), comment="内容") content = db.Column(db.String(500), comment="内容")
create_time = db.Column(TIMESTAMP, default=datetime.datetime.now(), comment="创建时间") create_time = db.Column(TIMESTAMP, default=datetime.datetime.now(), comment="创建时间")
like_count = db.Column(db.Integer,comment="点赞数") status = db.Column(SmallInteger, default=2)
is_look = db.Column(db.Integer, default=0, comment="0未查看，1已查看") like_count = db.Column(db.Integer, comment="点赞数")
is_look = db.Column(db.Integer, default=0, comment="0未查看，1已查看")
class FriendGive(Common, db.Model): class FriendGive(Common, db.Model):
__tablename__ = 'missu_friend_give' __tablename__ = 'missu_friend_give'
id = db.Column(db.Integer, primary_key=True, autoincrement=True) id = db.Column(db.Integer, primary_key=True, autoincrement=True)
fcmid = db.Column(db.BIGINT, comment="朋友圈信息id") fcmid = db.Column(db.BIGINT, comment="朋友圈信息id")
uid=db.Column(db.BIGINT,comment="用户id") uid = db.Column(db.BIGINT, comment="用户id")
like_count = db.Column(db.Integer, comment="点赞数") like_count = db.Column(db.Integer, comment="点赞数")
is_look = db.Column(db.Integer, default=0, comment="0未查看，1已查看") is_look = db.Column(db.Integer, default=0, comment="0未查看，1已查看")
class FriendMoments(Common, db.Model): class FriendMoments(Common, db.Model):
''' '''
图片修改 图片修改
''' '''
__tablename__ = 'missu_friend_moments' __tablename__ = 'missu_friend_moments'
id = db.Column(db.Integer, primary_key=True, autoincrement=True) id = db.Column(db.Integer, primary_key=True, autoincrement=True)
uid =db.Column(db.BIGINT,comment="用户id") uid = db.Column(db.BIGINT, comment="用户id")
image_path =db.Column(db.String(500),comment="图片地址") image_path = db.Column(db.String(500), comment="图片地址")
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