mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-09-21 04:46:26 +00:00
refactor: 清理冗余代码与初始化数据,优化配置与调度器
本次提交包含多项优化和清理工作: 1. 新增订单类型枚举BUY,调整定时任务状态显示逻辑 2. 优化Redis连接配置,重构认证逻辑减少重复代码 3. 移除大量初始化演示数据、过期的租户与角色配置 4. 简化调度器状态存储,不再写入配置表而是内存缓存 5. 修复插件开关状态存储逻辑,调整字典数据标签与值 6. 优化WebSocket聊天处理,完善错误处理流程 7. 清理冗余导入与废弃的操作日志过滤逻辑
This commit is contained in:
@@ -2,7 +2,7 @@ import json
|
||||
import secrets
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, Path, Query, Request
|
||||
from fastapi import APIRouter, BackgroundTasks, Depends, Path, Query, Request
|
||||
from fastapi.responses import JSONResponse, RedirectResponse
|
||||
from redis.asyncio.client import Redis
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
@@ -63,11 +63,14 @@ _AUTH_TENANTS_NS = "auth_tenants"
|
||||
)
|
||||
async def login_for_access_token_controller(
|
||||
request: Request,
|
||||
background_tasks: BackgroundTasks,
|
||||
redis: Annotated[Redis, Depends(redis_getter)],
|
||||
login_form: Annotated[CustomOAuth2PasswordRequestForm, Depends()],
|
||||
db: Annotated[AsyncSession, Depends(db_getter)],
|
||||
) -> JSONResponse | dict:
|
||||
login_result = await LoginService.authenticate_user(request=request, redis=redis, login_form=login_form, db=db)
|
||||
login_result = await LoginService.authenticate_user(
|
||||
request=request, redis=redis, login_form=login_form, db=db, background_tasks=background_tasks
|
||||
)
|
||||
|
||||
logger.info(f"用户{login_form.username}登录成功")
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ from datetime import datetime, timedelta
|
||||
from typing import NewType
|
||||
|
||||
import ua_parser
|
||||
from fastapi import Request
|
||||
from fastapi import BackgroundTasks, Request
|
||||
from redis.asyncio.client import Redis
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
@@ -32,7 +32,7 @@ from app.core.security import (
|
||||
from app.utils.captcha_util import CaptchaUtil
|
||||
from app.utils.common_util import get_random_character
|
||||
from app.utils.hash_bcrpy_util import PwdUtil
|
||||
from app.utils.ip_local_util import IpLocalUtil
|
||||
from app.utils.ip_local_util import IpLocalUtil, get_client_ip
|
||||
|
||||
from .schema import (
|
||||
AutoLoginTokenSchema,
|
||||
@@ -56,8 +56,8 @@ async def _write_login_log(
|
||||
request_os: str | None = None,
|
||||
request_browser: str | None = None,
|
||||
msg: str | None = None,
|
||||
) -> None:
|
||||
"""写入登录日志(独立 session,避免事务回滚时丢失失败记录)"""
|
||||
) -> int | None:
|
||||
"""写入登录日志;返回日志 ID(用于后台补全归属地)。"""
|
||||
from app.api.v1.module_system.log.crud import LoginLogCRUD
|
||||
from app.api.v1.module_system.log.schema import LoginLogCreateSchema
|
||||
from app.core.base_schema import AuthSchema
|
||||
@@ -67,7 +67,7 @@ async def _write_login_log(
|
||||
async with async_db_session() as session:
|
||||
async with session.begin():
|
||||
_auth = AuthSchema(db=session, check_data_scope=False)
|
||||
await LoginLogCRUD(_auth).create(data=LoginLogCreateSchema(
|
||||
obj = await LoginLogCRUD(_auth).create(data=LoginLogCreateSchema(
|
||||
username=username,
|
||||
status=status,
|
||||
login_ip=login_ip,
|
||||
@@ -76,16 +76,41 @@ async def _write_login_log(
|
||||
request_browser=request_browser,
|
||||
msg=msg,
|
||||
))
|
||||
return obj.id if obj else None
|
||||
except Exception:
|
||||
pass # 登录日志写入失败不影响登录主流程
|
||||
return None
|
||||
|
||||
|
||||
def _resolve_request_ip(request: Request) -> str:
|
||||
"""从请求中解析客户端真实 IP"""
|
||||
x_forwarded_for = request.headers.get("X-Forwarded-For")
|
||||
if x_forwarded_for:
|
||||
return x_forwarded_for.split(",")[0].strip()
|
||||
return request.client.host if request.client else "127.0.0.1"
|
||||
async def _async_fill_login_location(
|
||||
redis, login_log_id: int, ip: str | None
|
||||
) -> None:
|
||||
"""后台异步补全登录日志的归属地。"""
|
||||
if not ip:
|
||||
return
|
||||
try:
|
||||
location = await IpLocalUtil.resolve_location_async(redis, ip)
|
||||
if location == "归属地查询中" or not location:
|
||||
return
|
||||
from sqlalchemy import update as sa_update
|
||||
|
||||
from app.api.v1.module_system.log.model import LoginLogModel
|
||||
from app.core.database import async_db_session
|
||||
|
||||
async with async_db_session() as session:
|
||||
async with session.begin():
|
||||
await session.execute(
|
||||
sa_update(LoginLogModel)
|
||||
.where(LoginLogModel.id == login_log_id)
|
||||
.values(login_location=location)
|
||||
)
|
||||
except Exception as e:
|
||||
from app.core.logger import logger
|
||||
logger.warning(f"异步补全登录归属地失败: {e}")
|
||||
|
||||
|
||||
def _resolve_request_ip(request: Request) -> str | None:
|
||||
"""从请求中解析客户端真实 IP。"""
|
||||
return get_client_ip(request)
|
||||
|
||||
|
||||
class LoginService:
|
||||
@@ -98,6 +123,7 @@ class LoginService:
|
||||
async def authenticate_user(
|
||||
cls,
|
||||
request: Request,
|
||||
background_tasks: BackgroundTasks,
|
||||
redis: Redis,
|
||||
login_form: CustomOAuth2PasswordRequestForm,
|
||||
db: AsyncSession,
|
||||
@@ -105,7 +131,7 @@ class LoginService:
|
||||
"""用户认证"""
|
||||
ua_result = ua_parser.parse(request.headers.get("user-agent"))
|
||||
request_ip = _resolve_request_ip(request)
|
||||
login_location = await IpLocalUtil.resolve_location_for_log(request_ip)
|
||||
login_location = await IpLocalUtil.resolve_location_for_log(redis, request_ip)
|
||||
_login_os = ua_result.os.family if ua_result.os else "Unknown"
|
||||
_login_browser = ua_result.user_agent.family if ua_result.user_agent else "Unknown"
|
||||
_login_username = login_form.username
|
||||
@@ -203,7 +229,7 @@ class LoginService:
|
||||
"is_superuser": user.is_superuser,
|
||||
}
|
||||
|
||||
await _write_login_log(
|
||||
log_id = await _write_login_log(
|
||||
username=user.username,
|
||||
status=1,
|
||||
login_ip=request_ip,
|
||||
@@ -212,6 +238,9 @@ class LoginService:
|
||||
request_browser=_login_browser,
|
||||
msg="登录成功",
|
||||
)
|
||||
# 登录成功后异步补全归属地,不阻塞返回
|
||||
if log_id and login_location == "归属地查询中":
|
||||
background_tasks.add_task(_async_fill_login_location, redis, log_id, request_ip)
|
||||
|
||||
return LoginWithTenantsSchema(
|
||||
access_token=token.access_token,
|
||||
@@ -229,7 +258,7 @@ class LoginService:
|
||||
ua_result = ua_parser.parse(request.headers.get("user-agent"))
|
||||
request_ip = _resolve_request_ip(request)
|
||||
|
||||
login_location = await IpLocalUtil.resolve_location_for_log(request_ip)
|
||||
login_location = await IpLocalUtil.resolve_location_for_log(redis, request_ip)
|
||||
|
||||
from dataclasses import replace
|
||||
|
||||
@@ -243,8 +272,8 @@ class LoginService:
|
||||
login_location=login_location,
|
||||
)
|
||||
|
||||
access_expires = timedelta(seconds=settings.ACCESS_TOKEN_EXPIRE_MINUTES)
|
||||
refresh_expires = timedelta(seconds=settings.REFRESH_TOKEN_EXPIRE_MINUTES)
|
||||
access_expires = timedelta(seconds=settings.ACCESS_TOKEN_EXPIRE_SECONDS)
|
||||
refresh_expires = timedelta(seconds=settings.REFRESH_TOKEN_EXPIRE_SECONDS)
|
||||
|
||||
now = datetime.now()
|
||||
|
||||
@@ -335,8 +364,8 @@ class LoginService:
|
||||
if user.status == 1:
|
||||
raise CustomException(msg="用户已被停用")
|
||||
|
||||
access_expires = timedelta(seconds=settings.ACCESS_TOKEN_EXPIRE_MINUTES)
|
||||
refresh_expires = timedelta(seconds=settings.REFRESH_TOKEN_EXPIRE_MINUTES)
|
||||
access_expires = timedelta(seconds=settings.ACCESS_TOKEN_EXPIRE_SECONDS)
|
||||
refresh_expires = timedelta(seconds=settings.REFRESH_TOKEN_EXPIRE_SECONDS)
|
||||
now = datetime.now()
|
||||
|
||||
# 延长会话信息 Redis TTL
|
||||
@@ -472,7 +501,7 @@ class LoginService:
|
||||
|
||||
# 更新会话中的租户 ID 并写回 Redis
|
||||
session_info["tenant_id"] = tenant_id
|
||||
refresh_expires = timedelta(seconds=settings.REFRESH_TOKEN_EXPIRE_MINUTES)
|
||||
refresh_expires = timedelta(seconds=settings.REFRESH_TOKEN_EXPIRE_SECONDS)
|
||||
from app.core.redis_crud import RedisCURD
|
||||
from app.core.security import create_access_token
|
||||
|
||||
@@ -482,7 +511,7 @@ class LoginService:
|
||||
expire=int(refresh_expires.total_seconds()),
|
||||
)
|
||||
|
||||
access_expires = timedelta(seconds=settings.ACCESS_TOKEN_EXPIRE_MINUTES)
|
||||
access_expires = timedelta(seconds=settings.ACCESS_TOKEN_EXPIRE_SECONDS)
|
||||
now = datetime.now()
|
||||
|
||||
new_access_token = create_access_token(
|
||||
|
||||
@@ -50,7 +50,7 @@ class OperationLogModel(ModelMixin, TenantMixin, UserMixin):
|
||||
__table_args__: dict[str, str] = {"comment": "操作日志表"}
|
||||
__loader_options__: list[str] = ["created_by", "updated_by", "deleted_by", "tenant_by"]
|
||||
|
||||
status: Mapped[int] = mapped_column(Integer, default=0, nullable=False, comment="状态(0:启动 1:停用)", index=True)
|
||||
status: Mapped[int] = mapped_column(Integer, default=0, nullable=False, comment="操作状态(0:成功 1:失败)", index=True)
|
||||
description: Mapped[str | None] = mapped_column(Text, default=None, nullable=True, comment="备注")
|
||||
request_path: Mapped[str] = mapped_column(String(255), comment="请求路径")
|
||||
request_method: Mapped[str] = mapped_column(String(10), comment="请求方式")
|
||||
|
||||
@@ -69,21 +69,21 @@ class OperationLogService:
|
||||
async def cleanup_operation_log() -> None:
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
from sqlalchemy import delete, select
|
||||
from sqlalchemy import delete
|
||||
|
||||
from app.api.v1.module_system.params.service import ParamsService
|
||||
from app.core.ap_scheduler import SchedulerUtil
|
||||
from app.core.database import async_db_session
|
||||
|
||||
from .model import LoginLogModel, OperationLogModel
|
||||
|
||||
retention_days = 90
|
||||
try:
|
||||
from app.api.v1.module_system.params.model import ParamsModel
|
||||
|
||||
async with async_db_session() as _s:
|
||||
result = await _s.execute(select(ParamsModel.config_value).where(ParamsModel.config_key == "operation_log_retention_days").limit(1))
|
||||
row = result.scalar()
|
||||
if row is not None:
|
||||
retention_days = int(row)
|
||||
redis = SchedulerUtil.redis_instance
|
||||
if redis:
|
||||
# 调度任务是平台级别的,统一使用平台租户(id=1)的配置
|
||||
config = await ParamsService.get_system_config_for_middleware(redis, tenant_id=1)
|
||||
retention_days = int(config.get("operation_log_retention_days") or 90)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
@@ -19,9 +19,89 @@ from .schema import (
|
||||
ParamsUpdateSchema,
|
||||
)
|
||||
|
||||
# 中间件系统配置内存缓存(避免每请求查 Redis)
|
||||
_MID_CONFIG_TTL: float = 60.0 # 缓存 60 秒
|
||||
_mid_config_cache: dict = {"ts": 0.0, "data": None}
|
||||
# 中间件 / 调度器高频读取的 sys_param 配置键集合。
|
||||
MIDDLEWARE_CONFIG_KEYS: tuple[str, ...] = (
|
||||
"demo_enable",
|
||||
"ip_white_list",
|
||||
"white_api_list_path",
|
||||
"ip_black_list",
|
||||
"operation_log_retention_days",
|
||||
)
|
||||
|
||||
# 内存缓存(按租户隔离)
|
||||
_MID_CONFIG_TTL: float = 60.0
|
||||
_mid_config_cache: dict[int, dict] = {}
|
||||
|
||||
|
||||
def _parse_bool(value: object) -> bool:
|
||||
"""兼容字符串 / 布尔值 / JSON 布尔值的开关字段解析。
|
||||
|
||||
支持的字符串真值:true / 1 / yes / on
|
||||
支持的字符串假值:false / 0 / no / off(以及空字符串、None)
|
||||
"""
|
||||
if isinstance(value, bool):
|
||||
return value
|
||||
if isinstance(value, str):
|
||||
normalized = value.strip().lower()
|
||||
if normalized in {"true", "1", "yes", "on"}:
|
||||
return True
|
||||
if normalized in {"false", "0", "no", "off", ""}:
|
||||
return False
|
||||
try:
|
||||
return bool(json.loads(normalized))
|
||||
except (json.JSONDecodeError, ValueError):
|
||||
return False
|
||||
if value is None:
|
||||
return False
|
||||
return bool(value)
|
||||
|
||||
|
||||
def _parse_json_list(value: object) -> list:
|
||||
"""兼容 JSON 字符串 / 列表 / 空值的数组字段解析。"""
|
||||
if isinstance(value, list):
|
||||
return value
|
||||
if isinstance(value, str):
|
||||
try:
|
||||
parsed = json.loads(value)
|
||||
return parsed if isinstance(parsed, list) else []
|
||||
except (json.JSONDecodeError, ValueError):
|
||||
return []
|
||||
return []
|
||||
|
||||
|
||||
def _invalidate_mid_config_cache(tenant_id: int | None = None) -> None:
|
||||
"""失效中间件内存缓存。tenant_id 为 None 时清空所有租户。"""
|
||||
if tenant_id is None:
|
||||
_mid_config_cache.clear()
|
||||
else:
|
||||
_mid_config_cache.pop(tenant_id, None)
|
||||
|
||||
|
||||
def _default_for(key: str) -> object:
|
||||
"""缺省值表:新增 MIDDLEWARE_CONFIG_KEYS 时只需在这里登记默认值。"""
|
||||
if key in {"ip_white_list", "ip_black_list", "white_api_list_path"}:
|
||||
return []
|
||||
if key == "demo_enable":
|
||||
return False
|
||||
if key == "operation_log_retention_days":
|
||||
return 90
|
||||
return None
|
||||
|
||||
|
||||
def _parse_value(key: str, value: object) -> object:
|
||||
"""按 key 的语义解析 config_value。"""
|
||||
if key == "demo_enable":
|
||||
return _parse_bool(value)
|
||||
if key in {"ip_white_list", "ip_black_list", "white_api_list_path"}:
|
||||
return _parse_json_list(value)
|
||||
if key == "operation_log_retention_days":
|
||||
if value is None:
|
||||
return 90
|
||||
try:
|
||||
return int(value)
|
||||
except (TypeError, ValueError):
|
||||
return 90
|
||||
return value
|
||||
|
||||
|
||||
class ParamsService:
|
||||
@@ -199,6 +279,9 @@ class ParamsService:
|
||||
logger.error(f"更新系统配置失败: {e}")
|
||||
raise CustomException(msg="同步配置到缓存失败") from e
|
||||
|
||||
# 失效中间件内存缓存,让下次请求重新加载
|
||||
_invalidate_mid_config_cache(self.auth.user.tenant_id)
|
||||
|
||||
return out
|
||||
|
||||
async def delete(self, redis: Redis, ids: list[int]) -> None:
|
||||
@@ -235,13 +318,16 @@ class ParamsService:
|
||||
logger.error(f"删除系统配置失败: {e}")
|
||||
raise CustomException(msg="同步删除缓存失败") from e
|
||||
|
||||
# 失效中间件内存缓存
|
||||
_invalidate_mid_config_cache(self.auth.user.tenant_id)
|
||||
|
||||
async def batch_set_status(self, ids: list[int], status: int) -> None:
|
||||
"""
|
||||
批量设置系统参数状态
|
||||
|
||||
参数:
|
||||
- ids (list[int]): 系统参数ID列表
|
||||
- status (str): 状态值
|
||||
- status (int): 状态值
|
||||
|
||||
返回:
|
||||
- None
|
||||
@@ -284,168 +370,108 @@ class ParamsService:
|
||||
return ExcelUtil.export_list2excel(list_data=data, mapping_dict=mapping_dict)
|
||||
|
||||
@staticmethod
|
||||
async def init_cache(redis: Redis) -> None:
|
||||
"""
|
||||
初始化系统参数并按租户缓存(无 auth)。
|
||||
|
||||
参数:
|
||||
- redis (Redis): Redis 客户端实例
|
||||
|
||||
返回:
|
||||
- None
|
||||
"""
|
||||
async def _load_all_configs_from_db() -> list:
|
||||
async with async_db_session() as session:
|
||||
async with session.begin():
|
||||
init_auth = AuthSchema(db=session, check_data_scope=False)
|
||||
config_obj = await ParamsCRUD(init_auth).get_list()
|
||||
if not config_obj:
|
||||
raise CustomException(msg="该数据不存在")
|
||||
try:
|
||||
for config in config_obj:
|
||||
tenant_id = config.tenant_id
|
||||
redis_key = f"{RedisInitKeyConfig.SYSTEM_CONFIG.key}:{tenant_id}:{config.config_key}"
|
||||
out = ParamsOutSchema.model_validate(config)
|
||||
redis_payload = out.model_dump(mode="json")
|
||||
value = json.dumps(redis_payload, ensure_ascii=False)
|
||||
result = await RedisCURD(redis).set(
|
||||
key=redis_key,
|
||||
value=value,
|
||||
expire=None,
|
||||
)
|
||||
if not result:
|
||||
logger.error(f"❌️ 初始化系统配置失败: {redis_key}")
|
||||
raise CustomException(msg="初始化系统配置失败")
|
||||
except Exception as e:
|
||||
logger.error(f"❌️ 初始化系统配置失败: {e}")
|
||||
raise CustomException(msg="初始化系统配置失败") from e
|
||||
return await ParamsCRUD(init_auth).get_list()
|
||||
|
||||
@staticmethod
|
||||
async def get_init_cache(redis: Redis, tenant_id: int = 1) -> list[dict]:
|
||||
"""
|
||||
获取系统配置(无 auth)。
|
||||
|
||||
参数:
|
||||
- redis (Redis): Redis 客户端实例
|
||||
- tenant_id (int): 租户ID
|
||||
|
||||
返回:
|
||||
- list[dict]: 系统配置字典列表
|
||||
"""
|
||||
redis_keys = await RedisCURD(redis).get_keys(f"{RedisInitKeyConfig.SYSTEM_CONFIG.key}:{tenant_id}:*")
|
||||
redis_configs = await RedisCURD(redis).mget(redis_keys)
|
||||
configs = []
|
||||
for config in redis_configs:
|
||||
if not config:
|
||||
continue
|
||||
async def _sync_configs_to_redis(redis: Redis, config_obj: list) -> list[dict]:
|
||||
"""将 DB 配置写入 Redis,返回对应的 dict 列表。"""
|
||||
configs: list[dict] = []
|
||||
for config in config_obj:
|
||||
redis_key = f"{RedisInitKeyConfig.SYSTEM_CONFIG.key}:{config.tenant_id}:{config.config_key}"
|
||||
out = ParamsOutSchema.model_validate(config)
|
||||
payload = out.model_dump(mode="json")
|
||||
try:
|
||||
new_config = json.loads(config)
|
||||
configs.append(new_config)
|
||||
await RedisCURD(redis).set(redis_key, json.dumps(payload, ensure_ascii=False))
|
||||
configs.append(out.model_dump())
|
||||
except Exception as e:
|
||||
logger.error(f"解析系统配置数据失败: {e}")
|
||||
continue
|
||||
|
||||
# 如果 Redis 中没有数据,从数据库中加载并缓存
|
||||
if not configs:
|
||||
async with async_db_session() as session:
|
||||
async with session.begin():
|
||||
init_auth = AuthSchema(db=session, check_data_scope=False)
|
||||
config_obj = await ParamsCRUD(init_auth).get_list()
|
||||
if config_obj:
|
||||
try:
|
||||
for config in config_obj:
|
||||
redis_key = f"{RedisInitKeyConfig.SYSTEM_CONFIG.key}:{tenant_id}:{config.config_key}"
|
||||
out = ParamsOutSchema.model_validate(config)
|
||||
config_obj_dict = out.model_dump()
|
||||
redis_payload = out.model_dump(mode="json")
|
||||
value = json.dumps(redis_payload, ensure_ascii=False)
|
||||
result = await RedisCURD(redis).set(
|
||||
key=redis_key,
|
||||
value=value,
|
||||
expire=None,
|
||||
)
|
||||
if not result:
|
||||
logger.error(f"❌️ 缓存系统配置失败: {config_obj_dict}")
|
||||
configs.append(config_obj_dict)
|
||||
except Exception as e:
|
||||
logger.error(f"❌️ 加载系统配置失败: {e}")
|
||||
|
||||
logger.error(f"❌️ 缓存系统配置失败: {redis_key}: {e}")
|
||||
return configs
|
||||
|
||||
@staticmethod
|
||||
async def get_system_config_for_middleware(redis: Redis) -> dict:
|
||||
async def init_cache(redis: Redis) -> None:
|
||||
"""启动时初始化系统参数到 Redis。"""
|
||||
config_obj = await ParamsService._load_all_configs_from_db()
|
||||
if not config_obj:
|
||||
raise CustomException(msg="该数据不存在")
|
||||
await ParamsService._sync_configs_to_redis(redis, config_obj)
|
||||
|
||||
@staticmethod
|
||||
async def get_init_cache(redis: Redis, tenant_id: int = 1) -> list[dict]:
|
||||
"""从 Redis 读取系统配置;为空时自动回源 DB。"""
|
||||
redis_keys = await RedisCURD(redis).get_keys(f"{RedisInitKeyConfig.SYSTEM_CONFIG.key}:{tenant_id}:*")
|
||||
redis_configs = await RedisCURD(redis).mget(redis_keys)
|
||||
configs = []
|
||||
for raw in redis_configs:
|
||||
if not raw:
|
||||
continue
|
||||
try:
|
||||
configs.append(json.loads(raw))
|
||||
except Exception as e:
|
||||
logger.error(f"解析系统配置数据失败: {e}")
|
||||
|
||||
if not configs:
|
||||
config_obj = await ParamsService._load_all_configs_from_db()
|
||||
if config_obj:
|
||||
configs = await ParamsService._sync_configs_to_redis(redis, config_obj)
|
||||
return configs
|
||||
|
||||
@staticmethod
|
||||
async def get_system_config_for_middleware(redis: Redis, tenant_id: int = 1) -> dict:
|
||||
"""
|
||||
获取中间件所需的系统配置(带 60 秒内存缓存,避免每请求查 Redis)。
|
||||
获取中间件 / 调度器所需的系统配置(带 60 秒内存缓存,按租户隔离)。
|
||||
|
||||
参数:
|
||||
- redis (Redis): Redis 客户端实例
|
||||
- tenant_id (int): 租户 ID
|
||||
|
||||
返回:
|
||||
- dict: 包含演示模式、IP白名单、API白名单和IP黑名单的配置字典
|
||||
- dict: 包含 MIDDLEWARE_CONFIG_KEYS 中所有 key 的解析后值。
|
||||
"""
|
||||
now = time.monotonic()
|
||||
if _mid_config_cache["data"] and now - _mid_config_cache["ts"] < _MID_CONFIG_TTL:
|
||||
return _mid_config_cache["data"]
|
||||
cached = _mid_config_cache.get(tenant_id)
|
||||
if cached and time.monotonic() - cached[0] < _MID_CONFIG_TTL:
|
||||
return cached[1]
|
||||
|
||||
config_result = await ParamsService._fetch_system_config_for_middleware(redis)
|
||||
_mid_config_cache["data"] = config_result
|
||||
_mid_config_cache["ts"] = now
|
||||
return config_result
|
||||
config = await ParamsService._fetch_system_config_for_middleware(redis, tenant_id)
|
||||
_mid_config_cache[tenant_id] = (time.monotonic(), config)
|
||||
return config
|
||||
|
||||
@staticmethod
|
||||
async def _fetch_system_config_for_middleware(redis: Redis) -> dict:
|
||||
# 定义需要获取的配置键
|
||||
config_keys = [
|
||||
f"{RedisInitKeyConfig.SYSTEM_CONFIG.key}:1:demo_enable",
|
||||
f"{RedisInitKeyConfig.SYSTEM_CONFIG.key}:1:ip_white_list",
|
||||
f"{RedisInitKeyConfig.SYSTEM_CONFIG.key}:1:white_api_list_path",
|
||||
f"{RedisInitKeyConfig.SYSTEM_CONFIG.key}:1:ip_black_list",
|
||||
]
|
||||
async def _fetch_system_config_for_middleware(redis: Redis, tenant_id: int = 1) -> dict:
|
||||
"""从 Redis 批量拉取并解析 MIDDLEWARE_CONFIG_KEYS 中的配置。
|
||||
|
||||
# 批量获取配置
|
||||
停用(status=1)的配置视为未配置,使用默认值。
|
||||
"""
|
||||
config_keys = [
|
||||
f"{RedisInitKeyConfig.SYSTEM_CONFIG.key}:{tenant_id}:{key}"
|
||||
for key in MIDDLEWARE_CONFIG_KEYS
|
||||
]
|
||||
config_values = await RedisCURD(redis).mget(config_keys)
|
||||
|
||||
# 初始化默认配置
|
||||
config_result = {
|
||||
"demo_enable": False,
|
||||
"ip_white_list": [],
|
||||
"white_api_list_path": [],
|
||||
"ip_black_list": [],
|
||||
}
|
||||
result: dict[str, object] = {}
|
||||
for key, raw in zip(MIDDLEWARE_CONFIG_KEYS, config_values, strict=True):
|
||||
if not raw:
|
||||
result[key] = _default_for(key)
|
||||
continue
|
||||
try:
|
||||
payload = json.loads(raw)
|
||||
except json.JSONDecodeError:
|
||||
logger.error("解析系统配置 %s 失败", key)
|
||||
result[key] = _default_for(key)
|
||||
continue
|
||||
|
||||
# 解析演示模式配置
|
||||
if config_values[0]:
|
||||
try:
|
||||
demo_config = json.loads(config_values[0])
|
||||
config_result["demo_enable"] = (
|
||||
demo_config.get("config_value", False) if isinstance(demo_config, dict) else False
|
||||
)
|
||||
except json.JSONDecodeError:
|
||||
logger.error("解析演示模式配置失败")
|
||||
if not isinstance(payload, dict):
|
||||
result[key] = _default_for(key)
|
||||
continue
|
||||
|
||||
# 解析IP白名单配置
|
||||
if config_values[1]:
|
||||
try:
|
||||
ip_white_config = json.loads(config_values[1])
|
||||
# 确保是列表类型
|
||||
config_result["ip_white_list"] = json.loads(ip_white_config.get("config_value", []))
|
||||
except json.JSONDecodeError:
|
||||
logger.error("解析IP白名单配置失败")
|
||||
# 解析IP黑名单
|
||||
# 解析API路径白名单
|
||||
if config_values[2]:
|
||||
try:
|
||||
white_api_config = json.loads(config_values[2])
|
||||
# 确保是列表类型
|
||||
config_result["white_api_list_path"] = json.loads(white_api_config.get("config_value", []))
|
||||
except json.JSONDecodeError:
|
||||
logger.error("解析API白名单配置失败")
|
||||
# 停用的配置视为未启用,使用默认值
|
||||
if payload.get("status", 0) != 0:
|
||||
result[key] = _default_for(key)
|
||||
continue
|
||||
|
||||
# 解析IP黑名单
|
||||
if config_values[3]:
|
||||
try:
|
||||
black_ip_config = json.loads(config_values[3])
|
||||
# 确保是列表类型
|
||||
config_result["ip_black_list"] = json.loads(black_ip_config.get("config_value", []))
|
||||
except json.JSONDecodeError:
|
||||
logger.error("解析IP黑名单配置失败")
|
||||
return config_result
|
||||
result[key] = _parse_value(key, payload.get("config_value"))
|
||||
|
||||
return result
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
from dataclasses import dataclass
|
||||
|
||||
from fastapi import Query
|
||||
from pydantic import BaseModel, ConfigDict, Field, field_validator
|
||||
|
||||
from app.common.enums import QueueEnum, TicketTypeEnum
|
||||
|
||||
Reference in New Issue
Block a user