diff --git a/test-common/src/main/java/com/test/common/utils/JMeterUtil.java b/test-common/src/main/java/com/test/common/utils/JMeterUtil.java index 16837d7..964413d 100644 --- a/test-common/src/main/java/com/test/common/utils/JMeterUtil.java +++ b/test-common/src/main/java/com/test/common/utils/JMeterUtil.java @@ -67,6 +67,7 @@ public class JMeterUtil { String method = jmeterRequest.getMethod().toUpperCase(); String requestBody = jmeterRequest.getRequestBody(); String requestParams = jmeterRequest.getRequestParams(); + String requestHeaderJson = ""; Map requestParamsMap = convertJsonStringToMap(requestParams); String requestHeader = jmeterRequest.getRequestHeader(); String jmeterHomePath = jmeterRequest.getJmeterHomePath(); @@ -113,7 +114,7 @@ public class JMeterUtil { String value = entry.get("value"); headerMap.put(key, value); } - + requestHeaderJson = gson.toJson(headerMap); } HeaderManager headerManager = createHeaderManager(headerMap); @@ -147,6 +148,10 @@ public class JMeterUtil { } // 10. 获取响应结果 result = getResultMessageFromFile(jmeterHomePath + "/replay_result"+ id +".log"); + if (result != null) { + result.put("requestHeader", requestHeaderJson); + result.put("requestBody", requestBody); + } System.out.println("JMeter 测试执行完成!"); } catch (Exception e) { diff --git a/test-test/src/main/java/com/test/test/domain/TestCaseResult.java b/test-test/src/main/java/com/test/test/domain/TestCaseResult.java index 837245a..c6a4ddd 100644 --- a/test-test/src/main/java/com/test/test/domain/TestCaseResult.java +++ b/test-test/src/main/java/com/test/test/domain/TestCaseResult.java @@ -32,6 +32,14 @@ public class TestCaseResult extends BaseEntity { @Excel(name = "用例步骤id") private Long stepId; + /** http 请求头 */ + @Excel(name = "http 请求头") + private String requestHeader; + + /** http 请求体 */ + @Excel(name = "http 请求体") + private String requestBody; + /** http 响应头 */ @Excel(name = "http 响应头") private String responseHeader; diff --git a/test-test/src/main/java/com/test/test/service/impl/TestCaseServiceImpl.java b/test-test/src/main/java/com/test/test/service/impl/TestCaseServiceImpl.java index 08e6322..dc49352 100644 --- a/test-test/src/main/java/com/test/test/service/impl/TestCaseServiceImpl.java +++ b/test-test/src/main/java/com/test/test/service/impl/TestCaseServiceImpl.java @@ -194,6 +194,8 @@ public class TestCaseServiceImpl implements ITestCaseService testCaseResult.setCaseId(testCase.getId()); testCaseResult.setStepId(testCaseStep.getId()); if (resultMap != null) { + testCaseResult.setRequestHeader(resultMap.get("requestHeader")); + testCaseResult.setRequestBody(resultMap.get("requestBody")); testCaseResult.setResponseHeader(resultMap.get("responseHeader")); testCaseResult.setResponseBody(resultMap.get("responseBody")); // 处理参数提取 diff --git a/test-test/src/main/resources/mapper/test/TestCaseResultMapper.xml b/test-test/src/main/resources/mapper/test/TestCaseResultMapper.xml index 8e5950a..2c8b30a 100644 --- a/test-test/src/main/resources/mapper/test/TestCaseResultMapper.xml +++ b/test-test/src/main/resources/mapper/test/TestCaseResultMapper.xml @@ -1,13 +1,15 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + @@ -21,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, case_id, step_id, response_header, response_body, sql_result, polling_count, loop_count, assignment, assertion, use_time, execute_time, status from test_case_result + select id, case_id, step_id, request_header, request_body, response_header, response_body, sql_result, polling_count, loop_count, assignment, assertion, use_time, execute_time, status from test_case_result