mdbq 4.2.26__tar.gz → 4.2.28__tar.gz

{mdbq-4.2.26 → mdbq-4.2.28}/PKG-INFO

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

mdbq-4.2.28/mdbq/__version__.py

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

{mdbq-4.2.26 → mdbq-4.2.28}/mdbq/auth/auth_backend.py

@@ -1016,7 +1016,8 @@ class StandaloneAuthManager:
                 WHERE user_id = %s AND is_active = 1
             ''', (user_id,))
             
-            device_count = cursor.fetchone()['device_count']
+            device_count_result = cursor.fetchone()
+            device_count = device_count_result['device_count'] if device_count_result else 0
             
             # 撤销用户的所有刷新令牌
             cursor.execute('''
@@ -1832,7 +1833,8 @@ class StandaloneAuthManager:
                 WHERE user_id = %s AND is_active = 1
             ''', (user_id,))
             
-            active_devices = cursor.fetchone()['active_devices']
+            active_devices_result = cursor.fetchone()
+            active_devices = active_devices_result['active_devices'] if active_devices_result else 0
             
             # 获取登录次数（成功的登录）
             cursor.execute('''
@@ -1840,7 +1842,8 @@ class StandaloneAuthManager:
                 WHERE user_id = %s AND login_result = 'success'
             ''', (user_id,))
             
-            login_count = cursor.fetchone()['login_count']
+            login_count_result = cursor.fetchone()
+            login_count = login_count_result['login_count'] if login_count_result else 0
             
             # 获取最近登录记录
             cursor.execute('''

{mdbq-4.2.26 → mdbq-4.2.28}/mdbq/redis/redis_cache.py

@@ -1158,19 +1158,32 @@ def _safe_cache_set(cache_system, cache_key, response_data, ttl, namespace,
             if isinstance(message, str) and ('失败' in message or 'error' in message or 'fail' in message):
                 return False
             
-            # 检查数据部分（支持多种数据字段名）
-            has_data_fields = (
-                'data' in data or           # 标准data字段
-                'logs' in data or           # 更新日志专用
-                'announcements' in data or  # 公告数据
-                'databases' in data or      # 数据库列表
-                'tables' in data or         # 表列表
-                'rows' in data or           # 数据行
-                'message' in data           # 包含消息即认为有数据
+            # 检查数据部分（不仅要有字段，还要有有效的非空值）
+            def is_valid_value(value):
+                """判断值是否有效（非None、非空列表、非空字典）"""
+                if value is None:
+                    return False
+                if isinstance(value, (list, dict)) and len(value) == 0:
+                    return False
+                return True
+            
+            # 检查各种数据字段
+            has_valid_data = (
+                ('data' in data and is_valid_value(data.get('data'))) or
+                ('logs' in data and is_valid_value(data.get('logs'))) or
+                ('announcements' in data and is_valid_value(data.get('announcements'))) or
+                ('databases' in data and is_valid_value(data.get('databases'))) or
+                ('tables' in data and is_valid_value(data.get('tables'))) or
+                ('rows' in data and is_valid_value(data.get('rows'))) or
+                # message 单独判断：只有在其他字段都不存在时，才检查 message
+                (not any(key in data for key in ['data', 'logs', 'announcements', 'databases', 'tables', 'rows']) 
+                 and 'message' in data 
+                 and data.get('message') 
+                 and data.get('message') not in ['', 'ok', 'success'])
             )
             
-            # 如果有数据字段，基本认为有效
-            return has_data_fields
+            # 返回是否有有效数据
+            return has_valid_data
         
         data_validator = default_validator
     

{mdbq-4.2.26 → mdbq-4.2.28}/mdbq.egg-info/PKG-INFO

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

mdbq-4.2.26/mdbq/__version__.py

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