From 26a7d84f7dd1705930af81570a4a9476184d4e19 Mon Sep 17 00:00:00 2001
From: mizhexiaoxiao <1157861072@qq.com>
Date: Wed, 18 Oct 2023 15:58:09 +0800
Subject: [PATCH] update

---
 app/api/v1/roles/roles.py |  4 +---
 app/schemas/apis.py       |  2 +-
 app/schemas/roles.py      | 14 +++++++-------
 app/utils/jwt.py          |  2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/api/v1/roles/roles.py b/app/api/v1/roles/roles.py
index 0255e4b..92fc969 100644
--- a/app/api/v1/roles/roles.py
+++ b/app/api/v1/roles/roles.py
@@ -35,9 +35,7 @@ async def get_role(
 
 
 @router.post("/create", summary="创建角色")
-async def create_role(
-    role_in: RoleCreate,
-):
+async def create_role(role_in: RoleCreate):
     if await role_controller.is_exist(name=role_in.name):
         raise HTTPException(
             status_code=400,
diff --git a/app/schemas/apis.py b/app/schemas/apis.py
index cae5631..24d1c73 100644
--- a/app/schemas/apis.py
+++ b/app/schemas/apis.py
@@ -5,7 +5,7 @@ from app.models.enums import MethodType
 
 class BaseApi(BaseModel):
     path: str = Field(..., description="API路径", example="/api/v1/user/list")
-    summary: str = Field(None, description="API简介", example="查看用户列表")
+    summary: str = Field("", description="API简介", example="查看用户列表")
     method: MethodType = Field(..., description="API方法", example="GET")
     tags: str = Field(..., description="API标签", example="User")
 
diff --git a/app/schemas/roles.py b/app/schemas/roles.py
index 2ff0d19..d56b492 100644
--- a/app/schemas/roles.py
+++ b/app/schemas/roles.py
@@ -7,23 +7,23 @@ from pydantic import BaseModel, Field
 class BaseRole(BaseModel):
     id: int
     name: str
-    desc: Optional[str]
-    users: Optional[list]
-    menus: Optional[list]
-    apis: Optional[list]
+    desc: str = ""
+    users: Optional[list] = []
+    menus: Optional[list] = []
+    apis: Optional[list] = []
     created_at: Optional[datetime]
     updated_at: Optional[datetime]
 
 
 class RoleCreate(BaseModel):
     name: str = Field(example="管理员")
-    desc: Optional[str] = Field(example="管理员角色")
+    desc: str = Field("", examples="管理员角色")
 
 
 class RoleUpdate(BaseModel):
     id: int = Field(example=1)
-    name: Optional[str] = Field(example="管理员")
-    desc: Optional[str] = Field(example="管理员角色")
+    name: str = Field(example="管理员")
+    desc: str = Field("", example="管理员角色")
 
     def update_dict(self):
         return self.model_dump(exclude_unset=True, exclude={"id"})
diff --git a/app/utils/jwt.py b/app/utils/jwt.py
index d8567d9..06b883d 100644
--- a/app/utils/jwt.py
+++ b/app/utils/jwt.py
@@ -5,6 +5,6 @@ from app.settings.config import settings
 
 
 def create_access_token(*, data: JWTPayload):
-    payload = data.dict().copy()
+    payload = data.model_dump().copy()
     encoded_jwt = jwt.encode(payload, settings.SECRET_KEY, algorithm=settings.JWT_ALGORITHM)
     return encoded_jwt