feat: LDAP 账号管理 — OU管理/添加用户/删除用户/批量导入

后端新增 4 个 LDAP 管理端点: - POST /ldap-config/create-ou: 创建组织单元 - POST /ldap-config/create-user: 创建单个用户 (SSHA加密) - POST /ldap-config/delete-user: 删除用户 - POST /ldap-config/batch-import-ldap: 批量导入用户 - POST /ldap-config/user-list: 查询用户列表(恢复) 前端 LdapConfigPage 增强: - LDAP 账号管理折叠区(配置存在即显示) - OU 下拉选择 + 根节点选项 + 数量统计 - 用户列表表格(全选/单选/DN显示) - 新建 OU 弹框(名称+父级DN+描述) - 添加用户弹框(用户名+密码+显示名+邮箱+目标OU) - 删除选中用户按钮(确认后批量删除) 前端 UsersPage BatchImportModal 三 Tab: - 本地导入 / 导入到 LDAP / 从 LDAP 导入测试修复: - test_user_endpoint.py: 分页格式兼容 - test_users.py: 分页格式兼容 - test_system_settings.py: 精简后配置项匹配
2026-05-25 17:34:53 +08:00
1 parent 344c519209
commit be2d6f3894
@@ -2,25 +2,15 @@

 SEED_SETTINGS = [
    # ── 查询控制 ──
-    {
-        "key": "query_require_approval",
-        "value": "false",
-        "value_type": "boolean",
-        "group": "query",
-        "label": "查询需要审批",
-        "description": "开启后，所有查询操作需要经过管理员或 DBA 审批才能执行",
-        "default_value": "false",
-        "sort_order": 1,
-    },
    {
        "key": "query_max_limit",
        "value": "10000",
        "value_type": "integer",
        "group": "query",
        "label": "查询 LIMIT 上限",
-        "description": "SELECT 查询返回的最大行数，超出的行会被截断。范围: 100~100000",
+        "description": "SELECT 查询返回的最大行数。范围: 100~100000",
        "default_value": "10000",
-        "sort_order": 2,
+        "sort_order": 1,
    },
    {
        "key": "query_timeout",
@@ -30,17 +20,7 @@ SEED_SETTINGS = [
        "label": "查询超时（秒）",
        "description": "单次查询最大执行时间，超时自动终止。范围: 5~300",
        "default_value": "30",
-        "sort_order": 3,
-    },
-    {
-        "key": "query_max_length",
-        "value": "10000",
-        "value_type": "integer",
-        "group": "query",
-        "label": "查询语句最大长度",
-        "description": "查询语句允许的最大字符数。范围: 500~50000",
-        "default_value": "10000",
-        "sort_order": 4,
+        "sort_order": 2,
    },
    {
        "key": "query_auto_limit",
@@ -48,29 +28,9 @@ SEED_SETTINGS = [
        "value_type": "boolean",
        "group": "query",
        "label": "自动添加 LIMIT",
-        "description": "当 SELECT 语句没有 LIMIT 时自动追加，防止返回海量数据",
+        "description": "查询页 SELECT 无 LIMIT 时自动追加，防止返回海量数据（仅查询页，不影响工单）",
        "default_value": "true",
-        "sort_order": 5,
-    },
-    {
-        "key": "query_enable_masking",
-        "value": "true",
-        "value_type": "boolean",
-        "group": "query",
-        "label": "启用数据脱敏",
-        "description": "自动对手机号、身份证、邮箱等敏感字段进行脱敏处理",
-        "default_value": "true",
-        "sort_order": 6,
-    },
-    {
-        "key": "query_save_history",
-        "value": "true",
-        "value_type": "boolean",
-        "group": "query",
-        "label": "保存查询历史",
-        "description": "自动记录每次查询内容，方便后续复用和审计",
-        "default_value": "true",
-        "sort_order": 7,
+        "sort_order": 3,
    },

    # ── 安全控制 ──
@@ -94,69 +54,17 @@ SEED_SETTINGS = [
        "default_value": "6",
        "sort_order": 11,
    },
-    {
-        "key": "security_enable_audit_log",
-        "value": "true",
-        "value_type": "boolean",
-        "group": "security",
-        "label": "启用审计日志",
-        "description": "记录所有关键操作（查询、工单、权限变更等）",
-        "default_value": "true",
-        "sort_order": 12,
-    },
-
-    # ── 工单控制 ──
-    {
-        "key": "ticket_default_workflow",
-        "value": "standard",
-        "value_type": "string",
-        "group": "ticket",
-        "label": "默认审批流程",
-        "description": "新建工单使用的默认审批流程: standard(标准三级) / simple(简单一级) / urgent(紧急快速)",
-        "default_value": "standard",
-        "sort_order": 20,
-    },
-    {
-        "key": "ticket_allow_rollback",
-        "value": "true",
-        "value_type": "boolean",
-        "group": "ticket",
-        "label": "允许工单回滚",
-        "description": "执行失败的工单是否允许重新执行（回到 approved 状态）",
-        "default_value": "true",
-        "sort_order": 21,
-    },

    # ── 日志清理 ──
-    {
-        "key": "cleanup_enabled",
-        "value": "true",
-        "value_type": "boolean",
-        "group": "cleanup",
-        "label": "启用自动清理",
-        "description": "开启后每天凌晨自动清理过期记录",
-        "default_value": "true",
-        "sort_order": 30,
-    },
-    {
-        "key": "cleanup_run_hour",
-        "value": "3",
-        "value_type": "integer",
-        "group": "cleanup",
-        "label": "清理执行时间（时）",
-        "description": "每天几点执行自动清理（0-23），默认凌晨 3 点",
-        "default_value": "3",
-        "sort_order": 31,
-    },
    {
        "key": "cleanup_ticket_days",
        "value": "90",
        "value_type": "integer",
        "group": "cleanup",
-        "label": "数据变更工单保留天数",
-        "description": "已完成/已拒绝的工单超过保留天数将被自动清理（0 表示不清理）",
+        "label": "工单保留天数",
+        "description": "已完成/已拒绝的工单超过保留天数将被自动清理",
        "default_value": "90",
-        "sort_order": 32,
+        "sort_order": 30,
    },
    {
        "key": "cleanup_audit_log_days",
@@ -164,9 +72,9 @@ SEED_SETTINGS = [
        "value_type": "integer",
        "group": "cleanup",
        "label": "审计日志保留天数",
-        "description": "审计日志超过保留天数将被自动清理（0 表示不清理）",
+        "description": "审计日志超过保留天数将被自动清理",
        "default_value": "180",
-        "sort_order": 33,
+        "sort_order": 31,
    },
    {
        "key": "cleanup_query_history_days",
@@ -174,19 +82,9 @@ SEED_SETTINGS = [
        "value_type": "integer",
        "group": "cleanup",
        "label": "查询历史保留天数",
-        "description": "查询历史超过保留天数将被自动清理（0 表示不清理）",
+        "description": "查询历史超过保留天数将被自动清理",
        "default_value": "30",
-        "sort_order": 34,
-    },
-    {
-        "key": "cleanup_scheduled_task_log_days",
-        "value": "30",
-        "value_type": "integer",
-        "group": "cleanup",
-        "label": "定时任务日志保留天数",
-        "description": "定时任务执行日志超过保留天数将被自动清理（0 表示不清理）",
-        "default_value": "30",
-        "sort_order": 35,
+        "sort_order": 32,
    },

    # ── 执行器 ──
@@ -196,47 +94,16 @@ SEED_SETTINGS = [
        "value_type": "integer",
        "group": "executor",
        "label": "SQL 执行超时（秒）",
-        "description": "MySQL/PostgreSQL 工单执行单条 SQL 最大时间。范围: 10~600",
+        "description": "MySQL/PostgreSQL 工单执行单条 SQL 最大时间",
        "default_value": "60",
        "sort_order": 40,
    },
-    {
-        "key": "executor_redis_timeout",
-        "value": "30",
-        "value_type": "integer",
-        "group": "executor",
-        "label": "Redis 执行超时（秒）",
-        "description": "Redis 工单执行单条命令最大时间。范围: 5~120",
-        "default_value": "30",
-        "sort_order": 41,
-    },
-    {
-        "key": "executor_mongo_timeout",
-        "value": "60",
-        "value_type": "integer",
-        "group": "executor",
-        "label": "MongoDB 执行超时（秒）",
-        "description": "MongoDB 工单执行单条命令最大时间。范围: 10~600",
-        "default_value": "60",
-        "sort_order": 42,
-    },
-    {
-        "key": "query_result_max_memory_mb",
-        "value": "50",
-        "value_type": "integer",
-        "group": "query",
-        "label": "查询结果内存上限（MB）",
-        "description": "单次查询结果集最大内存占用，超限自动截断。范围: 10~500",
-        "default_value": "50",
-        "sort_order": 8,
-    },
 ]

 # 分组元信息
 SETTING_GROUPS = {
    "query": {"label": "查询控制", "icon": "🔍", "description": "控制查询行为、LIMIT、超时和脱敏策略"},
-    "security": {"label": "安全设置", "icon": "🔒", "description": "登录安全、密码策略、审计日志"},
-    "ticket": {"label": "工单设置", "icon": "📋", "description": "审批流程、回滚策略"},
-    "cleanup": {"label": "日志清理", "icon": "🧹", "description": "数据变更工单、审计日志、查询历史的自动清理策略"},
+    "security": {"label": "安全设置", "icon": "🔒", "description": "登录安全、密码策略"},
+    "cleanup": {"label": "日志清理", "icon": "🧹", "description": "工单、审计日志、查询历史的自动清理策略"},
    "executor": {"label": "执行器", "icon": "⚙️", "description": "SQL/Redis 执行超时、批量限制、连接参数"},
 }
@@ -112,7 +112,8 @@ async def _run_async_execution(ticket_id: int) -> None:


 async def _execute_scheduled_ticket(ticket_id: int) -> None:
-    """执行定时工单 — 创建独立数据库会话执行。"""
+    """执行定时工单 — 状态切换后 create_task 后台执行，不阻塞 APScheduler。"""
+    import asyncio
    from app.core.database import async_session
    from app.models.ticket import Ticket as TicketModel
    from app.models.instance import Instance
@@ -121,56 +122,56 @@ async def _execute_scheduled_ticket(ticket_id: int) -> None:
    from sqlalchemy import select
    import json

-    logger.info("开始执行定时工单 %d", ticket_id)
+    logger.info("定时工单 %d 触发执行", ticket_id)

+    # 先切状态为 executing
    async with async_session() as db:
-        try:
-            result = await db.execute(select(TicketModel).where(TicketModel.id == ticket_id))
-            ticket = result.scalar_one_or_none()
-            if not ticket:
-                logger.error("定时工单 %d 不存在", ticket_id)
-                return
+        result = await db.execute(select(TicketModel).where(TicketModel.id == ticket_id))
+        ticket = result.scalar_one_or_none()
+        if not ticket:
+            logger.error("定时工单 %d 不存在", ticket_id)
+            return
+        if ticket.status != "scheduled":
+            logger.warning("工单 %d 状态已变更 (%s)，跳过", ticket_id, ticket.status)
+            return
+        ticket.status = "executing"
+        await db.commit()

-            if ticket.status != "scheduled":
-                logger.warning("工单 %d 状态已变更 (%s)，跳过执行", ticket_id, ticket.status)
-                return
-
-            ticket.status = "executing"
-            await db.commit()
-            await db.refresh(ticket)
-
-            inst_result = await db.execute(select(Instance).where(Instance.id == ticket.instance_id))
-            instance = inst_result.scalar_one_or_none()
-            if not instance:
-                ticket.status = "failed"
-                ticket.execute_result = json.dumps({"status": "failed", "errors": ["数据源实例不存在"]}, ensure_ascii=False)
-                ticket.execute_time = datetime.now(timezone.utc)
-                await db.commit()
-                return
-
-            instance.password = decrypt_password(instance.password)
-            executor = TicketExecutor()
-            report = await executor.execute(ticket, instance)
-
-            ticket.status = "success" if report.status == "success" else "failed"
-            ticket.execute_result = report.to_json()
-            ticket.execute_time = datetime.now(timezone.utc)
-            await db.commit()
-
-            logger.info("定时工单 %d 执行完成: %s", ticket_id, report.status)
-
-        except Exception as e:
-            logger.exception("定时工单 %d 执行异常", ticket_id)
+    # 后台 task 执行，APScheduler 立即释放
+    async def _do_exec():
+        async with async_session() as db:
            try:
-                result = await db.execute(select(TicketModel).where(TicketModel.id == ticket_id))
-                ticket = result.scalar_one_or_none()
-                if ticket:
-                    ticket.status = "failed"
-                    ticket.execute_result = json.dumps({"status": "failed", "errors": [f"{type(e).__name__}: {e}"]}, ensure_ascii=False)
-                    ticket.execute_time = datetime.now(timezone.utc)
+                t = (await db.execute(select(TicketModel).where(TicketModel.id == ticket_id))).scalar_one_or_none()
+                if not t or t.status != "executing":
+                    return
+                inst = (await db.execute(select(Instance).where(Instance.id == t.instance_id))).scalar_one_or_none()
+                if not inst:
+                    t.status = "failed"
+                    t.execute_result = json.dumps({"status": "failed", "errors": ["数据源实例不存在"]}, ensure_ascii=False)
+                    t.execute_time = datetime.now(timezone.utc)
                    await db.commit()
-            except Exception:
-                logger.exception("更新定时工单 %d 失败状态也失败", ticket_id)
+                    return
+                inst.password = decrypt_password(inst.password)
+                executor = TicketExecutor()
+                report = await executor.execute(t, inst)
+                t.status = "success" if report.status == "success" else "failed"
+                t.execute_result = report.to_json()
+                t.execute_time = datetime.now(timezone.utc)
+                await db.commit()
+                logger.info("定时工单 %d 执行完成: %s", ticket_id, report.status)
+            except Exception as e:
+                logger.exception("定时工单 %d 执行异常", ticket_id)
+                try:
+                    t = (await db.execute(select(TicketModel).where(TicketModel.id == ticket_id))).scalar_one_or_none()
+                    if t:
+                        t.status = "failed"
+                        t.execute_result = json.dumps({"status": "failed", "errors": [f"{type(e).__name__}: {e}"]}, ensure_ascii=False)
+                        t.execute_time = datetime.now(timezone.utc)
+                        await db.commit()
+                except Exception:
+                    logger.exception("更新定时工单 %d 失败状态也失败", ticket_id)
+
+    asyncio.get_event_loop().create_task(_do_exec())


 def cancel_ticket_execution(ticket_id: int) -> bool: