将环境数据与配置数据， 模型数据隔离开，同步修改了配套相关代码

test_case/test_manual_case/test_login_demo.py

@@ -10,7 +10,7 @@
 import pytest
 import os
 from common_utils.yaml_handle import YamlHandle
-from config.project_path import DATA_DIR
+from config.path_config import DATA_DIR
 from case_utils.assert_handle import assert_response, assert_sql
 from loguru import logger
 from case_utils.request_data_handle import RequestPreDataHandle, RequestHandle
@@ -18,6 +18,8 @@ from pytest_html import extras  # 往pytest-html报告中填写额外的内容
 from common_utils.func_handle import add_docstring
 from case_utils.allure_handle import allure_title
 import allure
+from config.settings import db_info
+from config.global_vars import GLOBAL_VARS
 
 # 读取用例数据
 cases = YamlHandle(filename=os.path.join(DATA_DIR, "test_login_demo.yaml")).read_yaml
@@ -26,12 +28,10 @@ cases = YamlHandle(filename=os.path.join(DATA_DIR, "test_login_demo.yaml")).read
 @allure.story(f'{cases["case_common"]["allure_story"]}')
 @pytest.mark.test_login_demo
 @pytest.mark.parametrize("case", cases.get("case_info"))
-def test_login_demo(case, extra, request):
+def test_login_demo(case, extra):
     logger.info("-----------------------------START-开始执行用例-----------------------------")
     logger.debug(f"当前执行的用例数据:{case}")
     try:
-        # 获取命令行参数，判断当前处于哪个环境
-        env = request.config.getoption("--env")
         # 给当前测试方法添加文档注释
         add_docstring(case.get("title", ""))(test_login_demo)
         # 添加用例标题作为allure中显示的用例标题
@@ -48,7 +48,7 @@ def test_login_demo(case, extra, request):
             # 进行响应断言
             assert_response(response, case_data["assert_response"])
             # 进行数据库断言
-            assert_sql(env, case_data["assert_sql"])
+            assert_sql(db_info[GLOBAL_VARS["env_key"]], case_data["assert_sql"])
         else:
             reason = f"标记了该用例为false，不执行\\n"
             logger.warning(f"{reason}")