🐞 Fix(Fixed some bugs): 修复一些bug

Author: RanY-Luck

backend/plugin/api_testing/api/v1/environment.py

@@ -82,52 +82,54 @@ async def list_environments(project_id: int = Query(..., description="项目ID")
 
 
 @router.get("/environments/default", summary="获取默认环境")
-async def get_default_environment(project_id: int = Query(..., description="项目ID")) -> JSONResponse:
+async def get_default_environment(
+        project_id: int = Query(description="项目ID")
+) -> ResponseModel | ResponseSchemaModel:
     """
     获取项目默认环境
     """
     environment = await EnvironmentManager.get_default_environment(project_id)
     if environment:
-        return response_base.success(data=environment.model_dump(), msg="获取默认环境成功")
+        return response_base.success(data=environment.model_dump())
     else:
-        return response_base.success(data=None, msg="项目未设置默认环境")
+        return response_base.success()
 
 
 @router.put("/environments/{environment_id}/default", summary="设置默认环境")
 async def set_default_environment(
-        project_id: int = Query(..., description="项目ID"),
-        environment_id: int = Path(..., description="环境ID")
-) -> JSONResponse:
+        project_id: int = Query(description="项目ID"),
+        environment_id: int = Path(description="环境ID")
+) -> ResponseModel | ResponseSchemaModel:
     """
     设置项目默认环境
     """
     success = await EnvironmentManager.set_default_environment(project_id, environment_id)
     if success:
-        return response_base.success(msg="设置默认环境成功")
+        return response_base.success(data=f"设置默认环境成功")
     else:
-        return response_base.fail(msg="设置默认环境失败")
+        return response_base.fail()
 
 
 # 变量管理接口
 @router.post("/variables", summary="创建变量")
-async def create_variable(variable: VariableModel) -> JSONResponse:
+async def create_variable(variable: VariableModel) -> ResponseModel | ResponseSchemaModel:
     """
     创建变量
     """
     success = await VariableManager.set_variable(variable)
     if success:
-        return response_base.success(data=variable.model_dump(), msg="变量创建成功")
+        return response_base.success(data=variable.model_dump())
     else:
-        return response_base.fail(msg="变量创建失败")
+        return response_base.fail()
 
 
 @router.get("/variables", summary="获取变量列表")
 async def list_variables(
-        scope: VariableScope,
+        scope: VariableScope = Query(..., description="变量作用域"),
         project_id: Optional[int] = Query(None, description="项目ID"),
         environment_id: Optional[int] = Query(None, description="环境ID"),
         case_id: Optional[int] = Query(None, description="用例ID")
-) -> JSONResponse:
+) -> ResponseModel | ResponseSchemaModel:
     """
     获取变量列表
     """
@@ -137,20 +139,17 @@ async def list_variables(
         environment_id=environment_id,
         case_id=case_id
     )
-    return response_base.success(
-        data=[var.model_dump() for var in variables],
-        msg="获取变量列表成功"
-    )
+    return response_base.success(data=[var.model_dump() for var in variables])
 
 
 @router.get("/variables/{name}", summary="获取变量")
 async def get_variable(
-        name: str = Path(..., description="变量名"),
+        name: str = Path(description="变量名"),
         scope: VariableScope = Query(..., description="变量作用域"),
         project_id: Optional[int] = Query(None, description="项目ID"),
         environment_id: Optional[int] = Query(None, description="环境ID"),
         case_id: Optional[int] = Query(None, description="用例ID")
-) -> JSONResponse:
+) -> ResponseModel | ResponseSchemaModel:
     """
     获取变量
     """
@@ -162,19 +161,19 @@ async def get_variable(
         case_id=case_id
     )
     if variable:
-        return response_base.success(data=variable.model_dump(), msg="获取变量成功")
+        return response_base.success(data=variable.model_dump())
     else:
-        return response_base.fail(msg="变量不存在")
+        return response_base.fail()
 
 
 @router.delete("/variables/{name}", summary="删除变量")
 async def delete_variable(
-        name: str = Path(..., description="变量名"),
-        scope: VariableScope = Query(..., description="变量作用域"),
+        name: str = Path(description="变量名"),
+        scope: VariableScope = Query(description="变量作用域"),
         project_id: Optional[int] = Query(None, description="项目ID"),
         environment_id: Optional[int] = Query(None, description="环境ID"),
         case_id: Optional[int] = Query(None, description="用例ID")
-) -> JSONResponse:
+) -> ResponseModel | ResponseSchemaModel:
     """
     删除变量
     """
@@ -186,9 +185,9 @@ async def delete_variable(
         case_id=case_id
     )
     if success:
-        return response_base.success(msg="删除变量成功")
+        return response_base.success(data="删除变量成功")
     else:
-        return response_base.fail(msg="删除变量失败")
+        return response_base.fail()
 
 
 @router.post("/variables/process-template", summary="处理变量模板")
@@ -198,7 +197,7 @@ async def process_template(
         environment_id: Optional[int] = Body(None, description="环境ID"),
         case_id: Optional[int] = Body(None, description="用例ID"),
         temp_variables: Optional[Dict[str, Any]] = Body(None, description="临时变量")
-) -> JSONResponse:
+) -> ResponseModel | ResponseSchemaModel:
     """
     处理变量模板，替换模板中的变量引用
     """
@@ -209,4 +208,4 @@ async def process_template(
         case_id=case_id,
         temp_variables=temp_variables
     )
-    return response_base.success(data={"result": result}, msg="处理变量模板成功")
+    return response_base.success(data={"result": result})

backend/plugin/api_testing/api/v1/mock.py

@@ -8,7 +8,7 @@
 from fastapi import APIRouter, Body, Path, Query
 from fastapi.responses import JSONResponse
 
-from backend.common.response.response_schema import response_base
+from backend.common.response.response_schema import response_base, ResponseModel, ResponseSchemaModel
 from backend.plugin.api_testing.utils.mock_server import (
     MockProject, MockRule, MockResponse, MockCondition,
     MockServer
@@ -19,149 +19,145 @@
 
 # Mock项目管理接口
 @router.post("/projects", summary="创建Mock项目")
-async def create_mock_project(project: MockProject) -> JSONResponse:
+async def create_mock_project(project: MockProject) -> ResponseModel | ResponseSchemaModel:
     """
     创建Mock项目
     """
     success = await MockServer.create_project(project)
     if success:
-        return response_base.success(data=project.model_dump(), msg="Mock项目创建成功")
+        return response_base.success(data=project.model_dump())
     else:
-        return response_base.fail(msg="Mock项目创建失败")
+        return response_base.fail()
 
 
 @router.get("/projects/{project_id}", summary="获取Mock项目")
-async def get_mock_project(project_id: int = Path(..., description="项目ID")) -> JSONResponse:
+async def get_mock_project(project_id: int = Path(description="项目ID")) -> ResponseModel | ResponseSchemaModel:
     """
     获取Mock项目
     """
     project = await MockServer.get_project(project_id)
     if project:
-        return response_base.success(data=project.model_dump(), msg="获取Mock项目成功")
+        return response_base.success(data=project.model_dump())
     else:
-        return response_base.fail(msg="Mock项目不存在")
+        return response_base.fail()
 
 
 @router.put("/projects/{project_id}", summary="更新Mock项目")
 async def update_mock_project(
-    project: MockProject,
-    project_id: int = Path(..., description="项目ID")
-) -> JSONResponse:
+        project: MockProject,
+        project_id: int = Path(description="项目ID")
+) -> ResponseModel | ResponseSchemaModel:
     """
     更新Mock项目
     """
     # 确保路径参数和请求体ID一致
     if project.id != project_id:
-        return response_base.fail(msg="项目ID不匹配")
-        
+        return response_base.fail(data="项目ID不匹配")
+
     success = await MockServer.update_project(project)
     if success:
-        return response_base.success(data=project.model_dump(), msg="更新Mock项目成功")
+        return response_base.success(data=project.model_dump())
     else:
-        return response_base.fail(msg="更新Mock项目失败")
+        return response_base.fail(data="更新Mock项目失败")
 
 
 @router.delete("/projects/{project_id}", summary="删除Mock项目")
-async def delete_mock_project(project_id: int = Path(..., description="项目ID")) -> JSONResponse:
+async def delete_mock_project(project_id: int = Path(description="项目ID")) -> ResponseModel | ResponseSchemaModel:
     """
     删除Mock项目
     """
     success = await MockServer.delete_project(project_id)
     if success:
-        return response_base.success(msg="删除Mock项目成功")
+        return response_base.success(data="删除Mock项目成功")
     else:
-        return response_base.fail(msg="删除Mock项目失败")
+        return response_base.fail(data="删除Mock项目失败")
 
 
 @router.get("/projects", summary="获取所有Mock项目")
-async def list_mock_projects() -> JSONResponse:
+async def list_mock_projects() -> ResponseModel | ResponseSchemaModel:
     """
     获取所有Mock项目
     """
     projects = await MockServer.list_projects()
-    return response_base.success(
-        data=[project.model_dump() for project in projects],
-        msg="获取Mock项目列表成功"
-    )
+    return response_base.success(data=[project.model_dump() for project in projects])
 
 
 # Mock规则管理接口
 @router.post("/rules", summary="创建Mock规则")
-async def create_mock_rule(rule: MockRule) -> JSONResponse:
+async def create_mock_rule(rule: MockRule) -> ResponseModel | ResponseSchemaModel:
     """
     创建Mock规则
     """
     success = await MockServer.create_rule(rule)
     if success:
-        return response_base.success(data=rule.model_dump(), msg="Mock规则创建成功")
+        return response_base.success(data=rule.model_dump())
     else:
-        return response_base.fail(msg="Mock规则创建失败")
+        return response_base.fail(data="Mock规则创建失败")
 
 
 @router.get("/rules/{rule_id}", summary="获取Mock规则")
 async def get_mock_rule(
-    rule_id: str = Path(..., description="规则ID"),
-    project_id: int = Query(..., description="项目ID")
-) -> JSONResponse:
+        rule_id: str = Path(description="规则ID"),
+        project_id: int = Query(description="项目ID")
+) -> ResponseModel | ResponseSchemaModel:
     """
     获取Mock规则
     """
     rule = await MockServer.get_rule(rule_id, project_id)
     if rule:
-        return response_base.success(data=rule.model_dump(), msg="获取Mock规则成功")
+        return response_base.success(data=rule.model_dump())
     else:
-        return response_base.fail(msg="Mock规则不存在")
+        return response_base.fail(data="Mock规则不存在")
 
 
 @router.put("/rules/{rule_id}", summary="更新Mock规则")
 async def update_mock_rule(
-    rule: MockRule,
-    rule_id: str = Path(..., description="规则ID"),
-    project_id: int = Query(..., description="项目ID")
-) -> JSONResponse:
+        rule: MockRule,
+        rule_id: str = Path(description="规则ID"),
+        project_id: int = Query(description="项目ID")
+) -> ResponseModel | ResponseSchemaModel:
     """
     更新Mock规则
     """
     # 确保路径参数和请求体ID一致
     if rule.id != rule_id or rule.project_id != project_id:
-        return response_base.fail(msg="规则ID或项目ID不匹配")
-        
+        return response_base.fail(data="规则ID或项目ID不匹配")
+
     success = await MockServer.update_rule(rule)
     if success:
-        return response_base.success(data=rule.model_dump(), msg="更新Mock规则成功")
+        return response_base.success(data=rule.model_dump())
     else:
-        return response_base.fail(msg="更新Mock规则失败")
+        return response_base.fail(data="更新Mock规则失败")
 
 
 @router.delete("/rules/{rule_id}", summary="删除Mock规则")
 async def delete_mock_rule(
-    rule_id: str = Path(..., description="规则ID"),
-    project_id: int = Query(..., description="项目ID")
-) -> JSONResponse:
+        rule_id: str = Path(description="规则ID"),
+        project_id: int = Query(description="项目ID")
+) -> ResponseModel | ResponseSchemaModel:
     """
     删除Mock规则
     """
     success = await MockServer.delete_rule(rule_id, project_id)
     if success:
-        return response_base.success(msg="删除Mock规则成功")
+        return response_base.success(data="删除Mock规则成功")
     else:
-        return response_base.fail(msg="删除Mock规则失败")
+        return response_base.fail(data="删除Mock规则失败")
 
 
 @router.get("/rules", summary="获取项目的所有Mock规则")
-async def list_mock_rules(project_id: int = Query(..., description="项目ID")) -> JSONResponse:
+async def list_mock_rules(project_id: int = Query(..., description="项目ID")) -> ResponseModel | ResponseSchemaModel:
     """
     获取项目的所有Mock规则
     """
     rules = await MockServer.list_rules(project_id)
     return response_base.success(
-        data=[rule.model_dump() for rule in rules],
-        msg="获取Mock规则列表成功"
+        data=[rule.model_dump() for rule in rules]
     )
 
 
 @router.get("/server-info", summary="获取Mock服务信息")
-async def get_mock_server_info() -> JSONResponse:
+async def get_mock_server_info() -> ResponseModel | ResponseSchemaModel:
     """
     获取Mock服务信息
     """
@@ -172,4 +168,4 @@ async def get_mock_server_info() -> JSONResponse:
         "docs_url": "/docs",
         "redoc_url": "/redoc"
     }
-    return response_base.success(data=info, msg="获取Mock服务信息成功")
+    return response_base.success(data=info, msg="获取Mock服务信息成功")