Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions backend/app/admin/crud/crud_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ async def add_by_oauth2(self, db: AsyncSession, obj: AddOAuth2UserParam) -> None
:param obj: 注册用户参数
:return:
"""
obj.avatar = str(obj.avatar) # noqa: fix pgsql compatibility
dict_obj = obj.model_dump()
dict_obj.update({'is_staff': True, 'salt': None})
new_user = self.model(**dict_obj)
Expand All @@ -110,7 +109,6 @@ async def update(self, db: AsyncSession, input_user: User, obj: UpdateUserParam)
role_ids = obj.roles
del obj.roles

obj.avatar = str(obj.avatar) # noqa: fix pgsql compatibility
count = await self.update_model(db, input_user.id, obj)

stmt = select(Role).where(Role.id.in_(role_ids))
Expand Down
10 changes: 5 additions & 5 deletions backend/app/admin/schema/user.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
from datetime import datetime
from typing import Any
from typing import Annotated, Any

from pydantic import ConfigDict, Field, HttpUrl, model_validator
from pydantic import ConfigDict, Field, HttpUrl, PlainSerializer, model_validator
from typing_extensions import Self

from backend.app.admin.schema.dept import GetDeptDetail
from backend.app.admin.schema.role import GetRoleWithRelationDetail
from backend.common.enums import StatusType
from backend.common.schema import CustomEmailStr, CustomPhoneNumber, SchemaBase
from backend.common.schema import CustomEmailStr, CustomPhoneNumber, SchemaBase, ser_string


class AuthSchemaBase(SchemaBase):
Expand Down Expand Up @@ -40,7 +40,7 @@ class AddOAuth2UserParam(AuthSchemaBase):
password: str | None = Field(None, description='密码')
nickname: str | None = Field(None, description='昵称')
email: CustomEmailStr | None = Field(None, description='邮箱')
avatar: HttpUrl | None = Field(None, description='头像地址')
avatar: Annotated[HttpUrl, PlainSerializer(ser_string)] | None = Field(None, description='头像地址')


class ResetPasswordParam(SchemaBase):
Expand All @@ -57,7 +57,7 @@ class UserInfoSchemaBase(SchemaBase):
dept_id: int | None = Field(None, description='部门 ID')
username: str = Field(description='用户名')
nickname: str = Field(description='昵称')
avatar: HttpUrl | None = Field(None, description='头像地址')
avatar: Annotated[HttpUrl, PlainSerializer(ser_string)] | None = Field(None, description='头像地址')
email: CustomEmailStr | None = Field(None, description='邮箱')
phone: CustomPhoneNumber | None = Field(None, description='手机号')

Expand Down
8 changes: 7 additions & 1 deletion backend/common/schema.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from datetime import datetime
from typing import Annotated
from typing import Annotated, Any

from pydantic import BaseModel, ConfigDict, EmailStr, Field, validate_email

Expand Down Expand Up @@ -27,3 +27,9 @@ class SchemaBase(BaseModel):
else timezone.to_str(x),
},
)


def ser_string(value: Any) -> str | None:
if value:
return str(value)
return value