mdbq 4.1.1__py3-none-any.whl → 4.1.3__py3-none-any.whl

mdbq/route/monitor.py

@@ -21,7 +21,7 @@ from typing import Dict, Any
 from urllib.parse import urlparse
 from dbutils.pooled_db import PooledDB # type: ignore
 from mdbq.myconf import myconf # type: ignore
-from mdbq.log import mylogger
+# from mdbq.log import mylogger
 from flask import request, g
 import re
 import ipaddress
@@ -33,17 +33,17 @@ host, port, username, password = parser.get_section_values(
     keys=['host', 'port', 'username', 'password'],
 )
 
-logger = mylogger.MyLogger(
-    logging_mode='file',
-    log_level='info',
-    log_format='json',
-    max_log_size=50,
-    backup_count=5,
-    enable_async=False,  # 是否启用异步日志
-    sample_rate=1,  # 采样DEBUG/INFO日志
-    sensitive_fields=[],  #  敏感字段过滤
-    enable_metrics=False,  # 是否启用性能指标
-)
+# logger = mylogger.MyLogger(
+#     logging_mode='file',
+#     log_level='info',
+#     log_format='json',
+#     max_log_size=50,
+#     backup_count=5,
+#     enable_async=False,  # 是否启用异步日志
+#     sample_rate=1,  # 采样DEBUG/INFO日志
+#     sensitive_fields=[],  #  敏感字段过滤
+#     enable_metrics=False,  # 是否启用性能指标
+# )
 
 
 class RouteMonitor:
@@ -83,10 +83,10 @@ class RouteMonitor:
                 connection.close()
                 
         except Exception as e:
-            logger.error("❌ 数据库连接池初始化失败", {
-                "错误信息": str(e),
-                "数据库": self.database
-            })
+            # logger.error("数据库连接池初始化失败", {
+            #     "错误信息": str(e),
+            #     "数据库": self.database
+            # })
             raise
     
     def ensure_database_context(self, cursor):
@@ -94,22 +94,16 @@ class RouteMonitor:
         try:
             cursor.execute(f"USE `{self.database}`")
         except Exception as e:
-            logger.warning("切换数据库上下文失败，尝试重新创建", {
-                "数据库": self.database,
-                "错误": str(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,
-                "数据库": self.database
-            })
-            
             connection = self.pool.connection()
             try:
                 with connection.cursor() as cursor:
@@ -244,23 +238,17 @@ class RouteMonitor:
                         COMMENT='系统性能统计表';
                     """)
                 connection.commit()
-                logger.debug("🎯 所有数据库表结构初始化完成", {
-                    "创建表数": 4,
-                    "操作状态": "成功",
-                    "数据库": self.database,
-                    "数据库引擎": "InnoDB"
-                })
                 
             finally:
                 connection.close()
                 
         except Exception as e:
-            logger.error("❌ 数据库表结构初始化失败", {
-                "错误信息": str(e),
-                "错误类型": type(e).__name__,
-                "数据库": self.database,
-                "影响": "监控系统可能无法正常工作"
-            })
+            # logger.error("数据库表结构初始化失败", {
+            #     "错误信息": str(e),
+            #     "错误类型": type(e).__name__,
+            #     "数据库": self.database,
+            #     "影响": "监控系统可能无法正常工作"
+            # })
             # 静默处理初始化错误，避免影响主应用
             pass
     
@@ -434,25 +422,9 @@ class RouteMonitor:
         
         # 设置请求ID到全局变量中，供后续使用
         g.request_id = request_id
-        
-        logger.debug("📋 开始收集请求数据", {
-            "请求ID": request_id,
-            "请求方法": request.method,
-            "端点": request.endpoint or request.path,
-            "客户端IP": request.remote_addr
-        })
-        
         # 获取真实IP
         real_ip, forwarded_ips = self.get_real_ip(request)
         
-        if real_ip != request.remote_addr:
-            logger.debug("🔍 检测到IP转发", {
-                "请求ID": request_id,
-                "原始IP": request.remote_addr,
-                "真实IP": real_ip,
-                "转发链长度": len(forwarded_ips) if forwarded_ips else 0
-            })
-        
         # 获取请求头信息
         headers = dict(request.headers)
         sanitized_headers = self.sanitize_data(headers)
@@ -479,25 +451,15 @@ class RouteMonitor:
                             request_body = body_data.decode('utf-8')
                         except UnicodeDecodeError:
                             request_body = f"[BINARY_DATA:{len(body_data)}_bytes]"
-                            logger.debug("📁 检测到二进制数据", {
-                                "请求ID": request_id,
-                                "数据大小": len(body_data),
-                                "处理方式": "标记为二进制"
-                            })
                 
                 if request_body:
                     request_size = len(str(request_body).encode('utf-8'))
-                    logger.debug("📊 请求体信息", {
-                        "请求ID": request_id,
-                        "数据类型": "JSON" if request.is_json else "表单" if request.form else "文本",
-                        "大小": f"{request_size} bytes"
-                    })
         except Exception as e:
             request_body = "[ERROR_READING_BODY]"
-            logger.warning("⚠️ 读取请求体失败", {
-                "请求ID": request_id,
-                "错误": str(e)
-            })
+            # logger.warning("读取请求体失败", {
+            #     "请求ID": request_id,
+            #     "错误": str(e)
+            # })
         
         # 清理敏感数据
         sanitized_body = self.sanitize_data(request_body)
@@ -506,21 +468,6 @@ class RouteMonitor:
         # 设备信息提取
         user_agent = request.headers.get('User-Agent', '')
         device_info = self.extract_device_info(user_agent)
-        
-        if device_info['is_bot']:
-            logger.debug("🤖 检测到机器人请求", {
-                "请求ID": request_id,
-                "用户代理": user_agent[:100] + "..." if len(user_agent) > 100 else user_agent,
-                "IP": real_ip
-            })
-        
-        if device_info['is_mobile']:
-            logger.debug("📱 检测到移动设备请求", {
-                "请求ID": request_id,
-                "操作系统": device_info['os_name'],
-                "浏览器": device_info['browser_name']
-            })
-        
         # URL解析
         parsed_url = urlparse(request.url)
         
@@ -559,14 +506,6 @@ class RouteMonitor:
             'os_version': device_info['os_version'],
         }
         
-        logger.debug("✅ 请求数据收集完成", {
-            "请求ID": request_id,
-            "数据字段数": len(request_data),
-            "请求大小": f"{request_size} bytes",
-            "设备类型": "移动" if device_info['is_mobile'] else "桌面",
-            "是否机器人": device_info['is_bot']
-        })
-        
         return request_data
     
     def mask_token(self, token: str) -> str:
@@ -591,13 +530,6 @@ class RouteMonitor:
             if response_data:
                 request_data.update(response_data)
             
-            logger.debug("💾 保存请求日志到数据库", {
-                "请求ID": request_id,
-                "端点": request_data.get('endpoint', ''),
-                "状态码": request_data.get('response_status', '未知'),
-                "处理时间": f"{request_data.get('process_time', 0)}ms"
-            })
-            
             connection = self.pool.connection()
             try:
                 with connection.cursor() as cursor:
@@ -616,39 +548,26 @@ class RouteMonitor:
                     cursor.execute(sql, list(request_data.values()))
                 connection.commit()
                 
-                logger.debug("✅ 请求日志保存成功", {
-                    "请求ID": request_id,
-                    "写入状态": "成功",
-                    "数据库表": "api_request_logs"
-                })
-                
             finally:
                 connection.close()
                 
         except Exception as e:
-            logger.error("❌ 保存请求日志失败", {
-                "请求ID": request_id,
-                "错误信息": str(e),
-                "错误类型": type(e).__name__,
-                "影响": "日志丢失，但不影响主业务"
-            })
+            # logger.error("保存请求日志失败", {
+            #     "请求ID": request_id,
+            #     "错误信息": str(e),
+            #     "错误类型": type(e).__name__,
+            #     "影响": "日志丢失，但不影响主业务"
+            # })
             # 静默处理错误，不影响主业务
             pass
     
     def update_statistics(self, request_data: Dict[str, Any]):
         """更新统计数据"""
         request_id = request_data.get('request_id', 'unknown')
-        endpoint = request_data.get('endpoint', '')
-        status_code = request_data.get('response_status', 500)
+        # endpoint = request_data.get('endpoint', '')
+        # status_code = request_data.get('response_status', 500)
         
         try:
-            logger.debug("📈 更新统计数据", {
-                "请求ID": request_id,
-                "端点": endpoint,
-                "状态码": status_code,
-                "统计类型": "API访问统计和IP统计"
-            })
-            
             connection = self.pool.connection()
             try:
                 with connection.cursor() as cursor:
@@ -705,23 +624,16 @@ class RouteMonitor:
                     
                 connection.commit()
                 
-                logger.debug("✅ 统计数据更新成功", {
-                    "请求ID": request_id,
-                    "更新表": "api_access_statistics, ip_access_statistics",
-                    "日期": str(date),
-                    "小时": hour
-                })
-                
             finally:
                 connection.close()
                 
         except Exception as e:
-            logger.error("❌ 更新统计数据失败", {
-                "请求ID": request_id,
-                "错误信息": str(e),
-                "错误类型": type(e).__name__,
-                "影响": "统计数据缺失，但不影响主业务"
-            })
+            # logger.error("更新统计数据失败", {
+            #     "请求ID": request_id,
+            #     "错误信息": str(e),
+            #     "错误类型": type(e).__name__,
+            #     "影响": "统计数据缺失，但不影响主业务"
+            # })
             # 静默处理错误
             pass
 
@@ -737,14 +649,6 @@ class RouteMonitor:
             request_data = self.collect_request_data(request)
             request_id = request_data.get('request_id', 'unknown')
             
-            logger.debug("🎯 开始监控请求", {
-                "请求ID": request_id,
-                "函数名": func.__name__,
-                "端点": request_data.get('endpoint', ''),
-                "方法": request_data.get('method', ''),
-                "来源IP": request_data.get('real_ip', request_data.get('client_ip'))
-            })
-            
             try:
                 # 执行原函数
                 response = func(*args, **kwargs)
@@ -774,16 +678,6 @@ class RouteMonitor:
                     'process_time': process_time,
                     'response_size': response_size
                 }
-                
-                logger.debug("✅ 请求处理完成", {
-                    "请求ID": request_id,
-                    "函数名": func.__name__,
-                    "状态码": response_status,
-                    "处理时间": f"{process_time}ms",
-                    "响应大小": f"{response_size} bytes",
-                    "结果": "成功"
-                })
-                
                 # 保存日志
                 self.save_request_log(request_data, response_data)
                 
@@ -805,14 +699,14 @@ class RouteMonitor:
                     'response_size': 0
                 }
                 
-                logger.error("❌ 请求处理异常", {
-                    "请求ID": request_id,
-                    "函数名": func.__name__,
-                    "错误信息": str(e),
-                    "错误类型": type(e).__name__,
-                    "处理时间": f"{process_time}ms",
-                    "结果": "异常"
-                })
+                # logger.error("请求处理异常", {
+                #     "请求ID": request_id,
+                #     "函数名": func.__name__,
+                #     "错误信息": str(e),
+                #     "错误类型": type(e).__name__,
+                #     "处理时间": f"{process_time}ms",
+                #     "结果": "异常"
+                # })
                 
                 # 保存错误日志
                 self.save_request_log(request_data, error_data)
@@ -829,11 +723,6 @@ class RouteMonitor:
     def get_statistics_summary(self, days: int = 7) -> Dict[str, Any]:
         """获取统计摘要"""
         try:
-            logger.debug("📊 开始获取统计摘要", {
-                "查询天数": days,
-                "操作": "统计数据查询"
-            })
-            
             connection = self.pool.connection()
             try:
                 with connection.cursor() as cursor:
@@ -843,12 +732,6 @@ class RouteMonitor:
                     end_date = datetime.now().date()
                     start_date = end_date - timedelta(days=days)
                     
-                    logger.debug("📅 统计查询时间范围", {
-                        "开始日期": str(start_date),
-                        "结束日期": str(end_date),
-                        "查询天数": days
-                    })
-                    
                     # 总体统计
                     cursor.execute("""
                         SELECT 
@@ -862,15 +745,6 @@ class RouteMonitor:
                     """, (start_date, end_date))
                     
                     summary = cursor.fetchone() or {}
-                    
-                    logger.debug("📈 总体统计查询完成", {
-                        "总请求数": 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
-                    })
-                    
                     # 热门端点
                     cursor.execute("""
                         SELECT endpoint, SUM(total_requests) as requests
@@ -883,12 +757,6 @@ class RouteMonitor:
                     
                     top_endpoints = cursor.fetchall()
                     
-                    logger.debug("🔥 热门端点查询完成", {
-                        "查询结果数": len(top_endpoints),
-                        "最热门端点": top_endpoints[0]['endpoint'] if top_endpoints else "无数据",
-                        "最高请求数": top_endpoints[0]['requests'] if top_endpoints else 0
-                    })
-                    
                     # 活跃IP统计
                     cursor.execute("""
                         SELECT COUNT(DISTINCT ip_address) as unique_ips,
@@ -899,11 +767,6 @@ class RouteMonitor:
                     
                     ip_stats = cursor.fetchone() or {}
                     
-                    logger.debug("🌐 IP统计查询完成", {
-                        "唯一IP数": ip_stats.get('unique_ips', 0),
-                        "IP总请求数": ip_stats.get('total_ip_requests', 0)
-                    })
-                    
                     result = {
                         'period': f'{start_date} to {end_date}',
                         'summary': summary,
@@ -911,24 +774,18 @@ class RouteMonitor:
                         'ip_statistics': ip_stats
                     }
                     
-                    logger.debug("✅ 统计摘要获取成功", {
-                        "查询天数": days,
-                        "数据完整性": "完整",
-                        "结果状态": "成功"
-                    })
-                    
                     return result
                     
             finally:
                 connection.close()
                     
         except Exception as e:
-            logger.error("❌ 获取统计摘要失败", {
-                "查询天数": days,
-                "错误信息": str(e),
-                "错误类型": type(e).__name__,
-                "影响": "统计摘要不可用"
-            })
+            # logger.error("获取统计摘要失败", {
+            #     "查询天数": days,
+            #     "错误信息": str(e),
+            #     "错误类型": type(e).__name__,
+            #     "影响": "统计摘要不可用"
+            # })
             return {'error': str(e)}
 
 

{mdbq-4.1.1.dist-info → mdbq-4.1.3.dist-info}/METADATA

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

{mdbq-4.1.1.dist-info → mdbq-4.1.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=scLHfwgFS5UlkGjTsblO74Ns5QYJDmf8VLUiSEe1i5k,17
+mdbq/__version__.py,sha256=Jjk9_jrwEIRLu3zYAhoUXB_8XlsokRJUl6DPuo2urQw,17
 mdbq/auth/__init__.py,sha256=pnPMAt63sh1B6kEvmutUuro46zVf2v2YDAG7q-jV_To,24
 mdbq/auth/auth_backend.py,sha256=u8qwMNjAdDliaaFzfulVqQIoFrIJhe980OdYwTIVKJg,99750
 mdbq/auth/crypto.py,sha256=fcZRFCnrKVVdWDUx_zds51ynFYwS9DBvJOrRQVldrfM,15931
@@ -9,13 +9,13 @@ mdbq/js/jc.py,sha256=6Rgf1WqaJJ1oevpn-pt08gXKbX5hjoQaV6uZGCAGbYw,13177
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
 mdbq/log/mylogger.py,sha256=DyBftCMNLe1pTTXsa830pUtDISJxpJHFIradYtE3lFA,26418
 mdbq/myconf/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
-mdbq/myconf/myconf.py,sha256=rHvQCnQRKhQ49AZBke-Z4v28hyOLmHt4MylIuB0H6yA,33516
+mdbq/myconf/myconf.py,sha256=x_9mS6wOfKVjCVElbruxj2yjzitbyKiTkf59quG-5Zg,32529
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
-mdbq/mysql/deduplicator.py,sha256=Sfv5vgMk703luYeNwm-p5kOiKJ3fa6bm1ltc2Q6pOv4,73144
+mdbq/mysql/deduplicator.py,sha256=2fugLyKs_xkvYvoG0C0hRYbJ_w8-4oa1FJ_vavoD7Qo,73084
 mdbq/mysql/mysql.py,sha256=pDg771xBugCMSTWeskIFTi3pFLgaqgyG3smzf-86Wn8,56772
-mdbq/mysql/s_query.py,sha256=nwhyqbxq-V0sGUJbdjiUDEwjpDxiKrzG0PjV6wkrWU4,50474
+mdbq/mysql/s_query.py,sha256=N2xHJf2CiUXjXIVBemdst-wamIP3908EGAJOFG13fCU,50475
 mdbq/mysql/unique_.py,sha256=MaztT-WIyEQUs-OOYY4pFulgHVcXR1BfCy3QUz0XM_U,21127
-mdbq/mysql/uploader.py,sha256=xodmN3f5pT1T2yJu01ckgYb_THE__rm81kgNJfqtinc,111530
+mdbq/mysql/uploader.py,sha256=FG_4btNwTjbCqZFeIigCfar7r-OOA7VkyuJsOOC9WLw,111539
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/other/download_sku_picture.py,sha256=X66sVdvVgzoNzmgVJyPtd7bjEvctEKtLPblEPF65EWc,46940
 mdbq/other/error_handler.py,sha256=4p5haAXSY-P78stp4Xwo_MwAngWYqyKj5ogWIuYXMeY,12631
@@ -26,16 +26,16 @@ mdbq/pbix/__init__.py,sha256=Trtfaynu9RjoTyLLYBN2xdRxTvm_zhCniUkVTAYwcjo,24
 mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,2396
 mdbq/pbix/refresh_all.py,sha256=OBT9EewSZ0aRS9vL_FflVn74d4l2G00wzHiikCC4TC0,5926
 mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
-mdbq/redis/getredis.py,sha256=vpBuNc22uj9Vr-_Dh25_wpwWM1e-072EAAIBdB_IpL0,23494
-mdbq/redis/redis_cache.py,sha256=2uhAmG9FYHjzByZEg7o8fFFxuF6AnOASVvjdAM4Gx5E,35719
+mdbq/redis/getredis.py,sha256=vdg7YQEjhoMp5QzxygNGx5DQKRnePrcwPYgUrDypA6g,23672
+mdbq/redis/redis_cache.py,sha256=hjl-oh1r0ONdMeWN28cTMsdkcjc7HG71NmGZ9H6jWUE,34559
 mdbq/route/__init__.py,sha256=BT_dAY7V-U2o72bevq1B9Mq9QA7GodwtkxyLNdGaoE8,22
 mdbq/route/analytics.py,sha256=dngj5hVwKddEUy59nSYbOoJ9C7OVrtCmCkvW6Uj9RYM,28097
-mdbq/route/monitor.py,sha256=8uscuoJF4eMr5o8cAqywQv868m1yIGCuK1l4ZWN6KPE,42954
+mdbq/route/monitor.py,sha256=lyowGUU8c2GykeZLrdxd7nXpNMqXWcOsuQsbS8l0pwU,36595
 mdbq/route/routes.py,sha256=QVGfTvDgu0CpcKCvk1ra74H8uojgqTLUav1fnVAqLEA,29433
 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.1.1.dist-info/METADATA,sha256=rzWQJ-S41aNeXEWiDaRs6WJ4b_OAssSJIP8ZXe4843U,363
-mdbq-4.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mdbq-4.1.1.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.1.1.dist-info/RECORD,,
+mdbq-4.1.3.dist-info/METADATA,sha256=9NMHciONJynTrghvSivIGIOTpBkPaiF4FlS-spIRbXc,363
+mdbq-4.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mdbq-4.1.3.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.1.3.dist-info/RECORD,,