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

fix(接口测试): 修复定时同步模版参数不生效的缺陷 

https://github.com/metersphere/metersphere/issues/22847
This commit is contained in:
wxg0103 2023-03-17 18:51:08 +08:00 committed by jianxing
parent 8f222dfcb3
commit 555a8ab88a
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionImportUtilService.java
View File

@ -8,7 +8,10 @@ import io.metersphere.api.dto.definition.request.sampler.MsTCPSampler;
import io.metersphere.api.dto.mock.config.MockConfigImportDTO; import io.metersphere.api.dto.mock.config.MockConfigImportDTO;
import io.metersphere.api.parse.api.ApiDefinitionImport; import io.metersphere.api.parse.api.ApiDefinitionImport;
import io.metersphere.base.domain.*; import io.metersphere.base.domain.*;
import io.metersphere.base.mapper.*; import io.metersphere.base.mapper.ApiDefinitionMapper;
import io.metersphere.base.mapper.ApiModuleMapper;
import io.metersphere.base.mapper.ApiTestCaseMapper;
import io.metersphere.base.mapper.ProjectMapper;
import io.metersphere.base.mapper.ext.BaseProjectVersionMapper; import io.metersphere.base.mapper.ext.BaseProjectVersionMapper;
import io.metersphere.base.mapper.ext.ExtApiDefinitionMapper; import io.metersphere.base.mapper.ext.ExtApiDefinitionMapper;
import io.metersphere.base.mapper.ext.ExtApiTestCaseMapper; import io.metersphere.base.mapper.ext.ExtApiTestCaseMapper;
@ -17,13 +20,16 @@ import io.metersphere.commons.enums.ApiTestDataStatus;
import io.metersphere.commons.exception.MSException; import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.*; import io.metersphere.commons.utils.*;
import io.metersphere.dto.ProjectConfig; import io.metersphere.dto.ProjectConfig;
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.BaseProjectApplicationService; import io.metersphere.service.BaseProjectApplicationService;
import io.metersphere.service.BaseUserService;
import io.metersphere.service.MockConfigService; import io.metersphere.service.MockConfigService;
import io.metersphere.service.ServiceUtils; import io.metersphere.service.ServiceUtils;
import io.metersphere.service.ext.ExtApiScheduleService; import io.metersphere.service.ext.ExtApiScheduleService;
import jakarta.annotation.Resource;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -34,7 +40,6 @@ import org.json.JSONObject;
import org.mybatis.spring.SqlSessionUtils; import org.mybatis.spring.SqlSessionUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import jakarta.annotation.Resource;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -69,6 +74,8 @@ public class ApiDefinitionImportUtilService {
private ExtApiTestCaseMapper extApiTestCaseMapper; private ExtApiTestCaseMapper extApiTestCaseMapper;
@Resource @Resource
private ApiTestCaseService apiTestCaseService; private ApiTestCaseService apiTestCaseService;
@Resource
private BaseUserService baseUserService;
public void checkUrl(ApiTestImportRequest request, Project project) { public void checkUrl(ApiTestImportRequest request, Project project) {
@ -89,9 +96,11 @@ public class ApiDefinitionImportUtilService {
public void sendImportNotice(ApiTestImportRequest request, List<ApiImportSendNoticeDTO> apiImportSendNoticeDTOS, Project project) { public void sendImportNotice(ApiTestImportRequest request, List<ApiImportSendNoticeDTO> apiImportSendNoticeDTOS, Project project) {
if (StringUtils.equals(request.getType(), SCHEDULE)) { if (StringUtils.equals(request.getType(), SCHEDULE)) {
String scheduleId = extApiScheduleService.getScheduleInfo(request.getResourceId()); String scheduleId = extApiScheduleService.getScheduleInfo(request.getResourceId());
UserDTO userDTO = baseUserService.getUserDTO(request.getUserId());
String context = request.getSwaggerUrl() + "导入成功"; String context = request.getSwaggerUrl() + "导入成功";
Map<String, Object> paramMap = new HashMap<>(); Map<String, Object> paramMap = new HashMap<>();
paramMap.put("url", request.getSwaggerUrl()); paramMap.put("url", request.getSwaggerUrl());
paramMap.put("operator", userDTO.getName());
NoticeModel noticeModel = NoticeModel.builder().operator(project.getCreateUser()).context(context).testId(scheduleId).subject(Translator.get("swagger_url_scheduled_import_notification")).paramMap(paramMap).event(NoticeConstants.Event.EXECUTE_SUCCESSFUL).build(); NoticeModel noticeModel = NoticeModel.builder().operator(project.getCreateUser()).context(context).testId(scheduleId).subject(Translator.get("swagger_url_scheduled_import_notification")).paramMap(paramMap).event(NoticeConstants.Event.EXECUTE_SUCCESSFUL).build();
noticeSendService.send(NoticeConstants.Mode.SCHEDULE, StringUtils.EMPTY, noticeModel); noticeSendService.send(NoticeConstants.Mode.SCHEDULE, StringUtils.EMPTY, noticeModel);
} }
@ -142,10 +151,12 @@ public class ApiDefinitionImportUtilService {
public void sendFailMessage(ApiTestImportRequest request, Project project) { public void sendFailMessage(ApiTestImportRequest request, Project project) {
if (StringUtils.equals(request.getType(), SCHEDULE)) { if (StringUtils.equals(request.getType(), SCHEDULE)) {
String scheduleId = extApiScheduleService.getScheduleInfo(request.getResourceId()); String scheduleId = extApiScheduleService.getScheduleInfo(request.getResourceId());
UserDTO userDTO = baseUserService.getUserDTO(request.getUserId());
String context = request.getSwaggerUrl() + "导入失败"; String context = request.getSwaggerUrl() + "导入失败";
Map<String, Object> paramMap = new HashMap<>(); Map<String, Object> paramMap = new HashMap<>();
paramMap.put("url", request.getSwaggerUrl()); paramMap.put("url", request.getSwaggerUrl());
paramMap.put("projectId", request.getProjectId()); paramMap.put("projectId", request.getProjectId());
paramMap.put("operator", userDTO.getName());
NoticeModel noticeModel = NoticeModel.builder().operator(project.getCreateUser()).context(context).testId(scheduleId).subject(Translator.get("swagger_url_scheduled_import_notification")).paramMap(paramMap).event(NoticeConstants.Event.EXECUTE_FAILED).build(); NoticeModel noticeModel = NoticeModel.builder().operator(project.getCreateUser()).context(context).testId(scheduleId).subject(Translator.get("swagger_url_scheduled_import_notification")).paramMap(paramMap).event(NoticeConstants.Event.EXECUTE_FAILED).build();
noticeSendService.send(NoticeConstants.Mode.SCHEDULE, StringUtils.EMPTY, noticeModel); noticeSendService.send(NoticeConstants.Mode.SCHEDULE, StringUtils.EMPTY, noticeModel);
} }

7
framework/sdk-parent/frontend/src/components/MxNoticeTemplate.vue
View File

@ -53,11 +53,8 @@ export default {
{ {
label: this.$t('group.operator'), label: this.$t('group.operator'),
value: 'operator', value: 'operator',
}, }
{ ];
label: this.$t('commons.name'),
value: 'name',
}];
} }
} }
}, },