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

fix (通用功能): 任务中心任务显示问题处理 

--bug=1008169 --user=赵勇 【接口定义】-修改认证配置为No Auth保存失败 https://www.tapd.cn/55049933/s/1073602
This commit is contained in:
fit2-zhao 2021-11-23 20:25:44 +08:00 committed by fit2-zhao
parent 750a49386b
commit 2070e2e23b
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/main/java/io/metersphere/api/jmeter/JmeterLoggerAppender.java
View File

@ -26,10 +26,12 @@ public class JmeterLoggerAppender extends UnsynchronizedAppenderBase<ILoggingEve
}
}
}
if (FixedCapacityUtils.fixedCapacityCache.containsKey(event.getTimeStamp())) {
FixedCapacityUtils.fixedCapacityCache.get(event.getTimeStamp()).append(message);
} else {
FixedCapacityUtils.fixedCapacityCache.put(event.getTimeStamp(), message);
if (message != null && !message.toString().contains("java.net.UnknownHostException")) {
if (FixedCapacityUtils.fixedCapacityCache.containsKey(event.getTimeStamp())) {
FixedCapacityUtils.fixedCapacityCache.get(event.getTimeStamp()).append(message);
} else {
FixedCapacityUtils.fixedCapacityCache.put(event.getTimeStamp(), message);
}
}
}
} catch (Exception e) {

8
backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
View File

@ -1376,12 +1376,6 @@ public class ApiAutomationService {
executeQueue.put(report.getId(), new RunModeDataDTO(hashTree, report));
} catch (Exception ex) {
if (StringUtils.equalsAny(request.getTriggerMode(), TriggerMode.BATCH.name(), TriggerMode.SCHEDULE.name())) {
// String testPlanScenarioId;
// if (request.getScenarioTestPlanIdMap() != null && request.getScenarioTestPlanIdMap().containsKey(item.getId())) {
// testPlanScenarioId = request.getScenarioTestPlanIdMap().get(item.getId());
// } else {
// testPlanScenarioId = request.getPlanScenarioId();
// }
remakeReportService.remakeScenario(request.getRunMode(), testPlanScenarioId, request.getConfig(), scenario, report);
} else {
MSException.throwException(ex);
@ -1536,7 +1530,7 @@ public class ApiAutomationService {
}
}
// 清理未执行的队列
if (reportIds.size() < executeQueue.size()) {
if (reportIds.size() < executeQueue.size() && StringUtils.isNotEmpty(serialReportId)) {
List<String> removeList = executeQueue.entrySet().stream().filter(map -> !reportIds.contains(map.getKey()))
.map(map -> map.getKey()).collect(Collectors.toList());
ApiScenarioReportExample example = new ApiScenarioReportExample();

4
frontend/src/business/components/api/definition/components/ApiConfig.vue
View File

@ -255,8 +255,8 @@ export default {
data.requestId = data.request.id;
if (data.request) {
// 历史数据处理
if(data.request.authManager){
data.request.authManager.clazzName = TYPE_TO_C.get(data.request.authManager.type);
if (data.request.authManager) {
data.request.authManager.clazzName = TYPE_TO_C.get("AuthManager");
}
this.sort(data.request.hashTree);
}