更新后台管理消息列表;

backend/app/services/message_service.py

@@ -1,18 +1,18 @@
-#!/usr/bin/env python3
 """
 消息服务
 提供加载会话存档、解密、保存到数据库的整合功能
 """
 
-import asyncio
 import json
 import os
+import sys
 import logging
 import base64
+
 from pathlib import Path
 from datetime import datetime
 from typing import List, Dict, Any, Optional
-import sys
+
 
 # 添加scripts目录到路径
 sys.path.insert(0, str(Path(__file__).parent.parent.parent / "scripts"))
@@ -22,6 +22,9 @@ from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import padding
 from cryptography.hazmat.backends import default_backend
 
+
+from app.models.message import Message
+
 logger = logging.getLogger(__name__)
 
 
@@ -36,10 +39,8 @@ class MessageService:
             corpid: 企业ID，如果为None则从环境变量CORPID读取
             secret: 聊天内容存档的Secret，如果为None则从环境变量WEWORK_SECRET读取
         """
-        self.corpid = corpid or os.getenv("CORPID", "wwdf65802ca25ec195")
-        self.secret = secret or os.getenv(
-            "WEWORK_SECRET", "-Ta6WMWxBhfGolWnnlO15nQckj3DRKAowUOdX2fwvzE"
-        )
+        self.corpid = corpid or os.getenv("CORPID", "")
+        self.secret = secret or os.getenv("WEWORK_SECRET", "")
 
         # SDK实例（延迟初始化）
         self._sdk: Optional[WeWorkFinanceSDK] = None
@@ -266,25 +267,6 @@ class MessageService:
         logger.info(f"开始将 {len(messages)} 条消息存储到数据库...")
 
         try:
-            # 导入数据库相关模块
-            from pymongo import AsyncMongoClient
-            from beanie import init_beanie
-            from app.models import models
-            from app.models.message import Message
-
-            # 从环境变量获取数据库配置
-            mongodb_url = os.getenv(
-                "MONGODB_URL",
-                "mongodb://dblink:mgdb4link@localhost:27017/?authSource=admin",
-            )
-            database_name = os.getenv("DATABASE_NAME", "douba_chat_dev")
-
-            # 初始化数据库连接
-            client = AsyncMongoClient(mongodb_url)
-            await init_beanie(database=client[database_name], document_models=models)
-
-            logger.info(f"数据库连接成功: {database_name}")
-
             # 批量处理消息
             batch_size = 100
             for i in range(0, len(messages), batch_size):
@@ -352,9 +334,6 @@ class MessageService:
                         logger.error(f"批量插入失败: {e}")
                         stats["failed"] += len(new_messages)
 
-            # 关闭数据库连接
-            await client.close()
-
             logger.info(f"数据库存储完成:")
             logger.info(f"  总计消息: {stats['total_messages']}")
             logger.info(f"  成功存储: {stats['saved']}")
@@ -392,23 +371,6 @@ class MessageService:
             分页查询结果
         """
         try:
-            # 导入数据库相关模块
-            from pymongo import AsyncMongoClient
-            from beanie import init_beanie
-            from app.models import models
-            from app.models.message import Message
-
-            # 从环境变量获取数据库配置
-            mongodb_url = os.getenv(
-                "MONGODB_URL",
-                "mongodb://dblink:mgdb4link@localhost:27017/?authSource=admin",
-            )
-            database_name = os.getenv("DATABASE_NAME", "douba_chat_dev")
-
-            # 初始化数据库连接
-            client = AsyncMongoClient(mongodb_url)
-            await init_beanie(database=client[database_name], document_models=models)
-
             # 构建查询条件
             query = {}
             if msgtype:
@@ -432,8 +394,12 @@ class MessageService:
             # 获取总记录数
             total_count = await Message.find(query).count()
 
-            # 关闭数据库连接
-            await client.close()
+            # 记录成功日志
+            logger.info(
+                f"成功查询消息列表: 查询条件={query}, "
+                f"页码={page}, 每页数量={page_size}, "
+                f"总记录数={total_count}, 返回记录数={len(messages)}"
+            )
 
             # 准备响应数据
             return {
@@ -519,6 +485,7 @@ class MessageService:
                         "decrypted_failed": 0,
                         "saved_count": 0,
                         "duplicates_skipped": 0,
+                        "seq": seq,
                         "max_seq": seq,
                         "next_seq": seq,
                     },
@@ -552,6 +519,7 @@ class MessageService:
                     "saved_count": db_stats["saved"],
                     "duplicates_skipped": db_stats["skipped_duplicates"],
                     "failed_to_save": db_stats["failed"],
+                    "seq": seq,
                     "max_seq": max_seq,
                     "next_seq": max_seq + 1 if total_fetched > 0 else seq,
                 },