✨ Compatible with pydantic 2.0 using the pydantic compatibility layer provided by nonebot

This commit is contained in:
HibiKier
2025-01-10 12:19:11 +08:00
committed by BalconyJH
parent 23ef00d01f
commit e814469b75
69 changed files with 178 additions and 147 deletions
@@ -12,7 +12,7 @@ from zhenxun.services.log import logger
from ....base_model import BaseResultModel, QueryModel, Result
from ....utils import authentication
from .data_source import ApiDataSource, type2sql
from .models.model import Column, SqlModel, SqlText
from .models.model import Column, SqlLogInfo, SqlModel, SqlText
from .models.sql_log import SqlLog
router = APIRouter(prefix="/database")
@@ -125,7 +125,8 @@ async def _(query: QueryModel) -> Result[BaseResultModel]:
.offset((query.index - 1) * query.size)
.limit(query.size)
)
return Result.ok(BaseResultModel(total=total, data=data))
result_list = [SqlLogInfo(sql=e.sql) for e in data]
return Result.ok(BaseResultModel(total=total, data=result_list))
except Exception as e:
logger.error(f"{router.prefix}/get_sql_log 调用错误", "WebUi", e=e)
return Result.fail(f"发生了一点错误捏 {type(e)}: {e}")
@@ -3,6 +3,11 @@ from pydantic import BaseModel
from zhenxun.utils.plugin_models.base import CommonSql
class SqlLogInfo(BaseModel):
sql: str
"""sql语句"""
class SqlText(BaseModel):
"""
sql语句