feat: 添加系统配置，更新验证码接口

2025-02-12 23:25:19 +08:00
parent 46e9e79670
commit 2f28d6d5e0
15 changed files with 362 additions and 35 deletions
--- a/api/config.py
+++ b/api/config.py
@@ -0,0 +1,143 @@
+# _*_ coding : UTF-8 _*_
+# @Time : 2025/02/12 16:58
+# @UpdateTime : 2025/02/12 16:58
+# @Author : sonder
+# @File : config.py
+# @Software : PyCharm
+# @Comment : 本程序
+
+from typing import Optional
+
+from fastapi import APIRouter, Depends, Path, Request, Query
+from fastapi.responses import JSONResponse
+
+from annotation.log import Log
+from config.constant import BusinessType
+from config.get_redis import Redis
+from controller.login import LoginController
+from models import Config
+from schemas.common import BaseResponse
+from schemas.config import AddConfigParams, DeleteConfigListParams, GetConfigInfoResponse, GetConfigListResponse
+from utils.response import Response
+
+configApi = APIRouter(
+    prefix="/config",
+    dependencies=[Depends(LoginController.get_current_user)],
+)
+
+
+@configApi.post("/add", response_class=JSONResponse, response_model=BaseResponse, summary="新增配置")
+@Log(title="新增配置", business_type=BusinessType.INSERT)
+async def add_config(request: Request, params: AddConfigParams):
+    if await Config.get_or_none(name=params.name, key=params.key):
+        return Response.error(msg="配置已存在")
+    config = await Config.create(
+        name=params.name,
+        key=params.key,
+        value=params.value,
+        remark=params.remark,
+        type=params.type,
+    )
+    if config:
+        await Redis.init_system_config(request.app)
+        return Response.success(msg="新增成功")
+    else:
+        return Response.error(msg="新增失败")
+
+
+@configApi.delete("/delete/{id}", response_class=JSONResponse, response_model=BaseResponse, summary="删除配置")
+@configApi.post("/delete/{id}", response_class=JSONResponse, response_model=BaseResponse, summary="删除配置")
+@Log(title="删除配置", business_type=BusinessType.DELETE)
+async def delete_config(request: Request, id: str = Path(description="配置ID")):
+    if config := await Config.get_or_none(id=id):
+        await config.delete()
+        await Redis.init_system_config(request.app)
+        return Response.success(msg="删除成功")
+    else:
+        return Response.error(msg="配置不存在")
+
+
+@configApi.delete("/deleteList", response_class=JSONResponse, response_model=BaseResponse, summary="批量删除配置")
+@configApi.post("/deleteList", response_class=JSONResponse, response_model=BaseResponse, summary="批量删除配置")
+@Log(title="批量删除配置", business_type=BusinessType.DELETE)
+async def delete_config_list(request: Request, params: DeleteConfigListParams):
+    for id in set(params.ids):
+        if config := await Config.get_or_none(id=id):
+            await config.delete()
+    await Redis.init_system_config(request.app)
+    return Response.success(msg="删除成功")
+
+
+@configApi.put("/update/{id}", response_class=JSONResponse, response_model=BaseResponse, summary="修改配置")
+@configApi.post("/update/{id}", response_class=JSONResponse, response_model=BaseResponse, summary="修改配置")
+@Log(title="修改配置", business_type=BusinessType.UPDATE)
+async def update_config(request: Request, params: AddConfigParams, id: str = Path(description="配置ID")):
+    if config := await Config.get_or_none(id=id):
+        config.name = params.name
+        config.key = params.key
+        config.value = params.value
+        config.remark = params.remark
+        config.type = params.type
+        await config.save()
+        await Redis.init_system_config(request.app)
+        return Response.success(msg="修改成功")
+    else:
+        return Response.error(msg="配置不存在")
+
+
+@configApi.get("/info/{id}", response_class=JSONResponse, response_model=GetConfigInfoResponse, summary="获取配置信息")
+@Log(title="获取配置信息", business_type=BusinessType.SELECT)
+async def get_config_info(request: Request, id: str = Path(description="配置ID")):
+    if config := await Config.get_or_none(id=id):
+        data = {
+            "id": config.id,
+            "name": config.name,
+            "key": config.key,
+            "value": config.value,
+            "remark": config.remark,
+            "type": config.type,
+            "create_time": config.create_time,
+            "create_by": config.create_by,
+            "update_time": config.update_time,
+            "update_by": config.update_by,
+        }
+        return Response.success(data=data)
+    else:
+        return Response.error(msg="配置不存在")
+
+
+@configApi.get("/list", response_class=JSONResponse, response_model=GetConfigListResponse, summary="获取配置列表")
+@Log(title="获取配置列表", business_type=BusinessType.SELECT)
+async def get_config_list(request: Request,
+                          page: int = Query(default=1, description="当前页码"),
+                          pageSize: int = Query(default=10, description="每页数量"),
+                          key: Optional[str] = Query(default=None, description="配置键名"),
+                          name: Optional[str] = Query(default=None, description="配置名称"),
+                          type: Optional[str] = Query(default=None, description="系统内置"),
+                          ):
+    filterArgs = {
+        f'{k}__contains': v for k, v in {
+            'name': name,
+            'key': key,
+            'type': type,
+        }.items() if v
+    }
+    total = await Config.filter(**filterArgs).count()
+    data = await Config.filter(**filterArgs).offset((page - 1) * pageSize).limit(pageSize).values(
+        id="id",
+        name="name",
+        key="key",
+        value="value",
+        remark="remark",
+        type="type",
+        create_time="create_time",
+        create_by="create_by",
+        update_time="update_time",
+        update_by="update_by",
+    )
+    return Response.success(data={
+        "total": total,
+        "result": data,
+        "page": page,
+        "pageSize": pageSize,
+    })
--- a/api/file.py
+++ b/api/file.py
@@ -137,7 +137,7 @@ async def get_file_info(
 async def delete_file(
        request: Request,
        id: str = Path(..., description="文件ID"),
-current_user: dict = Depends(LoginController.get_current_user),):
+        current_user: dict = Depends(LoginController.get_current_user), ):
    # 1. 查询文件记录
    file_record = await FileModel.get_or_none(id=id)
    if not file_record:
@@ -161,7 +161,7 @@ async def get_file_list(
        uploader_nickname: str = Query(default=None, description="上传者昵称"),
        department_id: str = Query(default=None, description="上传者部门ID"),
        department_name: str = Query(default=None, description="上传者部门名称"),
-current_user: dict = Depends(LoginController.get_current_user),):
+        current_user: dict = Depends(LoginController.get_current_user), ):
    # 1. 查询文件记录
    filterArgs = {
        f'{k}__contains': v for k, v in {
--- a/api/i18n.py
+++ b/api/i18n.py
@@ -15,11 +15,11 @@ from fastapi.responses import JSONResponse
 from annotation.log import Log
 from config.constant import BusinessType, RedisKeyConfig
 from controller.login import LoginController
+from models import I18n, Locale
 from schemas.common import BaseResponse
 from schemas.i18n import AddLocaleParams, GetLocaleInfoResponse, AddI18nParams, GetI18nInfoResponse, \
    GetI18nInfoListResponse, GetI18nListResponse
 from utils.response import Response
-from models import I18n, Locale

 i18nAPI = APIRouter(
    prefix="/i18n",
@@ -263,4 +263,3 @@ async def get_i18n_info_list(request: Request, id: str = Path(description="国
            "name": locale.name,
        })
    return Response.error(msg="该国际化内容语言不存在！")
-
--- a/api/login.py
+++ b/api/login.py
@@ -124,19 +124,38 @@ async def register(request: Request, params: RegisterUserParams):

@loginAPI.get("/captcha", response_class=JSONResponse, response_model=GetCaptchaResponse, summary="获取验证码")
 async def get_captcha(request: Request):
-    captcha_result = await Captcha.create_captcha("1")
-    session_id = str(uuid.uuid4())
-    captcha = captcha_result[0]
-    result = captcha_result[-1]
-    await request.app.state.redis.set(
-        f'{RedisKeyConfig.CAPTCHA_CODES.key}:{session_id}', result, ex=timedelta(minutes=2)
+    captcha_enabled = (
+        True
+        if await request.app.state.redis.get(f'{RedisKeyConfig.SYSTEM_CONFIG.key}:account_captcha_enabled')
+           == 'true'
+        else False
    )
-    logger.info(f'编号为{session_id}的会话获取图片验证码成功')
+    if captcha_enabled:
+        captcha_type = (
+            await request.app.state.redis.get(f'{RedisKeyConfig.SYSTEM_CONFIG.key}:account_captcha_type')
+            if await request.app.state.redis.get(f'{RedisKeyConfig.SYSTEM_CONFIG.key}:account_captcha_type')
+            else "1"
+        )
+        captcha_result = await Captcha.create_captcha(captcha_type)
+        session_id = str(uuid.uuid4())
+        captcha = captcha_result[0]
+        result = captcha_result[-1]
+        await request.app.state.redis.set(
+            f'{RedisKeyConfig.CAPTCHA_CODES.key}:{session_id}', result, ex=timedelta(minutes=2)
+        )
+        logger.info(f'编号为{session_id}的会话获取图片验证码成功')

-    return Response.success(data={
-        "uuid": session_id,
-        "captcha": captcha,
-    })
+        return Response.success(data={
+            "uuid": session_id,
+            "captcha": captcha,
+            "captcha_enabled": captcha_enabled,
+        })
+    else:
+        return Response.success(data={
+            "uuid": None,
+            "captcha": None,
+            "captcha_enabled": captcha_enabled,
+        })


@loginAPI.post("/code", response_class=JSONResponse, response_model=BaseResponse, summary="获取邮件验证码")