mdbq 4.2.19__py3-none-any.whl → 4.2.21__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.2.19'
+VERSION = '4.2.21'

mdbq/redis/redis_cache.py

@@ -919,8 +919,8 @@ def flask_redis_cache(cache_key_func=None, ttl=1200, namespace="default",
                 # 如果没有Flask环境，直接执行原函数
                 return func(*args, **kwargs)
             
-            # 初始化数据源标记（默认为 none）
-            g.data_source = 'none'
+            # 初始化数据源标记
+            g.data_source = 'mysql'
             g.cache_hit = False
             
             # 获取缓存系统
@@ -928,9 +928,7 @@ def flask_redis_cache(cache_key_func=None, ttl=1200, namespace="default",
             
             # 如果缓存系统不可用，直接执行原函数
             if not cache_system:
-                # 标记为直接查询数据库（无缓存系统）
-                g.data_source = 'mysql'
-                g.cache_hit = False
+                # 直接查询数据库（无缓存系统）
                 return func(*args, **kwargs)
             
             try:
@@ -967,10 +965,7 @@ def flask_redis_cache(cache_key_func=None, ttl=1200, namespace="default",
                     if not skip_cache_on_error:
                         raise
                 
-                # 缓存未命中，执行原函数（会查询数据库）
-                # 标记为 mysql 查询
-                g.data_source = 'mysql'
-                g.cache_hit = False
+                # 缓存未命中，执行原函数
                 result = func(*args, **kwargs)
                 
                 # 如果结果是Flask Response对象，提取JSON数据进行缓存

mdbq/route/monitor.py

@@ -123,7 +123,7 @@ class RouteMonitor:
                 with connection.cursor() as cursor:
                     cursor.execute(
                         f"CREATE DATABASE IF NOT EXISTS `{self.database}` "
-                        f"DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci"
+                        f"DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci"
                     )
                     cursor.execute(f"USE `{self.database}`")
             finally:
@@ -145,7 +145,7 @@ class RouteMonitor:
         except Exception:
             cursor.execute(
                 f"CREATE DATABASE IF NOT EXISTS `{self.database}` "
-                f"DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci"
+                f"DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci"
             )
             cursor.execute(f"USE `{self.database}`")
         
@@ -195,7 +195,7 @@ class RouteMonitor:
                             INDEX `idx_用户标识` (`用户标识`),
                             INDEX `idx_时间_接口` (`请求时间`, `路由地址`(191)),
                             INDEX `idx_时间_数据源` (`请求时间`, `数据源`)
-                        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci 
+                        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci 
                         COMMENT='API 访问日志表 - 记录每次请求的核心信息'
                         ROW_FORMAT=COMPRESSED;
                     """)
@@ -225,7 +225,7 @@ class RouteMonitor:
                             INDEX `idx_统计日期` (`统计日期`),
                             INDEX `idx_路由地址` (`路由地址`(191)),
                             INDEX `idx_日期_接口` (`统计日期`, `路由地址`(191))
-                        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci 
+                        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci 
                         COMMENT='API 接口统计表 - 按小时汇总的接口性能数据';
                     """)
                     
@@ -252,7 +252,7 @@ class RouteMonitor:
                             INDEX `idx_客户端ip` (`客户端ip`),
                             INDEX `idx_风险评分` (`风险评分`),
                             INDEX `idx_请求总数` (`请求总数`)
-                        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci 
+                        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci 
                         COMMENT='API ip 访问记录表 - ip 维度的访问统计';
                     """)
                 connection.commit()
@@ -506,8 +506,9 @@ class RouteMonitor:
         if params_dict:
             request_params = self.sanitize_params(params_dict)
         
-        # 获取数据源信息（从 g 对象中读取，由缓存装饰器设置）
-        data_source = getattr(g, 'data_source', 'none')
+        # 获取数据源信息（从 g 对象中读取，由缓存装饰器 redis_cache 设置）
+        # 默认为 mysql（没有使用缓存装饰器的接口直接查询数据库）
+        data_source = getattr(g, 'data_source', 'mysql')
         cache_hit = getattr(g, 'cache_hit', False)
         
         # 构建请求数据字典
@@ -725,10 +726,6 @@ class RouteMonitor:
             start_time = time.time()
             g.request_start_time = start_time
             
-            # 收集请求数据
-            request_data = self.collect_request_data(request)
-            # request_id = request_data.get('请求id', 'unknown')
-            
             # 统计总请求数（线程安全）
             with self._stats_lock:
                 self._stats['total_requests'] += 1
@@ -755,6 +752,9 @@ class RouteMonitor:
                     except Exception:
                         response_status = 200
                 
+                # 在函数执行完成后收集请求数据（此时缓存装饰器已经设置了 g.data_source）
+                request_data = self.collect_request_data(request)
+                
                 # 更新响应数据
                 response_data = {
                     '状态码': response_status,
@@ -785,6 +785,9 @@ class RouteMonitor:
                 end_time = time.time()
                 process_time = round((end_time - start_time) * 1000, 3)
                 
+                # 在异常发生后收集请求数据
+                request_data = self.collect_request_data(request)
+                
                 # 构建错误数据
                 error_data = {
                     '状态码': 500,

{mdbq-4.2.19.dist-info → mdbq-4.2.21.dist-info}/METADATA

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

{mdbq-4.2.19.dist-info → mdbq-4.2.21.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=r7N-NWrrPPVAUY93eumJUOnKKVt6StlWP43PDbmquBI,18
+mdbq/__version__.py,sha256=IzawWUuPswzTS3m3I9j-FfXVS9TU3H6dXccjrg0afWE,18
 mdbq/auth/__init__.py,sha256=pnPMAt63sh1B6kEvmutUuro46zVf2v2YDAG7q-jV_To,24
 mdbq/auth/auth_backend.py,sha256=iLN7AqiSq7fQgFtNtge_TIlVOR1hrCSZXH6oId6uGX4,116924
 mdbq/auth/crypto.py,sha256=M0i4dRljJuE30WH_13ythA2QGKPXZm6TgpnYp6aHOzw,17431
@@ -27,15 +27,15 @@ mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,239
 mdbq/pbix/refresh_all.py,sha256=OBT9EewSZ0aRS9vL_FflVn74d4l2G00wzHiikCC4TC0,5926
 mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=vdg7YQEjhoMp5QzxygNGx5DQKRnePrcwPYgUrDypA6g,23672
-mdbq/redis/redis_cache.py,sha256=CGNkc0kf-BCyAgakpQj4OtdPE2GIsIdQktnD00jcGCs,46329
+mdbq/redis/redis_cache.py,sha256=bOko_MhWKKBsZJVstQQ79u5XT69lzUDKCNHd5Fhx9_4,46084
 mdbq/route/__init__.py,sha256=BT_dAY7V-U2o72bevq1B9Mq9QA7GodwtkxyLNdGaoE8,22
 mdbq/route/analytics.py,sha256=dngj5hVwKddEUy59nSYbOoJ9C7OVrtCmCkvW6Uj9RYM,28097
-mdbq/route/monitor.py,sha256=EfB948tm3WoDYVSifjk4HvYLR4mQ11i5ssk-NMnCAL0,43234
+mdbq/route/monitor.py,sha256=vF7dtKPa6_a2ch_9EHGec9pwpJeKVmZul_DBjjbi3UE,43500
 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.2.19.dist-info/METADATA,sha256=Q8_N3EfvmZH2I1NxiZCEK3iaHtZWgmAnJAIIHWg3r1w,364
-mdbq-4.2.19.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-4.2.19.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.2.19.dist-info/RECORD,,
+mdbq-4.2.21.dist-info/METADATA,sha256=Sgle1dF9qmbkJ3OQODTwJ6eH7EqMjsrbUOnwkC3Q0js,364
+mdbq-4.2.21.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-4.2.21.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.2.21.dist-info/RECORD,,