From d5e0f9d5acca0db9327199b0344e45bdc66de484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=93=E6=9C=88=E5=BD=92=E5=B0=98?= Date: Fri, 21 Feb 2025 02:25:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/file.py | 2 +- api/login.py | 4 ++-- controller/login.py | 24 +++++++++++++++++++----- controller/query.py | 3 +++ schemas/common.py | 1 + schemas/login.py | 4 +++- 6 files changed, 29 insertions(+), 9 deletions(-) diff --git a/api/file.py b/api/file.py index 37ff0df..b0fadea 100644 --- a/api/file.py +++ b/api/file.py @@ -59,7 +59,7 @@ async def upload_file( file_type=file.content_type, absolute_path=absolute_path, relative_path=relative_path, - uploader=current_user.get("id"), + uploader_id=current_user.get("id"), ) result = await file_record.first().values( id="id", diff --git a/api/login.py b/api/login.py index 79a6fef..5b1f9ba 100644 --- a/api/login.py +++ b/api/login.py @@ -90,7 +90,7 @@ async def login( async def register(request: Request, params: RegisterUserParams): register_enabled = ( True - if await request.app.state.redis.get(f'{RedisKeyConfig.SYSTEM_CONFIG.key}:register_enabled') + if await request.app.state.redis.get(f'{RedisKeyConfig.SYSTEM_CONFIG.key}:account_register_enabled') == 'true' else False ) @@ -151,7 +151,7 @@ async def get_captcha(request: Request): ) register_enabled = ( True - if await request.app.state.redis.get(f'{RedisKeyConfig.SYSTEM_CONFIG.key}:register_enabled') + if await request.app.state.redis.get(f'{RedisKeyConfig.SYSTEM_CONFIG.key}:account_register_enabled') == 'true' else False ) diff --git a/controller/login.py b/controller/login.py index bf2dd3c..f86983a 100644 --- a/controller/login.py +++ b/controller/login.py @@ -188,15 +188,27 @@ class LoginController: child_node = await cls.find_node_recursive(child_item["id"], data) if child_node: children.append(child_node) - result = { - "name": item["name"], - "path": item["path"], - "meta": { + meta = { + k: v for k, v in { "title": item["title"], "rank": item["rank"], "icon": item["icon"], + "extraIcon": item["extraIcon"], + "showParent": item["showParent"], + "keepAlive": item["keepAlive"], + "frameSrc": item["frameSrc"], + "frameLoading": item["frameLoading"], "permissions": [item["auths"]], - }, + }.items() if v + } + if item["showLink"]: + meta["showLink"] = True + else: + meta["showLink"] = False + result = { + "name": item["name"], + "path": item["path"], + "meta": meta, "children": children } if item["component"]: @@ -209,6 +221,8 @@ class LoginController: result.pop("name") if result["children"] == []: result.pop("children") + else: + result["children"] = sorted(result["children"], key=lambda x: x["meta"]["rank"]) break return result diff --git a/controller/query.py b/controller/query.py index 0c04ae0..10c7960 100644 --- a/controller/query.py +++ b/controller/query.py @@ -123,6 +123,9 @@ class QueryController: leaveTransition="permission__leave_transition", activePath="permission__active_path", auths="permission__auths", + frameSrc="permission__frame_src", + frameLoading="permission__frame_loading", + fixedTag="permission__fixed_tag", keepAlive="permission__keep_alive", hiddenTag="permission__hidden_tag", showLink="permission__show_link", diff --git a/schemas/common.py b/schemas/common.py index d5a161a..e5a4e24 100644 --- a/schemas/common.py +++ b/schemas/common.py @@ -28,6 +28,7 @@ class ListQueryResult(BaseModel): result: List = Field(default=[], description="列表数据") total: int = Field(default=0, description="总条数") page: int = Field(default=1, description="当前页码") + pageSize: int = Field(default=10, description="每页数量") class DeleteListParams(BaseModel): diff --git a/schemas/login.py b/schemas/login.py index ab7be55..1cfab7a 100644 --- a/schemas/login.py +++ b/schemas/login.py @@ -117,13 +117,15 @@ class GetCaptchaResult(BaseModel): uuid: Optional[str] = Field(default=None, description="验证码UUID") captcha: Optional[str] = Field(default=None, description="验证码图片") captcha_enabled: Optional[bool] = Field(default=False, description="是否开启验证码") + register_enabled: Optional[bool] = Field(default=False, description="是否开启注册") class Config: json_schema_extra = { "example": { "uuid": "1234567890", "captcha": "base64编码的图片", - "captcha_enabled": True + "captcha_enabled": True, + "register_enabled": True } }