diff --git a/server/common/log.py b/server/common/log.py index f308de5..1fc7d32 100644 --- a/server/common/log.py +++ b/server/common/log.py @@ -24,7 +24,6 @@ def emit(self, record): def init_logging(): # 获取所有uvicorn的日志设定,并重置 - print(logging.root.manager.loggerDict) loggers = ( logging.getLogger(name) for name in logging.root.manager.loggerDict diff --git a/server/routers/internal/dictonary.py b/server/routers/internal/dictonary.py index 0ea3434..ae8c00e 100644 --- a/server/routers/internal/dictonary.py +++ b/server/routers/internal/dictonary.py @@ -51,9 +51,15 @@ async def del_dict_item(item_id: int, session: Session = Depends(get_session)): response_model_exclude={'data': {'__all__': {'desc', 'sort', 'enable'}}}) async def get_dict(dict_code: str, session: Session = Depends(get_session)): dict_items: List[DictItem] = crud.internal.dict_item.get_items_by_code(session, dict_code) - return ApiResponse( - data=[DictRead.from_orm(item) for item in dict_items] - ) + if dict_items: + return ApiResponse( + data=[DictRead.from_orm(item) for item in dict_items] + ) + else: + return ApiResponse( + code=404, + message=f"无效的数据字典:{dict_code}" + ) @router.post("/dict", summary="新建数据字典", response_model=ApiResponse[DataDict]) diff --git a/server/settings.py b/server/settings.py index ef76e5e..c1b649d 100644 --- a/server/settings.py +++ b/server/settings.py @@ -24,6 +24,6 @@ class APISettings(BaseSettings): settings = APISettings() -engine = create_engine(settings.DATABASE_URI, future=False) +engine = create_engine(settings.DATABASE_URI, pool_size=5, max_overflow=10, pool_timeout=30, pool_pre_ping=True) adapter = casbin_sqlalchemy_adapter.Adapter(engine) casbin_enforcer = casbin.Enforcer(settings.CASBIN_MODEL_PATH, adapter) diff --git a/www/src/components/AutoDict.vue b/www/src/components/AutoDict.vue index a77a31c..8652ff2 100644 --- a/www/src/components/AutoDict.vue +++ b/www/src/components/AutoDict.vue @@ -1,17 +1,23 @@