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

mdbq/__version__.py

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

mdbq/auth/auth_backend.py

@@ -17,7 +17,6 @@
 
 """
 
-from tkinter import N
 import jwt # type: ignore
 import pymysql
 import hashlib

mdbq/route/monitor.py

@@ -19,6 +19,7 @@ import threading
 import pymysql
 import functools
 import hashlib
+import socket
 from datetime import datetime, timedelta
 from typing import Dict, Any, Optional
 from dbutils.pooled_db import PooledDB # type: ignore
@@ -174,6 +175,8 @@ class RouteMonitor:
                             `请求方法` VARCHAR(10) NOT NULL COMMENT 'HTTP 方法（GET/POST/PUT/DELETE等）',
                             `路由地址` VARCHAR(500) NOT NULL COMMENT 'API 路由地址',
                             `客户端ip` VARCHAR(45) NOT NULL COMMENT '客户端 ip 地址（支持 IPv6）',
+                            `主机名` VARCHAR(100) COMMENT '服务器主机名',
+                            `请求来源` VARCHAR(500) COMMENT '请求来源（Referer）',
                             `状态码` SMALLINT COMMENT 'HTTP 状态码',
                             `响应耗时` DECIMAL(10,3) COMMENT '请求处理耗时（毫秒）',
                             `数据源` VARCHAR(20) COMMENT '数据源类型：redis/mysql/hybrid/none',
@@ -189,12 +192,14 @@ class RouteMonitor:
                             INDEX `idx_请求时间` (`请求时间`),
                             INDEX `idx_路由地址` (`路由地址`(191)),
                             INDEX `idx_客户端ip` (`客户端ip`),
+                            INDEX `idx_主机名` (`主机名`),
                             INDEX `idx_状态码` (`状态码`),
                             INDEX `idx_数据源` (`数据源`),
                             INDEX `idx_缓存命中` (`缓存命中`),
                             INDEX `idx_用户标识` (`用户标识`),
                             INDEX `idx_时间_接口` (`请求时间`, `路由地址`(191)),
-                            INDEX `idx_时间_数据源` (`请求时间`, `数据源`)
+                            INDEX `idx_时间_数据源` (`请求时间`, `数据源`),
+                            INDEX `idx_时间_主机` (`请求时间`, `主机名`)
                         ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci 
                         COMMENT='API 访问日志表 - 记录每次请求的核心信息'
                         ROW_FORMAT=COMPRESSED;
@@ -452,6 +457,17 @@ class RouteMonitor:
         # 获取客户端 IP
         client_ip = self.get_real_ip(request)
         
+        # 获取主机名
+        try:
+            hostname = socket.gethostname()
+        except Exception:
+            hostname = 'unknown'
+        
+        # 获取请求来源（Referer）
+        referer = request.headers.get('Referer') or request.headers.get('Origin')
+        if referer and len(referer) > 500:
+            referer = referer[:500]
+        
         # 获取 User-Agent（截断过长的）
         user_agent = request.headers.get('User-Agent', '')
         if len(user_agent) > 500:
@@ -460,6 +476,7 @@ class RouteMonitor:
         # 获取用户标识（如果有）
         # 安全获取 user_id，允许为空时使用默认值
         user_id = None
+        
         if hasattr(g, 'current_user_id'):
             user_id = str(g.current_user_id) if g.current_user_id else None
         elif hasattr(g, 'user_id'):
@@ -518,6 +535,8 @@ class RouteMonitor:
             '请求方法': request.method,
             '路由地址': request.endpoint or request.path,
             '客户端ip': client_ip,
+            '主机名': hostname,
+            '请求来源': referer,
             '数据源': data_source,
             '缓存命中': 1 if cache_hit else 0,
             '用户标识': user_id,
@@ -553,10 +572,11 @@ class RouteMonitor:
                     sql = """
                         INSERT INTO `api_访问日志` (
                             `请求id`, `请求时间`, `请求方法`, `路由地址`, `客户端ip`,
+                            `主机名`, `请求来源`,
                             `状态码`, `响应耗时`, `数据源`, `缓存命中`,
                             `用户标识`, `用户代理`, `请求参数`, `错误信息`
                         ) VALUES (
-                            %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s
+                            %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s
                         )
                     """
                     
@@ -566,6 +586,8 @@ class RouteMonitor:
                         request_data.get('请求方法'),
                         request_data.get('路由地址'),
                         request_data.get('客户端ip'),
+                        request_data.get('主机名'),
+                        request_data.get('请求来源'),
                         request_data.get('状态码'),
                         request_data.get('响应耗时'),
                         request_data.get('数据源', 'none'),

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

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

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

@@ -1,7 +1,7 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=IzawWUuPswzTS3m3I9j-FfXVS9TU3H6dXccjrg0afWE,18
+mdbq/__version__.py,sha256=1vt3Ma3q05owJtHDd-2Z9aSo0l5l4cCSOdpIIFBCgzs,18
 mdbq/auth/__init__.py,sha256=pnPMAt63sh1B6kEvmutUuro46zVf2v2YDAG7q-jV_To,24
-mdbq/auth/auth_backend.py,sha256=iLN7AqiSq7fQgFtNtge_TIlVOR1hrCSZXH6oId6uGX4,116924
+mdbq/auth/auth_backend.py,sha256=xXVvgKAI1sOGMx_vIAHW0SCSEaIG6h90kXYQwy5P0vI,116902
 mdbq/auth/crypto.py,sha256=M0i4dRljJuE30WH_13ythA2QGKPXZm6TgpnYp6aHOzw,17431
 mdbq/auth/rate_limiter.py,sha256=1m_Paxp8pDNpmyoFGRpFMVOJpbmeIvfVcfiQ2oH72qM,32850
 mdbq/js/__init__.py,sha256=hpMi3_ZKwIWkzc0LnKL-SY9AS-7PYFHq0izYTgEvxjc,30
@@ -30,12 +30,12 @@ mdbq/redis/getredis.py,sha256=vdg7YQEjhoMp5QzxygNGx5DQKRnePrcwPYgUrDypA6g,23672
 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=vF7dtKPa6_a2ch_9EHGec9pwpJeKVmZul_DBjjbi3UE,43500
+mdbq/route/monitor.py,sha256=8vT8dPrhsuDqkK37EGnGMHxp42kM7-tedRvQoWEihe8,44462
 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.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,,
+mdbq-4.2.22.dist-info/METADATA,sha256=vFi8uuWhSEwQoalN92khroxc9jS-7gdvPK1BF49MVyQ,364
+mdbq-4.2.22.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-4.2.22.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.2.22.dist-info/RECORD,,