feat: 审核规则持久化到DB + 全面配置去硬编码化
- AuditRule模型: 新增code/config_json字段,支持规则编码和阈值参数持久化 - audit_engine_v2: _load_rules从DB读config_json覆盖默认config - audit_rule_sync: 启动时自动从_RULE_REGISTRY同步规则到DB(239条) - settings API: update后刷新query_service配置缓存 - query_service: MAX_ROWS/QUERY_TIMEOUT/MAX_QUERY_LENGTH/MAX_RESULT_MEMORY改为动态读取system_settings - ticket_executor: SQL_TIMEOUT/REDIS_TIMEOUT/MONGO_TIMEOUT改为动态获取 - settings_seeds: 新增executor分组(sql/redis/mongo超时) + query_result_max_memory_mb - audit_rule endpoint: 移除无效的AuditEngine缓存清理(每次audit是新实例) - 测试: 1057 passed(修复所有新引入失败,17个历史遗留)
This commit is contained in:
1 parent
ddf4856a85
commit
a9e214ef1a
11 files changed
+342
-62
No files matched your search
@@ -40,11 +40,19 @@ from app.services.sql_analyzer import SQLAnalyzer, SQLType
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# 超时配置(秒)
|
||||
# 超时配置(秒)—— 默认值,优先从 system_settings 读取
|
||||
SQL_TIMEOUT = 60
|
||||
REDIS_TIMEOUT = 30
|
||||
MONGO_TIMEOUT = 60
|
||||
|
||||
|
||||
def _get_executor_timeout(db_type: str) -> int:
|
||||
"""从 query_service 配置缓存获取执行超时。"""
|
||||
from app.services.query_service import current_config
|
||||
cfg = current_config()
|
||||
key = {"mysql": "sql_timeout", "postgres": "sql_timeout", "redis": "redis_timeout", "mongodb": "mongo_timeout"}.get(db_type, "sql_timeout")
|
||||
return cfg.get(key, SQL_TIMEOUT)
|
||||
|
||||
# 并发执行锁: 防止同一工单被并发执行
|
||||
_ticket_execution_locks: Set[int] = set()
|
||||
_lock_lock = asyncio.Lock()
|
||||
@@ -238,7 +246,8 @@ class TicketExecutor:
|
||||
|
||||
# 获取超时配置(从 ticket 或选项中)
|
||||
custom_timeout = getattr(ticket, 'options', None) or {}
|
||||
timeout = custom_timeout.get('timeout', SQL_TIMEOUT) if isinstance(custom_timeout, dict) else SQL_TIMEOUT
|
||||
_default_timeout = _get_executor_timeout('mysql')
|
||||
timeout = custom_timeout.get('timeout', _default_timeout) if isinstance(custom_timeout, dict) else _default_timeout
|
||||
|
||||
try:
|
||||
# 1. 语法预校验
|
||||
@@ -370,7 +379,8 @@ class TicketExecutor:
|
||||
|
||||
# 获取超时配置
|
||||
custom_timeout = getattr(ticket, 'options', None) or {}
|
||||
timeout = custom_timeout.get('timeout', SQL_TIMEOUT) if isinstance(custom_timeout, dict) else SQL_TIMEOUT
|
||||
_default_timeout = _get_executor_timeout('postgres')
|
||||
timeout = custom_timeout.get('timeout', _default_timeout) if isinstance(custom_timeout, dict) else _default_timeout
|
||||
|
||||
try:
|
||||
# 1. 语法预校验
|
||||
@@ -516,7 +526,8 @@ class TicketExecutor:
|
||||
|
||||
# 获取超时配置
|
||||
custom_timeout = getattr(ticket, 'options', None) or {}
|
||||
timeout = custom_timeout.get('timeout', REDIS_TIMEOUT) if isinstance(custom_timeout, dict) else REDIS_TIMEOUT
|
||||
_default_timeout = _get_executor_timeout('redis')
|
||||
timeout = custom_timeout.get('timeout', _default_timeout) if isinstance(custom_timeout, dict) else _default_timeout
|
||||
|
||||
try:
|
||||
# 解析命令
|
||||
@@ -686,7 +697,8 @@ class TicketExecutor:
|
||||
|
||||
# 获取超时配置
|
||||
custom_timeout = getattr(ticket, 'options', None) or {}
|
||||
timeout = custom_timeout.get('timeout', MONGO_TIMEOUT) if isinstance(custom_timeout, dict) else MONGO_TIMEOUT
|
||||
_default_timeout = _get_executor_timeout('mongodb')
|
||||
timeout = custom_timeout.get('timeout', _default_timeout) if isinstance(custom_timeout, dict) else _default_timeout
|
||||
|
||||
try:
|
||||
# 解析工单内容
|
||||
|
||||
Reference in new issue
Block a user