364e688382
主要改动: backend 业务: - feat(error-codes): 统一错误码表 E1011/E1012 拆码 - E1011 AUTH_PASSWORD_WRONG: 本地密码错误 - E1012 AUTH_FIRST_LOGIN_PASSWORD_REQUIRED: 首次登录请先设置密码 - E1015 AUTH_OLD_PASSWORD_REQUIRED: 改密需要旧密码 - E1016 AUTH_OLD_PASSWORD_WRONG: 旧密码错误 - fix(agents): P0 降级放行时,如坐席已注册但未设密码,正确 raise 1012 (修复前会撞 1011 本地密码错误,与场景不符) - feat(approval): 审批模块 (T审批/A审批) - feat(config): approval_template_resource / approval_template_device 配置 - feat(main): /ready, /metrics, /version 端点(K8s 友好) backend 测试: - test(agents): 新增 test_agents.py — 3 个 Fix-4 降级登录测试 - 错误密码拒绝 - 缺密码拒绝 - 正确密码通过 pytest tests/test_agents.py → 3/3 通过 - test(conftest): 模块级 mock + slowapi 限流重置 + UTF-8 patch 解决 Windows pytest GBK 读 .env 失败 + 降级路径无法测试 仓库治理: - chore(gitignore): 排除 .workbuddy/memory/(workbuddy 本地记忆) - chore(docs): 重命名两份 IT 文档(前缀加智能区分版本) 部署与文档: - docs: RELEASE_NOTES_v0.5.0-beta.md / dashboard.html / 需求-发版预览页面 - docs: 部署、架构、PRD、安全、评审报告等同步 v0.5.0-beta - deploy-server: 打包脚本、nginx、docker-compose 版本号 bump 前端 (frontend-h5 / frontend-agent / frontend-admin / frontend-portal): - index.html / package.json 版本号与构建号 bump 自动验收(RELEASE_NOTES L100-104): - [x] pytest tests/test_agents.py -v → 3 passed - [x] grep Bs7ucT backend frontend-h5 frontend-agent → 无输出 - [x] grep AppException(101[123]) backend → 仅 1 处(登录场景 1012) - [ ] npm run build (frontend-h5 / frontend-agent) → 合并后跑 后续: 合并 feature/t-1-t4-merge → main,tag v0.5.0-beta
100 lines
3.0 KiB
Python
100 lines
3.0 KiB
Python
# =============================================================================
|
|
# IT智能服务台 — 日志配置
|
|
# =============================================================================
|
|
# 说明:统一日志格式,支持 JSON 输出便于日志收集
|
|
# =============================================================================
|
|
|
|
import json
|
|
import logging
|
|
import sys
|
|
from datetime import datetime
|
|
from typing import Any
|
|
|
|
|
|
class JSONFormatter(logging.Formatter):
|
|
"""JSON 格式日志 formatter"""
|
|
|
|
def format(self, record: logging.LogRecord) -> str:
|
|
"""将日志记录格式化为 JSON"""
|
|
log_data: dict[str, Any] = {
|
|
"timestamp": datetime.utcnow().isoformat() + "Z",
|
|
"level": record.levelname,
|
|
"logger": record.name,
|
|
"message": record.getMessage(),
|
|
"module": record.module,
|
|
"function": record.funcName,
|
|
"line": record.lineno,
|
|
}
|
|
|
|
# 添加异常信息
|
|
if record.exc_info:
|
|
log_data["exception"] = self.formatException(record.exc_info)
|
|
|
|
# 添加额外字段
|
|
if hasattr(record, "request_id"):
|
|
log_data["request_id"] = record.request_id
|
|
if hasattr(record, "user_id"):
|
|
log_data["user_id"] = record.user_id
|
|
if hasattr(record, "extra"):
|
|
log_data.update(record.extra)
|
|
|
|
return json.dumps(log_data, ensure_ascii=False)
|
|
|
|
|
|
class PlainFormatter(logging.Formatter):
|
|
"""普通格式日志 formatter(开发环境使用)"""
|
|
|
|
def __init__(self):
|
|
super().__init__(
|
|
fmt="%(asctime)s [%(levelname)s] %(name)s: %(message)s",
|
|
datefmt="%Y-%m-%d %H:%M:%S",
|
|
)
|
|
|
|
|
|
def setup_logging(level: str = "INFO", json_format: bool = False) -> None:
|
|
"""配置日志系统
|
|
|
|
Args:
|
|
level: 日志级别 (DEBUG, INFO, WARNING, ERROR, CRITICAL)
|
|
json_format: 是否使用 JSON 格式输出
|
|
"""
|
|
log_level = getattr(logging, level.upper(), logging.INFO)
|
|
|
|
# 获取 root logger
|
|
root_logger = logging.getLogger()
|
|
root_logger.setLevel(log_level)
|
|
|
|
# 清除现有 handlers
|
|
for handler in root_logger.handlers[:]:
|
|
root_logger.removeHandler(handler)
|
|
|
|
# 创建 console handler
|
|
console_handler = logging.StreamHandler(sys.stdout)
|
|
console_handler.setLevel(log_level)
|
|
|
|
# 设置 formatter
|
|
if json_format:
|
|
formatter = JSONFormatter()
|
|
else:
|
|
formatter = PlainFormatter()
|
|
|
|
console_handler.setFormatter(formatter)
|
|
root_logger.addHandler(console_handler)
|
|
|
|
# 设置第三方库日志级别
|
|
logging.getLogger("uvicorn").setLevel(logging.WARNING)
|
|
logging.getLogger("fastapi").setLevel(logging.WARNING)
|
|
logging.getLogger("sqlalchemy.engine").setLevel(logging.WARNING)
|
|
|
|
|
|
def get_logger(name: str) -> logging.Logger:
|
|
"""获取 logger 实例
|
|
|
|
Args:
|
|
name: logger 名称,通常使用 __name__
|
|
|
|
Returns:
|
|
Logger 实例
|
|
"""
|
|
return logging.getLogger(name)
|