mdbq 4.0.104__tar.gz → 4.0.106__tar.gz

{mdbq-4.0.104 → mdbq-4.0.106}/PKG-INFO

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

mdbq-4.0.106/mdbq/__version__.py

@@ -0,0 +1 @@
+VERSION = '4.0.106'

{mdbq-4.0.104 → mdbq-4.0.106}/mdbq/auth/auth_backend.py

@@ -516,13 +516,7 @@ class StandaloneAuthManager:
             
             # 检查账户锁定状态
             current_time = datetime.now()
-            if locked_until:
-                if locked_until.tzinfo is None:
-                    locked_until = locked_until.replace(tzinfo=timezone.utc)
-                elif locked_until.tzinfo != timezone.utc:
-                    locked_until = locked_until.astimezone(timezone.utc)
-                
-                if locked_until > current_time:
+            if locked_until and locked_until > current_time:
                     remaining_seconds = int((locked_until - current_time).total_seconds())
                     self._log_login_attempt(username_or_email, ip_address, user_agent, 'failure', 'account_locked', user_id)
                     self._record_ip_failure(ip_address, 'login')
@@ -849,7 +843,7 @@ class StandaloneAuthManager:
         cursor = conn.cursor()
         
         try:
-            current_time_utc = datetime.now(timezone.utc)
+            current_time = datetime.now()
             
             # 先查询要登出的设备数量
             cursor.execute('''
@@ -864,7 +858,7 @@ class StandaloneAuthManager:
                 UPDATE refresh_tokens 
                 SET is_revoked = 1, revoked_at = %s, revoked_reason = 'logout' 
                 WHERE user_id = %s AND is_revoked = 0
-            ''', (current_time_utc, user_id))
+            ''', (current_time, user_id))
             
             # 停用用户的所有设备会话
             cursor.execute('''
@@ -919,7 +913,7 @@ class StandaloneAuthManager:
             new_salt = secrets.token_hex(32)
             new_password_hash = self._hash_password(new_password, new_salt)
             
-            current_time_utc = datetime.now(timezone.utc)
+            current_time = datetime.now()
             
             # 更新密码
             cursor.execute('''
@@ -934,7 +928,7 @@ class StandaloneAuthManager:
                 UPDATE refresh_tokens 
                 SET is_revoked = 1, revoked_at = %s, revoked_reason = 'password_changed' 
                 WHERE user_id = %s AND is_revoked = 0
-            ''', (current_time_utc, user_id))
+            ''', (current_time, user_id))
             
             # 停用所有设备会话
             cursor.execute('''
@@ -1055,7 +1049,7 @@ class StandaloneAuthManager:
             if len(new_password) < 6:
                 return {'success': False, 'message': '新密码至少需要6个字符'}
             
-            current_time_utc = datetime.now(timezone.utc)
+            current_time = datetime.now()
             
             # 查找有效的重置令牌
             cursor.execute('''
@@ -1064,7 +1058,7 @@ class StandaloneAuthManager:
                 WHERE password_reset_token = %s 
                   AND password_reset_expires > %s
                   AND is_active = 1
-            ''', (reset_token, current_time_utc))
+            ''', (reset_token, current_time))
             
             user = cursor.fetchone()
             if not user:
@@ -1088,7 +1082,7 @@ class StandaloneAuthManager:
                 UPDATE refresh_tokens 
                 SET is_revoked = 1, revoked_at = %s, revoked_reason = 'password_reset' 
                 WHERE user_id = %s AND is_revoked = 0
-            ''', (current_time_utc, user['id']))
+            ''', (current_time, user['id']))
             
             # 停用所有设备会话
             cursor.execute('''
@@ -1133,16 +1127,10 @@ class StandaloneAuthManager:
             
             locked_until = record['locked_until']
             
-            current_time_utc = datetime.now(timezone.utc)
-            if locked_until:
-                if locked_until.tzinfo is None:
-                    locked_until = locked_until.replace(tzinfo=timezone.utc)
-                elif locked_until.tzinfo != timezone.utc:
-                    locked_until = locked_until.astimezone(timezone.utc)
-                
-                if locked_until > current_time_utc:
-                    remaining_seconds = int((locked_until - current_time_utc).total_seconds())
-                    return {
+            current_time = datetime.now()
+            if locked_until and locked_until > current_time:
+                remaining_seconds = int((locked_until - current_time).total_seconds())
+                return {
                         'blocked': True, 
                         'remaining_time': remaining_seconds,
                         'reason': f'IP被锁定，剩余时间: {remaining_seconds}秒'
@@ -1163,7 +1151,7 @@ class StandaloneAuthManager:
         cursor = conn.cursor()
         
         try:
-            now = datetime.now(timezone.utc)
+            now = datetime.now()
             
             cursor.execute('''
                 SELECT failure_count, first_failure, lockout_count
@@ -1179,7 +1167,7 @@ class StandaloneAuthManager:
                 window_start = now - timedelta(minutes=window_minutes)
                 first_failure = record['first_failure']
                 
-                if first_failure and first_failure.replace(tzinfo=timezone.utc) <= window_start:
+                if first_failure and first_failure <= window_start:
                     # 重置计数器
                     cursor.execute('''
                         UPDATE ip_rate_limits 
@@ -1225,14 +1213,14 @@ class StandaloneAuthManager:
     
     def _revoke_device_session(self, cursor, device_session_id, reason='manual'):
         """撤销设备会话"""
-        current_time_utc = datetime.now(timezone.utc)
+        current_time = datetime.now()
         
         # 撤销设备相关的refresh token
         cursor.execute('''
             UPDATE refresh_tokens 
             SET is_revoked = 1, revoked_at = %s, revoked_reason = %s 
             WHERE device_session_id = %s AND is_revoked = 0
-        ''', (current_time_utc, reason, device_session_id))
+        ''', (current_time, reason, device_session_id))
         
         # 停用设备会话
         cursor.execute('''
@@ -1446,7 +1434,7 @@ class StandaloneAuthManager:
         cursor = conn.cursor()
         
         try:
-            current_time_utc = datetime.now(timezone.utc)
+            current_time = datetime.now()
             
             if device_id:
                 # 方式1：通过device_id查找设备（用于设备管理界面）
@@ -1504,7 +1492,7 @@ class StandaloneAuthManager:
                 UPDATE refresh_tokens 
                 SET is_revoked = 1, revoked_at = %s, revoked_reason = %s 
                 WHERE device_session_id = %s AND is_revoked = 0
-            ''', (current_time_utc, logout_reason, device_session_id))
+            ''', (current_time, logout_reason, device_session_id))
             
             # 停用设备会话
             cursor.execute('''
@@ -1537,7 +1525,7 @@ class StandaloneAuthManager:
         cursor = conn.cursor()
         
         try:
-            current_time_utc = datetime.now(timezone.utc)
+            current_time = datetime.now()
             
             if access_token:
                 # 方式1：通过access_token解析出设备会话信息
@@ -1586,7 +1574,7 @@ class StandaloneAuthManager:
                 UPDATE refresh_tokens 
                 SET is_revoked = 1, revoked_at = %s, revoked_reason = 'current_device_logout' 
                 WHERE device_session_id = %s AND is_revoked = 0
-            ''', (current_time_utc, device_session_id))
+            ''', (current_time, device_session_id))
             
             # 停用设备会话
             cursor.execute('''
@@ -1618,7 +1606,7 @@ class StandaloneAuthManager:
         cursor = conn.cursor()
         
         try:
-            current_time_utc = datetime.now(timezone.utc)
+            current_time = datetime.now()
             
             # 通过device_id查找设备，确保属于该用户
             cursor.execute('''
@@ -1639,7 +1627,7 @@ class StandaloneAuthManager:
                 UPDATE refresh_tokens 
                 SET is_revoked = 1, revoked_at = %s, revoked_reason = 'specific_device_logout' 
                 WHERE device_session_id = %s AND is_revoked = 0
-            ''', (current_time_utc, device_session_id))
+            ''', (current_time, device_session_id))
             
             # 停用设备会话
             cursor.execute('''
@@ -1735,8 +1723,8 @@ class StandaloneAuthManager:
         cursor = conn.cursor()
         
         try:
-            current_time_utc = datetime.now(timezone.utc)
-            threshold_time = current_time_utc - timedelta(days=days_threshold)
+            current_time = datetime.now()
+            threshold_time = current_time - timedelta(days=days_threshold)
             
             # 查找不活跃的设备
             cursor.execute('''
@@ -1757,7 +1745,7 @@ class StandaloneAuthManager:
                     WHERE device_session_id IN ({})
                       AND is_revoked = 0
                 '''.format(','.join(['%s'] * len(device_session_ids))), 
-                [current_time_utc] + device_session_ids)
+                [current_time] + device_session_ids)
                 
                 # 停用设备会话
                 cursor.execute('''
@@ -1891,8 +1879,8 @@ class StandaloneAuthManager:
         cursor = conn.cursor()
         
         try:
-            current_time_utc = datetime.now(timezone.utc)
-            threshold_time = current_time_utc - timedelta(days=days_threshold)
+            current_time = datetime.now()
+            threshold_time = current_time - timedelta(days=days_threshold)
             
             if user_id:
                 # 清理特定用户的旧记录

mdbq-4.0.106/mdbq/redis/redis_cache.py

@@ -0,0 +1,578 @@
+# -*- coding: utf-8 -*-
+"""
+Redis智能缓存系统
+
+主要功能：
+1. Redis缓存的CRUD操作
+2. 命名空间隔离
+3. 分布式锁防止缓存击穿
+4. 自动统计分析并提交到MySQL
+5. 缓存健康检查和监控
+
+"""
+
+import json
+import time
+import threading
+import socket
+from datetime import datetime
+from typing import Optional, Dict, Any, List, Union
+import redis
+from mdbq.log import mylogger
+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,
+    sensitive_fields=[],
+    enable_metrics=False,
+)
+
+
+class CacheConfig:
+    """缓存系统配置类"""
+    
+    # TTL配置（秒）
+    DEFAULT_TTL = 3600  # 1小时
+    SHORT_TTL = 300     # 5分钟
+    MEDIUM_TTL = 1800   # 30分钟
+    LONG_TTL = 7200     # 2小时
+    VERY_LONG_TTL = 86400  # 24小时
+    
+    # 缓存键前缀
+    CACHE_PREFIX = "smart_cache:"
+    STATS_PREFIX = "cache_stats:"
+    LOCK_PREFIX = "cache_lock:"
+    
+    # 统计配置
+    STATS_INTERVAL = 300  # 统计间隔（秒）
+    STATS_RETENTION = 7   # 统计数据保留天数
+    
+    # 性能配置
+    MAX_KEY_LENGTH = 250
+    MAX_VALUE_SIZE = 1024 * 1024  # 1MB
+    BATCH_SIZE = 100
+    
+    # 数据库配置
+    DB_NAME = "redis统计"
+    TABLE_NAME = "dpflask路由分析"
+    
+    # 锁配置
+    LOCK_TIMEOUT = 30     # 分布式锁超时时间
+    LOCK_RETRY_DELAY = 0.1  # 锁重试延迟
+
+
+class SmartCacheSystem:
+    """智能缓存系统核心类"""
+    
+    def __init__(self, redis_client: redis.Redis, mysql_pool=None, instance_name: str = "default"):
+        self.redis_client = redis_client
+        self.mysql_pool = mysql_pool
+        self.instance_name = instance_name
+        self.config = CacheConfig()
+        self.logger = logger
+        
+        # 统计数据
+        self.stats = {
+            'hits': 0,
+            'misses': 0,
+            'sets': 0,
+            'deletes': 0,
+            'errors': 0,
+            'total_operations': 0,
+            'start_time': time.time(),
+            'response_times': []
+        }
+        
+        # 热点键统计
+        self.hot_keys = {}
+        self.hot_keys_lock = threading.RLock()
+        
+        # 统计线程控制
+        self._stats_running = False
+        self._stats_thread = None
+        self._stats_lock = threading.RLock()
+        
+        # 初始化
+        self._init_mysql_db()
+        self._start_stats_worker()
+        
+        self.logger.info("智能缓存系统初始化完成", {
+            'instance_name': self.instance_name,
+            'mysql_enabled': self.mysql_pool is not None,
+            'redis_connected': self._test_redis_connection()
+        })
+    
+    def _test_redis_connection(self) -> bool:
+        """测试Redis连接"""
+        try:
+            self.redis_client.ping()
+            return True
+        except Exception as e:
+            self.logger.error(f"Redis连接测试失败: {e}")
+            return False
+    
+    def _init_mysql_db(self) -> bool:
+        """初始化MySQL数据库和表"""
+        if not self.mysql_pool:
+            self.logger.warning("MySQL连接池未提供，统计功能将被禁用")
+            return False
+        
+        try:
+            connection = self.mysql_pool.connection()
+            try:
+                with connection.cursor() as cursor:
+                    # 创建数据库
+                    cursor.execute(f"CREATE DATABASE IF NOT EXISTS `{self.config.DB_NAME}` DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci")
+                    cursor.execute(f"USE `{self.config.DB_NAME}`")
+                    
+                    # 创建表（MySQL 8.4+兼容语法）
+                    create_table_sql = f"""
+                    CREATE TABLE IF NOT EXISTS `{self.config.TABLE_NAME}` (
+                        `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+                        `统计时间` datetime NOT NULL COMMENT '统计时间',
+                        `时间段` varchar(20) NOT NULL COMMENT '时间段标识',
+                        `缓存命中数` bigint DEFAULT 0 COMMENT '缓存命中次数',
+                        `缓存未命中数` bigint DEFAULT 0 COMMENT '缓存未命中次数',
+                        `缓存设置数` bigint DEFAULT 0 COMMENT '缓存设置次数',
+                        `缓存删除数` bigint DEFAULT 0 COMMENT '缓存删除次数',
+                        `缓存错误数` bigint DEFAULT 0 COMMENT '缓存错误次数',
+                        `命中率` decimal(5,2) DEFAULT 0.00 COMMENT '缓存命中率(%)',
+                        `总操作数` bigint DEFAULT 0 COMMENT '总操作次数',
+                        `平均响应时间` decimal(10,4) DEFAULT 0.0000 COMMENT '平均响应时间(ms)',
+                        `每秒操作数` decimal(10,2) DEFAULT 0.00 COMMENT '每秒操作数',
+                        `唯一键数量` int DEFAULT 0 COMMENT '唯一键数量',
+                        `系统运行时间` bigint DEFAULT 0 COMMENT '系统运行时间(秒)',
+                        `热点键统计` json DEFAULT NULL COMMENT '热点键统计信息',
+                        `服务器主机` varchar(100) DEFAULT NULL COMMENT '服务器主机名',
+                        `实例名称` varchar(100) DEFAULT NULL COMMENT '缓存实例名称',
+                        `创建时间` timestamp DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+                        `更新时间` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录更新时间',
+                        PRIMARY KEY (`id`),
+                        KEY `idx_stats_time` (`统计时间`),
+                        KEY `idx_time_period` (`时间段`),
+                        KEY `idx_hit_rate` (`命中率`),
+                        KEY `idx_instance` (`实例名称`),
+                        KEY `idx_create_time` (`创建时间`)
+                    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='Redis缓存系统统计分析表'
+                    """
+                    
+                    cursor.execute(create_table_sql)
+                    connection.commit()
+                    
+                    self.logger.info("MySQL数据库表初始化成功", {
+                        'database': self.config.DB_NAME,
+                        'table': self.config.TABLE_NAME
+                    })
+                    return True
+                    
+            finally:
+                connection.close()
+                
+        except Exception as e:
+            self.logger.error(f"MySQL数据库初始化失败: {e}")
+            return False
+    
+    def _generate_cache_key(self, key: str, namespace: str = "") -> str:
+        """生成缓存键"""
+        if namespace:
+            return f"{self.config.CACHE_PREFIX}{namespace}:{key}"
+        return f"{self.config.CACHE_PREFIX}{key}"
+    
+    def _record_operation(self, operation: str, response_time: float = 0):
+        """记录操作统计"""
+        with self._stats_lock:
+            self.stats['total_operations'] += 1
+            if operation in self.stats:
+                self.stats[operation] += 1
+            if response_time > 0:
+                self.stats['response_times'].append(response_time)
+                # 只保留最近1000次操作的响应时间
+                if len(self.stats['response_times']) > 1000:
+                    self.stats['response_times'] = self.stats['response_times'][-1000:]
+    
+    def _record_hot_key(self, key: str, namespace: str = ""):
+        """记录热点键"""
+        cache_key = self._generate_cache_key(key, namespace)
+        with self.hot_keys_lock:
+            self.hot_keys[cache_key] = self.hot_keys.get(cache_key, 0) + 1
+    
+    def get(self, key: str, namespace: str = "", default=None) -> Any:
+        """获取缓存值"""
+        start_time = time.time()
+        
+        try:
+            cache_key = self._generate_cache_key(key, namespace)
+            
+            # 获取缓存值
+            value = self.redis_client.get(cache_key)
+            response_time = (time.time() - start_time) * 1000
+            
+            if value is not None:
+                # 缓存命中
+                self._record_operation('hits', response_time)
+                self._record_hot_key(key, namespace)
+                
+                try:
+                    return json.loads(value.decode('utf-8'))
+                except (json.JSONDecodeError, UnicodeDecodeError):
+                    return value.decode('utf-8')
+            else:
+                # 缓存未命中
+                self._record_operation('misses', response_time)
+                return default
+                
+        except Exception as e:
+            self._record_operation('errors')
+            self.logger.error(f"缓存获取失败: {e}", {
+                'key': key,
+                'namespace': namespace
+            })
+            return default
+    
+    def set(self, key: str, value: Any, ttl: int = None, namespace: str = "") -> bool:
+        """设置缓存值"""
+        start_time = time.time()
+        
+        try:
+            cache_key = self._generate_cache_key(key, namespace)
+            ttl = ttl or self.config.DEFAULT_TTL
+            
+            # 序列化值
+            if isinstance(value, (dict, list, tuple)):
+                serialized_value = json.dumps(value, ensure_ascii=False)
+            else:
+                serialized_value = str(value)
+            
+            # 检查值大小
+            if len(serialized_value.encode('utf-8')) > self.config.MAX_VALUE_SIZE:
+                self.logger.warning(f"缓存值过大，跳过设置: {len(serialized_value)} bytes")
+                return False
+            
+            # 设置缓存
+            result = self.redis_client.setex(cache_key, ttl, serialized_value)
+            response_time = (time.time() - start_time) * 1000
+            
+            self._record_operation('sets', response_time)
+            return bool(result)
+            
+        except Exception as e:
+            self._record_operation('errors')
+            self.logger.error(f"缓存设置失败: {e}", {
+                'key': key,
+                'namespace': namespace,
+                'ttl': ttl
+            })
+            return False
+    
+    def delete(self, key: str, namespace: str = "") -> bool:
+        """删除缓存值"""
+        start_time = time.time()
+        
+        try:
+            cache_key = self._generate_cache_key(key, namespace)
+            result = self.redis_client.delete(cache_key)
+            response_time = (time.time() - start_time) * 1000
+            
+            self._record_operation('deletes', response_time)
+            return bool(result)
+            
+        except Exception as e:
+            self._record_operation('errors')
+            self.logger.error(f"缓存删除失败: {e}", {
+                'key': key,
+                'namespace': namespace
+            })
+            return False
+    
+    def exists(self, key: str, namespace: str = "") -> bool:
+        """检查缓存键是否存在"""
+        try:
+            cache_key = self._generate_cache_key(key, namespace)
+            return bool(self.redis_client.exists(cache_key))
+        except Exception as e:
+            self.logger.error(f"缓存存在性检查失败: {e}")
+            return False
+    
+    def clear_namespace(self, namespace: str) -> int:
+        """清除指定命名空间的所有缓存"""
+        try:
+            pattern = f"{self.config.CACHE_PREFIX}{namespace}:*"
+            keys = self.redis_client.keys(pattern)
+            
+            if keys:
+                deleted = self.redis_client.delete(*keys)
+                self.logger.info(f"清除命名空间缓存: {namespace}, 删除键数: {deleted}")
+                return deleted
+            return 0
+            
+        except Exception as e:
+            self.logger.error(f"清除命名空间缓存失败: {e}")
+            return 0
+    
+    def get_stats(self) -> Dict[str, Any]:
+        """获取缓存统计信息"""
+        with self._stats_lock:
+            total_ops = self.stats['total_operations']
+            hits = self.stats['hits']
+            
+            # 计算命中率
+            hit_rate = (hits / total_ops * 100) if total_ops > 0 else 0
+            
+            # 计算平均响应时间
+            response_times = self.stats['response_times']
+            avg_response_time = sum(response_times) / len(response_times) if response_times else 0
+            
+            # 计算运行时间
+            uptime = time.time() - self.stats['start_time']
+            
+            # 计算每秒操作数
+            ops_per_second = total_ops / uptime if uptime > 0 else 0
+            
+            # 获取热点键（前10个）
+            with self.hot_keys_lock:
+                top_hot_keys = sorted(self.hot_keys.items(), key=lambda x: x[1], reverse=True)[:10]
+            
+            return {
+                'hits': hits,
+                'misses': self.stats['misses'],
+                'sets': self.stats['sets'],
+                'deletes': self.stats['deletes'],
+                'errors': self.stats['errors'],
+                'total_operations': total_ops,
+                'hit_rate': round(hit_rate, 2),
+                'avg_response_time': round(avg_response_time, 4),
+                'ops_per_second': round(ops_per_second, 2),
+                'uptime_seconds': int(uptime),
+                'hot_keys': dict(top_hot_keys),
+                'unique_keys_count': len(self.hot_keys)
+            }
+    
+    def health_check(self) -> Dict[str, Any]:
+        """健康检查"""
+        health_info = {
+            'redis_connected': False,
+            'mysql_available': False,
+            'stats_worker_running': self._stats_running,
+            'instance_name': self.instance_name,
+            'timestamp': datetime.now().isoformat()
+        }
+        
+        # 检查Redis连接
+        try:
+            self.redis_client.ping()
+            health_info['redis_connected'] = True
+        except Exception as e:
+            health_info['redis_error'] = str(e)
+        
+        # 检查MySQL连接
+        if self.mysql_pool:
+            try:
+                connection = self.mysql_pool.connection()
+                connection.close()
+                health_info['mysql_available'] = True
+            except Exception as e:
+                health_info['mysql_error'] = str(e)
+        
+        return health_info
+    
+    def _start_stats_worker(self):
+        """启动统计工作线程"""
+        if not self._stats_running:
+            self._stats_running = True
+            self._stats_thread = threading.Thread(target=self._stats_worker, daemon=True)
+            self._stats_thread.start()
+            self.logger.info("统计工作线程已启动")
+    
+    def _stats_worker(self):
+        """后台统计工作线程"""
+        while self._stats_running:
+            try:
+                # 收集统计数据
+                stats_data = self.get_stats()
+                
+                # 提交到MySQL
+                self._submit_stats_to_mysql(stats_data)
+                
+                # 清理过期的热点键统计
+                self._cleanup_hot_keys()
+                
+            except Exception as e:
+                self.logger.error(f"统计工作线程异常: {e}")
+            
+            # 等待下一个统计间隔
+            time.sleep(self.config.STATS_INTERVAL)
+    
+    def _submit_stats_to_mysql(self, stats_data: Dict[str, Any]):
+        """提交统计数据到MySQL"""
+        if not self.mysql_pool:
+            self.logger.debug("MySQL连接池不可用，跳过统计数据提交")
+            return
+        
+        try:
+            connection = self.mysql_pool.connection()
+            try:
+                with connection.cursor() as cursor:
+                    cursor.execute(f"USE `{self.config.DB_NAME}`")
+                    
+                    # 准备数据
+                    now = datetime.now()
+                    time_period = now.strftime("%Y%m%d_%H%M")
+                    
+                    insert_sql = f"""
+                    INSERT INTO `{self.config.TABLE_NAME}` (
+                        `统计时间`, `时间段`, `缓存命中数`, `缓存未命中数`, `缓存设置数`,
+                        `缓存删除数`, `缓存错误数`, `命中率`, `总操作数`, `平均响应时间`,
+                        `每秒操作数`, `唯一键数量`, `系统运行时间`, `热点键统计`,
+                        `服务器主机`, `实例名称`
+                    ) VALUES (
+                        %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s
+                    )
+                    """
+                    
+                    cursor.execute(insert_sql, (
+                        now,
+                        time_period,
+                        stats_data['hits'],
+                        stats_data['misses'],
+                        stats_data['sets'],
+                        stats_data['deletes'],
+                        stats_data['errors'],
+                        stats_data['hit_rate'],
+                        stats_data['total_operations'],
+                        stats_data['avg_response_time'],
+                        stats_data['ops_per_second'],
+                        stats_data['unique_keys_count'],
+                        stats_data['uptime_seconds'],
+                        json.dumps(stats_data['hot_keys'], ensure_ascii=False),
+                        socket.gethostname(),
+                        self.instance_name
+                    ))
+                    
+                    connection.commit()
+                    
+                    self.logger.debug("统计数据已提交到MySQL", {
+                        'time_period': time_period,
+                        'total_operations': stats_data['total_operations'],
+                        'hit_rate': stats_data['hit_rate']
+                    })
+                    
+            finally:
+                connection.close()
+                
+        except Exception as e:
+            self.logger.error(f"提交统计数据到MySQL失败: {e}")
+    
+    def _cleanup_hot_keys(self):
+        """清理热点键统计（保留访问次数最高的1000个）"""
+        with self.hot_keys_lock:
+            if len(self.hot_keys) > 1000:
+                # 保留访问次数最高的1000个键
+                sorted_keys = sorted(self.hot_keys.items(), key=lambda x: x[1], reverse=True)
+                self.hot_keys = dict(sorted_keys[:1000])
+    
+    def shutdown(self):
+        """关闭缓存系统"""
+        self.logger.info("正在关闭缓存系统...")
+        
+        # 停止统计线程
+        self._stats_running = False
+        if self._stats_thread and self._stats_thread.is_alive():
+            self._stats_thread.join(timeout=5)
+        
+        # 最后一次提交统计数据
+        try:
+            stats_data = self.get_stats()
+            self._submit_stats_to_mysql(stats_data)
+        except Exception as e:
+            self.logger.error(f"关闭时提交统计数据失败: {e}")
+        
+        self.logger.info("缓存系统已关闭")
+
+
+class CacheManager:
+    """缓存管理器 - 单例模式"""
+    
+    _instance = None
+    _lock = threading.RLock()
+    
+    def __new__(cls):
+        with cls._lock:
+            if cls._instance is None:
+                cls._instance = super().__new__(cls)
+                cls._instance._initialized = False
+            return cls._instance
+    
+    def __init__(self):
+        if self._initialized:
+            return
+        
+        self.cache_instance = None
+        self.enabled = True
+        self.initialization_error = None
+        self._initialized = True
+        self.logger = logger
+    
+    def initialize(self, redis_client: redis.Redis, mysql_pool=None, instance_name: str = "default"):
+        """初始化缓存系统"""
+        try:
+            self.cache_instance = SmartCacheSystem(
+                redis_client=redis_client,
+                mysql_pool=mysql_pool,
+                instance_name=instance_name
+            )
+            self.initialization_error = None
+            self.logger.info("缓存管理器初始化成功", {
+                'instance_name': instance_name,
+                'mysql_enabled': mysql_pool is not None
+            })
+            return self  # 支持链式调用
+            
+        except Exception as e:
+            self.initialization_error = str(e)
+            self.cache_instance = None
+            self.logger.error(f"缓存管理器初始化失败: {e}")
+            return self
+    
+    def get_cache(self) -> Optional[SmartCacheSystem]:
+        """获取缓存实例"""
+        return self.cache_instance if self.enabled else None
+    
+    def is_available(self) -> bool:
+        """检查缓存是否可用"""
+        return self.cache_instance is not None and self.enabled
+    
+    def enable(self):
+        """启用缓存"""
+        self.enabled = True
+        self.logger.info("缓存系统已启用")
+        return self  # 支持链式调用
+    
+    def disable(self):
+        """禁用缓存"""
+        self.enabled = False
+        self.logger.info("缓存系统已禁用")
+        return self  # 支持链式调用
+    
+    def get_status(self) -> Dict[str, Any]:
+        """获取缓存状态"""
+        return {
+            'enabled': self.enabled,
+            'available': self.cache_instance is not None,
+            'initialization_error': self.initialization_error,
+            'instance_name': getattr(self.cache_instance, 'instance_name', None) if self.cache_instance else None
+        }
+    
+    def shutdown(self):
+        """关闭缓存系统"""
+        if self.cache_instance:
+            self.cache_instance.shutdown()
+            self.cache_instance = None
+        self.logger.info("缓存管理器已关闭")
+
+
+# 导出单例实例
+cache_manager = CacheManager() 

{mdbq-4.0.104 → mdbq-4.0.106}/mdbq/route/monitor.py

@@ -35,7 +35,7 @@ host, port, username, password = parser.get_section_values(
 
 logger = mylogger.MyLogger(
     logging_mode='file',
-    log_level='debug',
+    log_level='info',
     log_format='json',
     max_log_size=50,
     backup_count=5,

{mdbq-4.0.104 → mdbq-4.0.106}/mdbq.egg-info/PKG-INFO

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

{mdbq-4.0.104 → mdbq-4.0.106}/mdbq.egg-info/SOURCES.txt

@@ -32,6 +32,7 @@ mdbq/pbix/pbix_refresh.py
 mdbq/pbix/refresh_all.py
 mdbq/redis/__init__.py
 mdbq/redis/getredis.py
+mdbq/redis/redis_cache.py
 mdbq/route/__init__.py
 mdbq/route/analytics.py
 mdbq/route/monitor.py

mdbq-4.0.104/mdbq/__version__.py

@@ -1 +0,0 @@
-VERSION = '4.0.104'