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

fix(接口测试): 简化用例执行时的执行用户信息参数 

简化用例执行时的执行用户信息参数
This commit is contained in:
song-tianyang 2022-04-29 16:19:44 +08:00 committed by fit2-zhao
parent 35f84f54a9
commit fdfe6b6cb2
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java
View File

@ -185,9 +185,11 @@ public class ApiExecuteService {
JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(testId, request.getId(), runMode, hashTree);
runRequest.setDebug(request.isDebug());
runRequest.setExtendedParameters(new HashMap<String, Object>() {{
this.put("SYN_RES", request.isSyncResult());
this.put("user", Objects.requireNonNull(SessionUtils.getUser()));
this.put("userId", SessionUtils.getUser().getId());
this.put("userName", SessionUtils.getUser().getName());
}});
// 开始执行
jMeterService.run(runRequest);

27
backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
View File

@ -81,18 +81,19 @@ public class ApiDefinitionExecResultService {
ApiDefinitionExecResult result = this.editResult(item, dto.getReportId(), dto.getConsole(), dto.getRunMode(), dto.getTestId(), null);
if (result != null) {
User user = null;
if(MapUtils.isNotEmpty(dto.getExtendedParameters()) && dto.getExtendedParameters().containsKey("user")){
try {
user = JSONObject.parseObject(String.valueOf(dto.getExtendedParameters().get("user")),User.class);
}catch (Exception e){
LogUtil.error("解析用户信息出错！",e);
if (MapUtils.isNotEmpty(dto.getExtendedParameters())) {
if (dto.getExtendedParameters().containsKey("userId") && dto.getExtendedParameters().containsKey("userName")) {
user = new User() {{
this.setId(dto.getExtendedParameters().get("userId").toString());
this.setName(dto.getExtendedParameters().get("userName").toString());
}};
} else if (dto.getExtendedParameters().containsKey("userId")) {
result.setUserId(dto.getExtendedParameters().get("userId").toString());
}
}else if(dto.getExtendedParameters().containsKey("userId")){
result.setUserId(dto.getExtendedParameters().get("userId").toString());
}
// 发送通知
result.setResourceId(dto.getTestId());
sendNotice(result,user);
sendNotice(result, user);
}
}
}
@ -123,12 +124,12 @@ public class ApiDefinitionExecResultService {
if (result != null && !StringUtils.startsWithAny(dto.getRunMode(), "SCHEDULE")) {
User user = null;
if(MapUtils.isNotEmpty(dto.getExtendedParameters()) && dto.getExtendedParameters().containsKey("user")&& dto.getExtendedParameters().get("user") instanceof User){
user = (User)dto.getExtendedParameters().get("user");
if (MapUtils.isNotEmpty(dto.getExtendedParameters()) && dto.getExtendedParameters().containsKey("user") && dto.getExtendedParameters().get("user") instanceof User) {
user = (User) dto.getExtendedParameters().get("user");
}
// 发送通知
result.setResourceId(dto.getTestId());
sendNotice(result,user);
sendNotice(result, user);
}
}
}
@ -170,7 +171,7 @@ public class ApiDefinitionExecResultService {
event = NoticeConstants.Event.EXECUTE_FAILED;
status = "失败";
}
if(user == null){
if (user == null) {
if (SessionUtils.getUser() != null && StringUtils.equals(SessionUtils.getUser().getId(), result.getUserId())) {
user = SessionUtils.getUser();
} else {
@ -311,7 +312,7 @@ public class ApiDefinitionExecResultService {
RequestResultExpandDTO expandDTO = ResponseUtil.parseByRequestResult(item);
ApiDefinitionExecResult reportResult = this.editResult(item, dto.getReportId(), dto.getConsole(), dto.getRunMode(), dto.getTestId(), null);
if(MapUtils.isNotEmpty(dto.getExtendedParameters()) && dto.getExtendedParameters().containsKey("userId")){
if (MapUtils.isNotEmpty(dto.getExtendedParameters()) && dto.getExtendedParameters().containsKey("userId")) {
reportResult.setUserId(String.valueOf(dto.getExtendedParameters().get("userId")));
}
String status = item.isSuccess() ? "success" : "error";