Fix problems

Author: wu-clan

backend/app/admin/api/v1/oauth2/linux_do.py

@@ -12,16 +12,16 @@
 
 router = APIRouter()
 
-_linuxdo_client = LinuxDoOAuth20(
-    admin_settings.OAUTH2_LINUXDO_CLIENT_ID,
-    admin_settings.OAUTH2_LINUXDO_CLIENT_SECRET,
+_linux_do_client = LinuxDoOAuth20(
+    admin_settings.OAUTH2_LINUX_DO_CLIENT_ID,
+    admin_settings.OAUTH2_LINUX_DO_CLIENT_SECRET,
 )
-_linuxdo_oauth2 = FastAPIOAuth20(_linuxdo_client, admin_settings.OAUTH2_LINUXDO_REDIRECT_URI)
+_linux_do_oauth2 = FastAPIOAuth20(_linux_do_client, admin_settings.OAUTH2_LINUX_DO_REDIRECT_URI)
 
 
 @router.get('', summary='获取 LinuxDo 授权链接')
-async def linuxdo_auth2() -> ResponseSchemaModel[str]:
-    auth_url = await _linuxdo_client.get_authorization_url(redirect_uri=admin_settings.OAUTH2_LINUXDO_REDIRECT_URI)
+async def linux_do_auth2() -> ResponseSchemaModel[str]:
+    auth_url = await _linux_do_client.get_authorization_url(redirect_uri=admin_settings.OAUTH2_LINUX_DO_REDIRECT_URI)
     return response_base.success(data=auth_url)
 
 
@@ -31,20 +31,20 @@ async def linuxdo_auth2() -> ResponseSchemaModel[str]:
     description='LinuxDo 授权后，自动重定向到当前地址并获取用户信息，通过用户信息自动创建系统用户',
     dependencies=[Depends(RateLimiter(times=5, minutes=1))],
 )
-async def linuxdo_login(
+async def linux_do_login(
     request: Request,
     response: Response,
     background_tasks: BackgroundTasks,
-    oauth2: FastAPIOAuth20 = Depends(_linuxdo_oauth2),
+    oauth2: FastAPIOAuth20 = Depends(_linux_do_oauth2),
 ):
     token, _state = oauth2
     access_token = token['access_token']
-    user = await _linuxdo_client.get_userinfo(access_token)
+    user = await _linux_do_client.get_userinfo(access_token)
     data = await oauth2_service.create_with_login(
         request=request,
         response=response,
         background_tasks=background_tasks,
         user=user,
-        social=UserSocialType.linuxdo,
+        social=UserSocialType.linux_do,
     )
     return RedirectResponse(url=f'{admin_settings.OAUTH2_FRONTEND_REDIRECT_URI}?access_token={data.access_token}')

backend/app/admin/api/v1/sys/role.py

@@ -143,7 +143,7 @@ async def update_role_rules(
 
 @router.delete(
     '',
-    summary='删除角色',
+    summary='批量删除角色',
     dependencies=[
         Depends(RequestPermission('sys:role:del')),
         DependsRBAC,

backend/app/admin/conf.py

@@ -15,12 +15,12 @@ class AdminSettings(BaseSettings):
     # .env OAuth2
     OAUTH2_GITHUB_CLIENT_ID: str
     OAUTH2_GITHUB_CLIENT_SECRET: str
-    OAUTH2_LINUXDO_CLIENT_ID: str
-    OAUTH2_LINUXDO_CLIENT_SECRET: str
+    OAUTH2_LINUX_DO_CLIENT_ID: str
+    OAUTH2_LINUX_DO_CLIENT_SECRET: str
 
     # OAuth2
     OAUTH2_GITHUB_REDIRECT_URI: str = 'http://127.0.0.1:8000/api/v1/oauth2/github/callback'
-    OAUTH2_LINUXDO_REDIRECT_URI: str = 'http://127.0.0.1:8000/api/v1/oauth2/linux-do/callback'
+    OAUTH2_LINUX_DO_REDIRECT_URI: str = 'http://127.0.0.1:8000/api/v1/oauth2/linux-do/callback'
     OAUTH2_FRONTEND_REDIRECT_URI: str = 'http://localhost:5173/oauth2/callback'
 
     # 验证码

backend/app/admin/crud/crud_config.py

@@ -75,7 +75,7 @@ async def create(self, db: AsyncSession, obj: CreateConfigParam) -> None:
         创建参数配置
 
         :param db: 数据库会话
-        :param obj: 创建参数
+        :param obj: 创建参数配置参数
         :return:
         """
         await self.create_model(db, obj)
@@ -86,7 +86,7 @@ async def update(self, db: AsyncSession, pk: int, obj: UpdateConfigParam) -> int
 
         :param db: 数据库会话
         :param pk: 参数配置 ID
-        :param obj: 更新参数
+        :param obj: 更新参数配置参数
         :return:
         """
         return await self.update_model(db, pk, obj)

backend/app/admin/crud/crud_data_rule.py

@@ -66,7 +66,7 @@ async def create(self, db: AsyncSession, obj: CreateDataRuleParam) -> None:
         创建规则
 
         :param db: 数据库会话
-        :param obj: 创建参数
+        :param obj: 创建规则参数
         :return:
         """
         await self.create_model(db, obj)
@@ -77,7 +77,7 @@ async def update(self, db: AsyncSession, pk: int, obj: UpdateDataRuleParam) -> i
 
         :param db: 数据库会话
         :param pk: 规则 ID
-        :param obj: 更新参数
+        :param obj: 更新规则参数
         :return:
         """
         return await self.update_model(db, pk, obj)

backend/app/admin/crud/crud_dept.py

@@ -68,7 +68,7 @@ async def create(self, db: AsyncSession, obj: CreateDeptParam) -> None:
         创建部门
 
         :param db: 数据库会话
-        :param obj: 创建参数
+        :param obj: 创建部门参数
         :return:
         """
         await self.create_model(db, obj)
@@ -79,7 +79,7 @@ async def update(self, db: AsyncSession, dept_id: int, obj: UpdateDeptParam) ->
 
         :param db: 数据库会话
         :param dept_id: 部门 ID
-        :param obj: 更新参数
+        :param obj: 更新部门参数
         :return:
         """
         return await self.update_model(db, dept_id, obj)

backend/app/admin/crud/crud_dict_data.py

@@ -61,7 +61,7 @@ async def create(self, db: AsyncSession, obj: CreateDictDataParam) -> None:
         创建字典数据
 
         :param db: 数据库会话
-        :param obj: 字典数据创建参数
+        :param obj: 创建字典数据参数
         :return:
         """
         await self.create_model(db, obj)
@@ -72,7 +72,7 @@ async def update(self, db: AsyncSession, pk: int, obj: UpdateDictDataParam) -> i
 
         :param db: 数据库会话
         :param pk: 字典数据 ID
-        :param obj: 字典数据更新参数
+        :param obj: 更新字典数据参数
         :return:
         """
         return await self.update_model(db, pk, obj)

backend/app/admin/crud/crud_dict_type.py

@@ -54,7 +54,7 @@ async def create(self, db: AsyncSession, obj: CreateDictTypeParam) -> None:
         创建字典类型
 
         :param db: 数据库会话
-        :param obj: 字典类型创建参数
+        :param obj: 创建字典类型参数
         :return:
         """
         await self.create_model(db, obj)
@@ -65,7 +65,7 @@ async def update(self, db: AsyncSession, pk: int, obj: UpdateDictTypeParam) -> i
 
         :param db: 数据库会话
         :param pk: 字典类型 ID
-        :param obj: 字典类型更新参数
+        :param obj: 更新字典类型参数
         :return:
         """
         return await self.update_model(db, pk, obj)

backend/app/admin/crud/crud_login_log.py

@@ -34,7 +34,7 @@ async def create(self, db: AsyncSession, obj: CreateLoginLogParam) -> None:
         创建登录日志
 
         :param db: 数据库会话
-        :param obj: 创建参数
+        :param obj: 创建登录日志参数
         :return:
         """
         await self.create_model(db, obj, commit=True)
@@ -44,7 +44,7 @@ async def delete(self, db: AsyncSession, pk: list[int]) -> int:
         删除登录日志
 
         :param db: 数据库会话
-        :param pk: 日志 ID 列表
+        :param pk: 登录日志 ID 列表
         :return:
         """
         return await self.delete_model_by_column(db, allow_multiple=True, id__in=pk)

backend/app/admin/crud/crud_menu.py

@@ -72,7 +72,7 @@ async def create(self, db: AsyncSession, obj: CreateMenuParam) -> None:
         创建菜单
 
         :param db: 数据库会话
-        :param obj: 创建参数
+        :param obj: 创建菜单参数
         :return:
         """
         await self.create_model(db, obj)
@@ -83,7 +83,7 @@ async def update(self, db: AsyncSession, menu_id: int, obj: UpdateMenuParam) ->
 
         :param db: 数据库会话
         :param menu_id: 菜单 ID
-        :param obj: 更新参数
+        :param obj: 更新菜单参数
         :return:
         """
         return await self.update_model(db, menu_id, obj)