diff --git a/backend/app/admin/crud/crud_data_rule.py b/backend/app/admin/crud/crud_data_rule.py index 573271c51..067436ee7 100644 --- a/backend/app/admin/crud/crud_data_rule.py +++ b/backend/app/admin/crud/crud_data_rule.py @@ -24,7 +24,7 @@ async def get(self, db: AsyncSession, pk: int) -> DataRule | None: """ return await self.select_model(db, pk) - async def get_list(self, name: str | None = None) -> Select: + async def get_list(self, name: str | None) -> Select: """ 获取规则列表 diff --git a/backend/app/admin/crud/crud_dept.py b/backend/app/admin/crud/crud_dept.py index 53d889cc0..4536a270f 100644 --- a/backend/app/admin/crud/crud_dept.py +++ b/backend/app/admin/crud/crud_dept.py @@ -35,12 +35,7 @@ async def get_by_name(self, db: AsyncSession, name: str) -> Dept | None: return await self.select_model_by_column(db, name=name, del_flag=0) async def get_all( - self, - db: AsyncSession, - name: str | None = None, - leader: str | None = None, - phone: str | None = None, - status: int | None = None, + self, db: AsyncSession, name: str | None, leader: str | None, phone: str | None, status: int | None ) -> Sequence[Dept]: """ 获取所有部门 diff --git a/backend/app/admin/crud/crud_login_log.py b/backend/app/admin/crud/crud_login_log.py index f7af92f6b..b3e74e1e5 100644 --- a/backend/app/admin/crud/crud_login_log.py +++ b/backend/app/admin/crud/crud_login_log.py @@ -11,7 +11,7 @@ class CRUDLoginLog(CRUDPlus[LoginLog]): """登录日志数据库操作类""" - async def get_list(self, username: str | None = None, status: int | None = None, ip: str | None = None) -> Select: + async def get_list(self, username: str | None, status: int | None, ip: str | None) -> Select: """ 获取登录日志列表 diff --git a/backend/app/admin/crud/crud_menu.py b/backend/app/admin/crud/crud_menu.py index 51bd3fdcd..be5bf5c26 100644 --- a/backend/app/admin/crud/crud_menu.py +++ b/backend/app/admin/crud/crud_menu.py @@ -34,7 +34,7 @@ async def get_by_title(self, db: AsyncSession, title: str) -> Menu | None: """ return await self.select_model_by_column(db, title=title, menu_type__ne=2) - async def get_all(self, db: AsyncSession, title: str | None = None, status: int | None = None) -> Sequence[Menu]: + async def get_all(self, db: AsyncSession, title: str | None, status: int | None) -> Sequence[Menu]: """ 获取菜单列表 diff --git a/backend/app/admin/crud/crud_opera_log.py b/backend/app/admin/crud/crud_opera_log.py index 3d06d7bfe..f07f26f77 100644 --- a/backend/app/admin/crud/crud_opera_log.py +++ b/backend/app/admin/crud/crud_opera_log.py @@ -11,7 +11,7 @@ class CRUDOperaLogDao(CRUDPlus[OperaLog]): """操作日志数据库操作类""" - async def get_list(self, username: str | None = None, status: int | None = None, ip: str | None = None) -> Select: + async def get_list(self, username: str | None, status: int | None, ip: str | None) -> Select: """ 获取操作日志列表 diff --git a/backend/app/admin/crud/crud_role.py b/backend/app/admin/crud/crud_role.py index aef49a376..5d60895aa 100644 --- a/backend/app/admin/crud/crud_role.py +++ b/backend/app/admin/crud/crud_role.py @@ -66,7 +66,7 @@ async def get_by_user(self, db: AsyncSession, user_id: int) -> Sequence[Role]: roles = await db.execute(stmt) return roles.scalars().all() - async def get_list(self, name: str | None = None, status: int | None = None) -> Select: + async def get_list(self, name: str | None, status: int | None) -> Select: """ 获取角色列表 diff --git a/backend/app/admin/crud/crud_user.py b/backend/app/admin/crud/crud_user.py index d3c3c9e5f..64da456e2 100644 --- a/backend/app/admin/crud/crud_user.py +++ b/backend/app/admin/crud/crud_user.py @@ -175,9 +175,7 @@ async def reset_password(self, db: AsyncSession, pk: int, new_pwd: str) -> int: """ return await self.update_model(db, pk, {'password': new_pwd}) - async def get_list( - self, dept: int | None = None, username: str | None = None, phone: str | None = None, status: int | None = None - ) -> Select: + async def get_list(self, dept: int | None, username: str | None, phone: str | None, status: int | None) -> Select: """ 获取用户列表 diff --git a/backend/app/admin/service/data_rule_service.py b/backend/app/admin/service/data_rule_service.py index d55893de9..4bbf4d372 100644 --- a/backend/app/admin/service/data_rule_service.py +++ b/backend/app/admin/service/data_rule_service.py @@ -70,7 +70,7 @@ async def get_columns(model: str) -> list[str]: return model_columns @staticmethod - async def get_select(*, name: str | None = None) -> Select: + async def get_select(*, name: str | None) -> Select: """ 获取数据规则列表查询条件 diff --git a/backend/app/admin/service/dept_service.py b/backend/app/admin/service/dept_service.py index d1fe974f5..c04f14264 100644 --- a/backend/app/admin/service/dept_service.py +++ b/backend/app/admin/service/dept_service.py @@ -33,7 +33,7 @@ async def get(*, pk: int) -> Dept: @staticmethod async def get_dept_tree( - *, name: str | None = None, leader: str | None = None, phone: str | None = None, status: int | None = None + *, name: str | None, leader: str | None, phone: str | None, status: int | None ) -> list[dict[str, Any]]: """ 获取部门树形结构 diff --git a/backend/app/admin/service/login_log_service.py b/backend/app/admin/service/login_log_service.py index 72b3b907c..8ae6a6413 100644 --- a/backend/app/admin/service/login_log_service.py +++ b/backend/app/admin/service/login_log_service.py @@ -16,7 +16,7 @@ class LoginLogService: """登录日志服务类""" @staticmethod - async def get_select(*, username: str | None = None, status: int | None = None, ip: str | None = None) -> Select: + async def get_select(*, username: str | None, status: int | None, ip: str | None) -> Select: """ 获取登录日志列表查询条件 diff --git a/backend/app/admin/service/menu_service.py b/backend/app/admin/service/menu_service.py index 22b94c23b..c7244699c 100644 --- a/backend/app/admin/service/menu_service.py +++ b/backend/app/admin/service/menu_service.py @@ -33,7 +33,7 @@ async def get(*, pk: int) -> Menu: return menu @staticmethod - async def get_menu_tree(*, title: str | None = None, status: int | None = None) -> list[dict[str, Any]]: + async def get_menu_tree(*, title: str | None, status: int | None) -> list[dict[str, Any]]: """ 获取菜单树形结构 diff --git a/backend/app/admin/service/opera_log_service.py b/backend/app/admin/service/opera_log_service.py index cc2e2dd50..bae664080 100644 --- a/backend/app/admin/service/opera_log_service.py +++ b/backend/app/admin/service/opera_log_service.py @@ -11,7 +11,7 @@ class OperaLogService: """操作日志服务类""" @staticmethod - async def get_select(*, username: str | None = None, status: int | None = None, ip: str | None = None) -> Select: + async def get_select(*, username: str | None, status: int | None, ip: str | None) -> Select: """ 获取操作日志列表查询条件 diff --git a/backend/app/admin/service/role_service.py b/backend/app/admin/service/role_service.py index 2f9a70a7b..af944cfec 100644 --- a/backend/app/admin/service/role_service.py +++ b/backend/app/admin/service/role_service.py @@ -58,7 +58,7 @@ async def get_by_user(*, pk: int) -> Sequence[Role]: return roles @staticmethod - async def get_select(*, name: str | None = None, status: int | None = None) -> Select: + async def get_select(*, name: str | None, status: int | None) -> Select: """ 获取角色列表查询条件 diff --git a/backend/app/admin/service/user_service.py b/backend/app/admin/service/user_service.py index 5d371b189..1962b3b81 100644 --- a/backend/app/admin/service/user_service.py +++ b/backend/app/admin/service/user_service.py @@ -200,7 +200,7 @@ async def update_avatar(*, request: Request, username: str, avatar: AvatarParam) return count @staticmethod - async def get_select(*, dept: int, username: str = None, phone: str = None, status: int = None) -> Select: + async def get_select(*, dept: int, username: str, phone: str, status: int) -> Select: """ 获取用户列表查询条件 diff --git a/backend/app/generator/crud/crud_gen_model.py b/backend/app/generator/crud/crud_gen_model.py index 419c16d36..9db1fcd97 100644 --- a/backend/app/generator/crud/crud_gen_model.py +++ b/backend/app/generator/crud/crud_gen_model.py @@ -32,7 +32,7 @@ async def get_all_by_business(self, db: AsyncSession, business_id: int) -> Seque """ return await self.select_models_order(db, sort_columns='sort', gen_business_id=business_id) - async def create(self, db: AsyncSession, obj: CreateGenModelParam, pd_type: str | None = None) -> None: + async def create(self, db: AsyncSession, obj: CreateGenModelParam, pd_type: str | None) -> None: """ 创建代码生成模型 @@ -43,7 +43,7 @@ async def create(self, db: AsyncSession, obj: CreateGenModelParam, pd_type: str """ await self.create_model(db, obj, pd_type=pd_type) - async def update(self, db: AsyncSession, pk: int, obj: UpdateGenModelParam, pd_type: str | None = None) -> int: + async def update(self, db: AsyncSession, pk: int, obj: UpdateGenModelParam, pd_type: str | None) -> int: """ 更新代码生成模型 diff --git a/backend/common/response/response_schema.py b/backend/common/response/response_schema.py index 73c0e6594..8be38e9df 100644 --- a/backend/common/response/response_schema.py +++ b/backend/common/response/response_schema.py @@ -68,7 +68,9 @@ class ResponseBase: @staticmethod def __response( - *, res: CustomResponseCode | CustomResponse = None, data: Any | None = None + *, + res: CustomResponseCode | CustomResponse, + data: Any | None, ) -> ResponseModel | ResponseSchemaModel: """ 请求返回通用方法 diff --git a/backend/plugin/casbin/service/casbin_service.py b/backend/plugin/casbin/service/casbin_service.py index b15371a59..a700548b5 100644 --- a/backend/plugin/casbin/service/casbin_service.py +++ b/backend/plugin/casbin/service/casbin_service.py @@ -34,7 +34,7 @@ async def get_casbin_list(*, ptype: str, sub: str) -> Select: return await casbin_dao.get_list(ptype, sub) @staticmethod - async def get_policy_list(*, role: int | None = None) -> list: + async def get_policy_list(*, role: int | None) -> list: """ 获取 P 策略列表 diff --git a/backend/plugin/config/crud/crud_config.py b/backend/plugin/config/crud/crud_config.py index 68cc50350..b0cf011c5 100644 --- a/backend/plugin/config/crud/crud_config.py +++ b/backend/plugin/config/crud/crud_config.py @@ -55,7 +55,7 @@ async def get_by_key(self, db: AsyncSession, key: str) -> Config | None: """ return await self.select_model_by_column(db, key=key) - async def get_list(self, name: str | None = None, type: str | None = None) -> Select: + async def get_list(self, name: str | None, type: str | None) -> Select: """ 获取参数配置列表 diff --git a/backend/plugin/config/service/config_service.py b/backend/plugin/config/service/config_service.py index 6090fee69..74318878b 100644 --- a/backend/plugin/config/service/config_service.py +++ b/backend/plugin/config/service/config_service.py @@ -64,7 +64,7 @@ async def get(pk: int) -> Config: return config @staticmethod - async def get_select(*, name: str | None = None, type: str | None = None) -> Select: + async def get_select(*, name: str | None, type: str | None) -> Select: """ 获取参数配置列表查询条件 diff --git a/backend/plugin/dict/crud/crud_dict_data.py b/backend/plugin/dict/crud/crud_dict_data.py index b1a98899b..fbe69463c 100644 --- a/backend/plugin/dict/crud/crud_dict_data.py +++ b/backend/plugin/dict/crud/crud_dict_data.py @@ -22,7 +22,7 @@ async def get(self, db: AsyncSession, pk: int) -> DictData | None: """ return await self.select_model(db, pk) - async def get_list(self, label: str | None = None, value: str | None = None, status: int | None = None) -> Select: + async def get_list(self, label: str | None, value: str | None, status: int | None) -> Select: """ 获取字典数据列表 diff --git a/backend/plugin/dict/crud/crud_dict_type.py b/backend/plugin/dict/crud/crud_dict_type.py index a9c7a7373..50f1d44e7 100644 --- a/backend/plugin/dict/crud/crud_dict_type.py +++ b/backend/plugin/dict/crud/crud_dict_type.py @@ -21,7 +21,7 @@ async def get(self, db: AsyncSession, pk: int) -> DictType | None: """ return await self.select_model(db, pk) - async def get_list(self, *, name: str | None = None, code: str | None = None, status: int | None = None) -> Select: + async def get_list(self, *, name: str | None, code: str | None, status: int | None) -> Select: """ 获取字典类型列表 diff --git a/backend/plugin/dict/service/dict_data_service.py b/backend/plugin/dict/service/dict_data_service.py index ab316d4a3..c1b3c5529 100644 --- a/backend/plugin/dict/service/dict_data_service.py +++ b/backend/plugin/dict/service/dict_data_service.py @@ -28,7 +28,7 @@ async def get(*, pk: int) -> DictData: return dict_data @staticmethod - async def get_select(*, label: str | None = None, value: str | None = None, status: int | None = None) -> Select: + async def get_select(*, label: str | None, value: str | None, status: int | None) -> Select: """ 获取字典数据列表查询条件 diff --git a/backend/plugin/dict/service/dict_type_service.py b/backend/plugin/dict/service/dict_type_service.py index 89be65f2b..3d0650d55 100644 --- a/backend/plugin/dict/service/dict_type_service.py +++ b/backend/plugin/dict/service/dict_type_service.py @@ -12,7 +12,7 @@ class DictTypeService: """字典类型服务类""" @staticmethod - async def get_select(*, name: str | None = None, code: str | None = None, status: int | None = None) -> Select: + async def get_select(*, name: str | None, code: str | None, status: int | None) -> Select: """ 获取字典类型列表查询条件 diff --git a/uv.lock b/uv.lock index 34dfbd8c6..12edb6393 100644 --- a/uv.lock +++ b/uv.lock @@ -684,13 +684,13 @@ wheels = [ [[package]] name = "fastapi-oauth20" version = "0.0.1" -source = { registry = "https://pypi.org/simple" } +source = { registry = "https://mirrors.aliyun.com/pypi/simple" } dependencies = [ { name = "httpx" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/8e/66/25d4ece161689184f47130bc7ea5bf9c73113c2e628cf586546aa574d8d1/fastapi_oauth20-0.0.1.tar.gz", hash = "sha256:22bf6564f3af42a94cb597f8e20af1366e89e19af49291d15784a4c14059d4c9", size = 6681 } +sdist = { url = "https://mirrors.aliyun.com/pypi/packages/8e/66/25d4ece161689184f47130bc7ea5bf9c73113c2e628cf586546aa574d8d1/fastapi_oauth20-0.0.1.tar.gz", hash = "sha256:22bf6564f3af42a94cb597f8e20af1366e89e19af49291d15784a4c14059d4c9" } wheels = [ - { url = "https://files.pythonhosted.org/packages/cf/87/7e0423109ba2c0f8a0794eedff5bb1f79792e5d8d0941ba0b26f962e3e5c/fastapi_oauth20-0.0.1-py3-none-any.whl", hash = "sha256:921fe0e874cb4186998f74b1d951c360400aceb5ca3889a85c806d865a991f88", size = 11242 }, + { url = "https://mirrors.aliyun.com/pypi/packages/cf/87/7e0423109ba2c0f8a0794eedff5bb1f79792e5d8d0941ba0b26f962e3e5c/fastapi_oauth20-0.0.1-py3-none-any.whl", hash = "sha256:921fe0e874cb4186998f74b1d951c360400aceb5ca3889a85c806d865a991f88" }, ] [[package]]