🐞 Fix(Fix some bugs in the sql execution interface): 修复一些sql执行接口bug

Author: RanY-Luck

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

@@ -4,18 +4,15 @@
 SQL执行API
 """
 from typing import Any, Dict, List
-
-from fastapi import APIRouter, Body
-from fastapi.responses import JSONResponse
-
-from backend.common.response.response_schema import response_base
+from fastapi import APIRouter
+from backend.common.response.response_schema import response_base, ResponseModel, ResponseSchemaModel
 from backend.plugin.api_testing.utils.sql_executor import SQLExecutor, SQLQuery
 
 router = APIRouter()
 
 
 @router.post("/execute", response_model=Dict[str, Any], summary="执行SQL查询")
-async def execute_sql_query(query: SQLQuery) -> JSONResponse:
+async def execute_sql_query(query: SQLQuery) -> ResponseModel:
     """
     执行SQL查询接口
     
@@ -24,35 +21,51 @@ async def execute_sql_query(query: SQLQuery) -> JSONResponse:
     try:
         # 执行SQL查询
         result = await SQLExecutor.execute_query(query)
-        
-        return response_base.success(data=result.model_dump())
+        response = response_base.success(data=result.model_dump())
+        return response.model_dump()
     except Exception as e:
-        return response_base.fail(msg=f"SQL执行失败: {str(e)}")
+        response = response_base.fail(data=f"SQL执行失败: {str(e)}")
+        return response.model_dump()
 
 
 @router.post("/batch-execute", response_model=Dict[str, Any], summary="批量执行SQL查询")
-async def execute_batch_sql_queries(queries: List[SQLQuery]) -> JSONResponse:
+async def execute_batch_sql_queries(queries: List[SQLQuery]) -> Dict[str, Any]:
     """
     批量执行SQL查询接口
-    
+
     批量执行指定的SQL查询并返回结果列表
     """
     try:
         results = []
         for query in queries:
-            result = await SQLExecutor.execute_query(query)
-            results.append(result.model_dump())
-        
+            try:
+                result = await SQLExecutor.execute_query(query)
+                response = response_base.success(data=result.model_dump())
+                results.append(response.model_dump())
+            except Exception as query_error:
+                # 单个查询失败时，记录错误但继续执行其他查询
+                error_response = response_base.fail(data=f"查询执行失败: {str(query_error)}")
+                results.append(error_response.model_dump())
         # 构建响应
         data = {
             "results": results,
             "summary": {
                 "total": len(results),
-                "success": sum(1 for result in results if result["success"]),
-                "failed": sum(1 for result in results if not result["success"])
+                "success": sum(1 for result in results if result.get("success", False)),
+                "failed": sum(1 for result in results if not result.get("success", True))
             }
         }
-        
-        return response_base.success(data=data)
+
+        return {
+            "code": 200,
+            "msg": "批量执行完成",
+            "data": data,
+            "success": True
+        }
     except Exception as e:
-        return response_base.fail(msg=f"批量SQL执行失败: {str(e)}")
+        return {
+            "code": 400,
+            "msg": "请求错误",
+            "data": f"批量SQL执行失败: {str(e)}",
+            "success": False
+        }

backend/plugin/api_testing/requirements.txt

@@ -3,8 +3,4 @@ jsonpath-ng>=1.5.0
 jinja2>=3.0.0
 pymysql>=1.0.2
 pandas>=1.3.0
-xlrd>=2.0.1
-
-# 可选依赖，PostgreSQL支持
-# 如果不需要PostgreSQL支持，可以注释掉下面这行
-# psycopg>=3.1.8
+xlrd>=2.0.1

backend/plugin/api_testing/utils/sql_executor.py

@@ -70,15 +70,15 @@ def get_default_db_config() -> DBConfig:
         
         :return: 数据库配置
         """
-        db_type = DatabaseType.MYSQL if settings.DB_ENGINE == "mysql" else DatabaseType.POSTGRESQL
+        db_type = DatabaseType.MYSQL if settings.DATABASE_TYPE == "mysql" else DatabaseType.POSTGRESQL
 
         return DBConfig(
             type=db_type,
-            host=settings.DB_HOST,
-            port=settings.DB_PORT,
-            username=settings.DB_USER,
-            password=settings.DB_PASSWORD,
-            database=settings.DB_DATABASE
+            host=settings.DATABASE_HOST,
+            port=settings.DATABASE_PORT,
+            username=settings.DATABASE_USER,
+            password=settings.DATABASE_PASSWORD,
+            database=settings.DATABASE_SCHEMA
         )
 
     @staticmethod