mdbq 4.0.82__py3-none-any.whl → 4.0.84__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.0.82'
+VERSION = '4.0.84'

mdbq/route/monitor.py

@@ -50,34 +50,20 @@ logger = mylogger.MyLogger(
 class RouteMonitor:
     """路由监控核心类"""
     
-    def __init__(self, pool=None):
+    def __init__(self, database='api_monitor_logs'):
         """初始化监控系统"""
-        if pool is not None:
-            self.pool = pool
-        else:
-            self.init_database_pool()
-        
+        self.database = database
+        self.init_database_pool()
         self.init_database_tables()
-        logger.debug("✨ 路由监控系统初始化完成", {
-            "数据库表": "已创建/验证",
-            "系统状态": "就绪"
-        })
-        
+
     def init_database_pool(self):
         """初始化数据库连接池"""
         try:
-            logger.debug("📊 初始化数据库连接池", {
-                "主机": host,
-                "端口": port,
-                "用户": username,
-                "最大连接数": 3
-            })
-            
             self.pool = PooledDB(
                 creator=pymysql,
-                maxconnections=3,  # 最大连接数
-                mincached=1,  # 初始化空闲连接数
-                maxcached=3,  # 空闲连接最大缓存数
+                maxconnections=2,  # 监控系统连接数较小
+                mincached=1,
+                maxcached=2,
                 blocking=True,
                 host=host,
                 port=int(port),
@@ -87,36 +73,55 @@ class RouteMonitor:
                 charset='utf8mb4',
                 cursorclass=pymysql.cursors.DictCursor
             )
-            
-            logger.info("✅ 数据库连接池创建成功", {
-                "连接池状态": "已初始化",
-                "字符集": "utf8mb4"
-            })
-            
+
+            # 创建数据库并切换
+            connection = self.pool.connection()
+            try:
+                with connection.cursor() as cursor:
+                    cursor.execute(f"CREATE DATABASE IF NOT EXISTS `{self.database}` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci")
+                    cursor.execute(f"USE `{self.database}`")
+            finally:
+                connection.close()
+                
         except Exception as e:
             logger.error("❌ 数据库连接池初始化失败", {
                 "错误信息": str(e),
-                "主机": host,
-                "端口": port
+                "数据库": self.database
             })
             raise
+    
+    def ensure_database_context(self, cursor):
+        """确保当前游标处于正确的数据库上下文中"""
+        try:
+            cursor.execute(f"USE `{self.database}`")
+        except Exception as e:
+            logger.warning("切换数据库上下文失败，尝试重新创建", {
+                "数据库": self.database,
+                "错误": str(e)
+            })
+            cursor.execute(f"CREATE DATABASE IF NOT EXISTS `{self.database}` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci")
+            cursor.execute(f"USE `{self.database}`")
         
     def init_database_tables(self):
         """初始化数据库表结构"""
         try:
             logger.debug("🗄️ 开始创建/验证数据库表结构", {
                 "操作": "表结构初始化",
-                "预期表数": 4
+                "预期表数": 4,
+                "数据库": self.database
             })
             
             connection = self.pool.connection()
             try:
                 with connection.cursor() as cursor:
+                    # 确保使用正确的数据库上下文
+                    self.ensure_database_context(cursor)
+                    
                     # 创建详细请求记录表 - 修复MySQL 8.4+兼容性
                     cursor.execute("""
                         CREATE TABLE IF NOT EXISTS `api_request_logs` (
                             `id` BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
-                            `request_id` VARCHAR(64) NOT NULL COMMENT '请求唯一标识',
+                            `request_id` VARCHAR(128) NOT NULL COMMENT '请求唯一标识',
                             `timestamp` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '请求时间（精确到毫秒）',
                             `method` VARCHAR(10) NOT NULL COMMENT 'HTTP方法',
                             `endpoint` VARCHAR(500) NOT NULL COMMENT '请求端点',
@@ -138,10 +143,10 @@ class RouteMonitor:
                             `process_time` DECIMAL(10,3) COMMENT '处理时间（毫秒）',
                             `session_id` VARCHAR(128) COMMENT '会话ID',
                             `user_id` VARCHAR(64) COMMENT '用户ID',
-                            `auth_token` VARCHAR(255) COMMENT '认证令牌（脱敏）',
-                            `device_fingerprint` VARCHAR(128) COMMENT '设备指纹',
+                            `auth_token` TEXT COMMENT '认证令牌（脱敏）',
+                            `device_fingerprint` VARCHAR(256) COMMENT '设备指纹',
                             `device_info` JSON COMMENT '设备信息',
-                            `geo_country` VARCHAR(50) COMMENT '地理位置-国家',
+                            `geo_country` VARCHAR(100) COMMENT '地理位置-国家',
                             `geo_region` VARCHAR(100) COMMENT '地理位置-地区',
                             `geo_city` VARCHAR(100) COMMENT '地理位置-城市',
                             `is_bot` BOOLEAN DEFAULT FALSE COMMENT '是否为机器人',
@@ -164,12 +169,6 @@ class RouteMonitor:
                         ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci 
                         COMMENT='API请求详细日志表';
                     """)
-                    
-                    logger.debug("✅ api_request_logs 表创建/验证成功", {
-                        "表名": "api_request_logs",
-                        "用途": "API请求详细日志"
-                    })
-                    
                     # 创建访问统计汇总表
                     cursor.execute("""
                         CREATE TABLE IF NOT EXISTS `api_access_statistics` (
@@ -200,11 +199,6 @@ class RouteMonitor:
                         COMMENT='API访问统计汇总表';
                     """)
                     
-                    logger.debug("✅ api_access_statistics 表创建/验证成功", {
-                        "表名": "api_access_statistics",
-                        "用途": "API访问统计汇总"
-                    })
-                    
                     # 创建IP访问统计表
                     cursor.execute("""
                         CREATE TABLE IF NOT EXISTS `ip_access_statistics` (
@@ -232,12 +226,6 @@ class RouteMonitor:
                         ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci 
                         COMMENT='IP访问统计表';
                     """)
-                    
-                    logger.debug("✅ ip_access_statistics 表创建/验证成功", {
-                        "表名": "ip_access_statistics",
-                        "用途": "IP访问统计"
-                    })
-                    
                     # 创建系统性能统计表
                     cursor.execute("""
                         CREATE TABLE IF NOT EXISTS `system_performance_stats` (
@@ -256,16 +244,11 @@ class RouteMonitor:
                         ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci 
                         COMMENT='系统性能统计表';
                     """)
-                    
-                    logger.debug("✅ system_performance_stats 表创建/验证成功", {
-                        "表名": "system_performance_stats",
-                        "用途": "系统性能统计"
-                    })
-                    
                 connection.commit()
-                logger.info("🎯 所有数据库表结构初始化完成", {
+                logger.debug("🎯 所有数据库表结构初始化完成", {
                     "创建表数": 4,
                     "操作状态": "成功",
+                    "数据库": self.database,
                     "数据库引擎": "InnoDB"
                 })
                 
@@ -276,6 +259,7 @@ class RouteMonitor:
             logger.error("❌ 数据库表结构初始化失败", {
                 "错误信息": str(e),
                 "错误类型": type(e).__name__,
+                "数据库": self.database,
                 "影响": "监控系统可能无法正常工作"
             })
             # 静默处理初始化错误，避免影响主应用
@@ -615,6 +599,9 @@ class RouteMonitor:
             connection = self.pool.connection()
             try:
                 with connection.cursor() as cursor:
+                    # 确保使用正确的数据库上下文
+                    self.ensure_database_context(cursor)
+                    
                     # 插入请求日志
                     columns = ', '.join([f"`{key}`" for key in request_data.keys()])
                     placeholders = ', '.join(['%s'] * len(request_data))
@@ -663,6 +650,9 @@ class RouteMonitor:
             connection = self.pool.connection()
             try:
                 with connection.cursor() as cursor:
+                    # 确保使用正确的数据库上下文
+                    self.ensure_database_context(cursor)
+                    
                     now = datetime.now()
                     date = now.date()
                     hour = now.hour
@@ -832,6 +822,9 @@ class RouteMonitor:
             connection = self.pool.connection()
             try:
                 with connection.cursor() as cursor:
+                    # 确保使用正确的数据库上下文
+                    self.ensure_database_context(cursor)
+                    
                     end_date = datetime.now().date()
                     start_date = end_date - timedelta(days=days)
                     
@@ -856,11 +849,11 @@ class RouteMonitor:
                     summary = cursor.fetchone() or {}
                     
                     logger.debug("📈 总体统计查询完成", {
-                        "总请求数": summary.get('total_requests', 0),
-                        "成功请求数": summary.get('success_requests', 0),
-                        "错误请求数": summary.get('error_requests', 0),
-                        "平均响应时间": f"{summary.get('avg_response_time', 0):.2f}ms",
-                        "唯一端点数": summary.get('unique_endpoints', 0)
+                        "总请求数": summary.get('total_requests', 0) or 0,
+                        "成功请求数": summary.get('success_requests', 0) or 0,
+                        "错误请求数": summary.get('error_requests', 0) or 0,
+                        "平均响应时间": f"{(summary.get('avg_response_time', 0) or 0):.2f}ms",
+                        "唯一端点数": summary.get('unique_endpoints', 0) or 0
                     })
                     
                     # 热门端点
@@ -937,4 +930,4 @@ def get_request_id():
 
 def get_statistics_summary(days: int = 7):
     """获取统计摘要"""
-    return route_monitor.get_statistics_summary(days) 
+    return route_monitor.get_statistics_summary(days)

{mdbq-4.0.82.dist-info → mdbq-4.0.84.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mdbq
-Version: 4.0.82
+Version: 4.0.84
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-4.0.82.dist-info → mdbq-4.0.84.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=EhiuwCH5w9iu_L2CjC33SiyfBk24L8BEGAIfGV49q3E,18
+mdbq/__version__.py,sha256=DKEREjda7Yk0ZlFGiwLx16SrhlGu8IWp1Fi03ZFRPMY,18
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
 mdbq/log/mylogger.py,sha256=DyBftCMNLe1pTTXsa830pUtDISJxpJHFIradYtE3lFA,26418
 mdbq/myconf/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -23,12 +23,12 @@ mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=vpBuNc22uj9Vr-_Dh25_wpwWM1e-072EAAIBdB_IpL0,23494
 mdbq/route/__init__.py,sha256=M0NZuQ7-112l8K2h1eayVvSmvQrufrOcD5AYKgIf_Is,1
 mdbq/route/analytics.py,sha256=iJ-LyE_LNICg4LB9XOd0L-N3Ucfl6BWUTVu9jUNAplg,28069
-mdbq/route/monitor.py,sha256=jO5QnlZeug7SIbwm4DS7dIhfoYu4iF2rVPcoLobg6u4,42194
+mdbq/route/monitor.py,sha256=UNcnYSaT8IauiUn9NKkC3zY5yhObcUwnxfuoD4Rq_T4,42198
 mdbq/route/routes.py,sha256=DHJg0eRNi7TKqhCHuu8ia3vdQ8cTKwrTm6mwDBtNboM,19111
 mdbq/selenium/__init__.py,sha256=AKzeEceqZyvqn2dEDoJSzDQnbuENkJSHAlbHAD0u0ZI,10
 mdbq/selenium/get_driver.py,sha256=1NTlVUE6QsyjTrVVVqTO2LOnYf578ccFWlWnvIXGtic,20903
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-4.0.82.dist-info/METADATA,sha256=jwoqL8TsKwNR_JEcxHOS1UMy4i0cVvHRJs-orjOdy6I,364
-mdbq-4.0.82.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mdbq-4.0.82.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.0.82.dist-info/RECORD,,
+mdbq-4.0.84.dist-info/METADATA,sha256=fWgptYBJiRDu8qJ4GgEU-a8fVMnR89DHoVdEgEmO3Qw,364
+mdbq-4.0.84.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mdbq-4.0.84.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.0.84.dist-info/RECORD,,