Merge branch 'master' into logical-foreign-keys

# Conflicts:
#	backend/app/admin/service/data_rule_service.py
#	backend/app/admin/service/dept_service.py
#	backend/common/security/permission.py
#	backend/plugin/oauth2/api/v1/user_social.py
#	backend/plugin/oauth2/crud/crud_user_social.py
#	backend/plugin/oauth2/service/user_social.py

Author: wu-clan

backend/plugin/oauth2/api/v1/user_social.py

@@ -9,7 +9,7 @@
 router = APIRouter()
 
 
-@router.delete('/me', summary='解绑社交账号', dependencies=[DependsJwtAuth])
-async def unbind_user(db: CurrentSessionTransaction, request: Request, source: UserSocialType) -> ResponseModel:
-    await user_social_service.unbind(db=db, user_id=request.user.id, source=source)
+@router.delete('/me', summary='解绑用户社交账号', dependencies=[DependsJwtAuth])
+async def unbinding_user(db: CurrentSessionTransaction, request: Request, source: UserSocialType) -> ResponseModel:
+    await user_social_service.unbinding(db=db, user_id=request.user.id, source=source)
     return response_base.success()

backend/plugin/oauth2/plugin.toml

@@ -1,6 +1,6 @@
 [plugin]
 summary = 'OAuth 2.0'
-version = '0.0.7'
+version = '0.0.8'
 description = '通过 OAuth 2.0 的方式登录系统'
 author = 'wu-clan'
 

backend/plugin/oauth2/service/user_social.py

@@ -7,18 +7,18 @@
 
 class UserSocialService:
     @staticmethod
-    async def unbind(*, db: AsyncSession, user_id: int, source: UserSocialType) -> int:
+    async def unbinding(*, db: AsyncSession, user_id: int, source: UserSocialType) -> int:
         """
-        解绑用户社交
+        解绑用户社交账号
 
-        :param db: 数据库绘画
+        :param db: 数据库会话
         :param user_id: 用户 ID
         :param source: 解绑源
         :return:
         """
         bind = user_social_dao.check_binding(db, user_id, source.value)
         if not bind:
-            raise errors.NotFoundError(msg=f'用户未绑定 {source.value} 账户')
+            raise errors.NotFoundError(msg=f'用户未绑定 {source.value} 账号')
         return await user_social_dao.delete(db, user_id, source.value)