test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 接口自动化定时任务和api调用发送通知操作人变量不能获取

This commit is contained in:
Captain.B 2021-10-12 17:10:39 +08:00 committed by 刘瑞斌
parent 5d82f042fe
commit c040beae79
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/main/java/io/metersphere/api/service/TestResultService.java
View File

@ -8,12 +8,13 @@ import io.metersphere.commons.constants.*;
import io.metersphere.commons.utils.CommonBeanFactory; import io.metersphere.commons.utils.CommonBeanFactory;
import io.metersphere.commons.utils.DateUtils; import io.metersphere.commons.utils.DateUtils;
import io.metersphere.commons.utils.LogUtil; import io.metersphere.commons.utils.LogUtil;
import io.metersphere.commons.utils.SessionUtils;
import io.metersphere.dto.BaseSystemConfigDTO; import io.metersphere.dto.BaseSystemConfigDTO;
import io.metersphere.dto.UserDTO;
import io.metersphere.i18n.Translator; import io.metersphere.i18n.Translator;
import io.metersphere.notice.sender.NoticeModel; import io.metersphere.notice.sender.NoticeModel;
import io.metersphere.notice.service.NoticeSendService; import io.metersphere.notice.service.NoticeSendService;
import io.metersphere.service.SystemParameterService; import io.metersphere.service.SystemParameterService;
import io.metersphere.service.UserService;
import io.metersphere.track.request.testcase.TrackCount; import io.metersphere.track.request.testcase.TrackCount;
import io.metersphere.track.service.TestPlanApiCaseService; import io.metersphere.track.service.TestPlanApiCaseService;
import io.metersphere.track.service.TestPlanScenarioCaseService; import io.metersphere.track.service.TestPlanScenarioCaseService;
@ -51,6 +52,8 @@ public class TestResultService {
private TestPlanApiCaseService testPlanApiCaseService; private TestPlanApiCaseService testPlanApiCaseService;
@Resource @Resource
private TestPlanTestCaseService testPlanTestCaseService; private TestPlanTestCaseService testPlanTestCaseService;
@Resource
private UserService userService;
public void saveResult(TestResult testResult, String runMode, String debugReportId, String testId) { public void saveResult(TestResult testResult, String runMode, String debugReportId, String testId) {
try { try {
@ -195,7 +198,7 @@ public class TestResultService {
} }
} }
private static void sendTask(ApiTestReportVariable report, String reportUrl, TestResult testResult) { private void sendTask(ApiTestReportVariable report, String reportUrl, TestResult testResult) {
if (report == null) { if (report == null) {
return; return;
} }
@ -233,9 +236,11 @@ public class TestResultService {
if (StringUtils.equals("error", report.getStatus())) { if (StringUtils.equals("error", report.getStatus())) {
event = NoticeConstants.Event.EXECUTE_FAILED; event = NoticeConstants.Event.EXECUTE_FAILED;
} }
UserDTO userDTO = userService.getUserDTO(report.getUserId());
Map paramMap = new HashMap<>(); Map paramMap = new HashMap<>();
paramMap.put("type", "api"); paramMap.put("type", "api");
paramMap.put("url", baseSystemConfigDTO.getUrl()); paramMap.put("url", baseSystemConfigDTO.getUrl());
paramMap.put("operator", userDTO.getName());
paramMap.putAll(new BeanMap(report)); paramMap.putAll(new BeanMap(report));
NoticeModel noticeModel = NoticeModel.builder() NoticeModel noticeModel = NoticeModel.builder()
.operator(report.getUserId()) .operator(report.getUserId())