聊天室基本对接完成，修改一些细节，准备部署

Author: linrongda

project/Dockerfile

@@ -0,0 +1,12 @@
+# 设置基础镜像
+FROM python:3.9.13
+# 设置代码文件夹工作目录 /app
+WORKDIR /app
+# 复制当前代码文件到容器中 /app
+ADD . /app
+# 设置时间
+RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+# 安装所需的包，这里的requirements文件名需和项目生成的一致
+RUN pip install --trusted-host mirrors.tuna.tsinghua.edu.cn -r requirements.txt -i https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple/
+# 执行入口文件
+CMD ["python", "app.py"]

project/api/chat/history.py

@@ -12,7 +12,7 @@ class MessageHistory(Resource):  # 用户获取历史消息
     @check_status([0, 3])
     def get(self):
         receive_id = request.payload_id
-        send_id = request.args.get('send_id', type=int)
+        send_id = request.args.get('send_id', type=str)
         # 查询数据库中的历史记录
         receive_history = Messages.query.filter(
             Messages.send_id == send_id, Messages.receive_id == receive_id, Messages.is_read == 1).order_by(
@@ -25,10 +25,11 @@ def get(self):
         message_list = []
         # 添加消息到列表中
         for message in message_history:
-            message_dict = {'send_id': str(message.send_id), 'message': message.message, 'message_id': str(message.id),
-                            'type': message.type, 'send_time': time_transform(message.send_time)}
+            message_dict = {'send_id': str(message.send_id), 'receive_id': str(message.receive_id),
+                            'message': message.message, 'message_id': str(message.id),
+                            'type': message.type, 'send_time': time_transform(message.send_time, True)}
             message_list.append(message_dict)
         if not message_list:
-            return make_response(jsonify({'code': 400, 'message': '暂无历史消息'}), 400)
+            return make_response(jsonify({'code': 404, 'message': '暂无历史消息'}), 404)
         logger.debug(f'用户{receive_id}获取与用户{send_id}的历史消息')
         return make_response(jsonify({'code': 200, 'message': '获取成功', 'data': message_list}), 200)

project/api/chat/list.py

@@ -43,7 +43,7 @@ def get(self):
             results.append({'person_id': str(person.id), 'person_nickname': person.nickname,
                             'person_profile_photo': person.profile_photo, 'last_message_id': str(conversation.id),
                             'last_message': conversation.message,
-                            'last_message_time': time_transform(conversation.send_time)})
+                            'last_message_time': time_transform(conversation.send_time, True)})
         if not results:
             return make_response(jsonify({'code': 404, 'message': '暂无消息'}), 404)
         logger.debug(f'用户{user_id}获取消息列表')

project/api/chat/message.py

@@ -15,8 +15,8 @@ class Message(Namespace):  # 聊天功能
     def on_connect(self):
         token = request.headers.get('Authorization')
         if user_id := self.verify_token(token):
-            join_room(user_id)  # 将用户添加到以其唯一标识符命名的房间
-            emit('response', {'code': 1, 'message': '连接成功'})
+            join_room(f'{user_id}')  # 将用户添加到以其唯一标识符命名的房间
+            emit('response', {'code': 1, 'message': '新消息来咯！', 'user_id': str(user_id)})  # 发送消息给连接的用户
             self.send_offline_messages(user_id)
         else:
             emit('response', {'code': 0, 'message': '你没有权限'})
@@ -35,19 +35,28 @@ def on_message(self, messages):
         token = request.headers.get('Authorization')
         if sender_id := self.verify_token(token):
             messages_dict = json.loads(messages)
-            receive_id = messages_dict.get('receive_id')  # 获取消息的接收者的唯一标识符
-            message_type = messages_dict.get('type')  # 获取消息类型
-            message = messages_dict.get('message')  # 获取消息内容
-            messages = Messages(id=id_generate('message'), isSystem=0, send_id=sender_id, receive_id=receive_id,
-                                message=message, send_time=datetime.datetime.utcnow(), type=message_type, is_read=0)
-            db.session.add(messages)
-            db.session.flush()
-            db.session.commit()
-            emit('response', {'code': 200, 'message': message, 'message_id': str(messages.id), 'type': message_type},
-                 room=receive_id)  # 发送消息给接收者的房间
+            try:
+                receive_id = messages_dict.get('receive_id')  # 获取消息的接收者的唯一标识符
+                message_type = messages_dict.get('type')  # 获取消息类型
+                message = messages_dict.get('message')  # 获取消息内容
+                messages = Messages(id=id_generate('message'), isSystem=0, send_id=sender_id, receive_id=receive_id,
+                                    message=message, send_time=datetime.datetime.utcnow(), type=message_type, is_read=0)
+                db.session.add(messages)
+                db.session.flush()
+                db.session.commit()
+                if str(sender_id) != receive_id:
+                    emit('response',
+                         {'code': 200, 'message': message, 'send_id': str(sender_id), 'receive_id': str(receive_id),
+                          'message_id': str(messages.id), 'type': message_type,
+                          'send_time': time_transform(messages.send_time, True)},
+                         room=f'{receive_id}')  # 发送消息给接收者的房间
 
-            emit('response', {'code': 200, 'message': message, 'message_id': str(messages.id), 'type': message_type},
-                 room=sender_id)  # 发送消息给发送者的房间
+                # emit('response',
+                #      {'code': 200, 'message': message, 'send_id': str(sender_id), 'receive_id': str(receive_id),
+                #      'message_id': str(messages.id), 'type': message_type},
+                #      room=f'{sender_id}')  # 发送消息给发送者的房间
+            except Exception as e:
+                emit('response', {'code': 400, 'message': f'发送失败:{e}'})
         else:
             emit('response', {'code': 400, 'message': '你没有权限'})
 
@@ -72,13 +81,18 @@ def verify_token(self, token):
             return False
 
     def send_offline_messages(self, receive_id):
-        # 查询数据库中针对接收者的未读消息
-        offline_messages = Messages.query.filter_by(receive_id=receive_id, is_read=0).filter(
+        # 查询未读消息
+        offline_messages_receive = Messages.query.filter_by(receive_id=receive_id, is_read=0).filter(
             Messages.send_id != 6).all()
-
+        offline_messages_send = Messages.query.filter_by(send_id=receive_id, is_read=0).filter(
+            Messages.send_id != 6).all()
+        offline_messages = list(set(offline_messages_receive + offline_messages_send))
+        offline_messages = sorted(offline_messages, key=lambda x: x.send_time)
         # 将未读消息发送给接收者
         for message in offline_messages:
             emit('response',
-                 {'code': 200, 'message': message.message, 'send_id': str(message.send_id), 'type': message.type,
-                  'message_id': str(message.id), 'send_time': time_transform(message.send_time)},
-                 room=receive_id)
+                 {'code': 200, 'message': message.message, 'send_id': str(message.send_id),
+                  'receive_id': str(message.receive_id),
+                  'type': message.type, 'message_id': str(message.id),
+                  'send_time': time_transform(message.send_time, True)},
+                 room=f'{receive_id}')

project/api/chat/read.py

@@ -16,8 +16,7 @@ def put(self):
         args = parser.parse_args()
         send_id = args.get('send_id')
         message_id = args.get('message_id')
-        message = db.session.query(Messages).filter_by(id=message_id, send_id=send_id, receive_id=request.payload_id,
-                                                       is_read=0).first()
+        message = db.session.query(Messages).filter_by(id=message_id, send_id=send_id, is_read=0).first()
         if message:
             message.is_read = 1
             db.session.commit()

project/requirements.txt

@@ -64,6 +64,7 @@ pytz==2023.3
 pywin32-ctypes==0.2.1
 PyYAML==6.0
 qiniu==7.10.0
+redis==4.6.0
 requests==2.28.2
 shellescape==3.8.1
 six==1.16.0

project/utils/Time_Transform.py

@@ -2,7 +2,17 @@
 import datetime
 
 
-def time_transform(timestamp):
+def time_transform(timestamp, is_msg=False):
     local_time = timestamp + datetime.timedelta(hours=8)  # 加上8小时是因为中国位于UTC+8时区
-    local_time_str = local_time.strftime('%Y-%m-%d %H:%M:%S')
+    if is_msg:
+        if local_time.date() == datetime.datetime.now().date():
+            local_time_str = local_time.strftime('%H:%M')
+        elif local_time.year == datetime.datetime.now().year:
+            local_time_str = local_time.strftime('%m-%d')
+        elif (local_time + datetime.timedelta(days=1)).date() == datetime.datetime.now().date():
+            local_time_str = local_time.strftime('昨天')
+        else:
+            local_time_str = local_time.strftime('%Y-%m-%d')
+    else:
+        local_time_str = local_time.strftime('%Y-%m-%d %H:%M:%S')
     return local_time_str