parent
4309a300d6
commit
f09cc98b67
|
@ -195,14 +195,23 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
|
||||||
} else {
|
} else {
|
||||||
String[] sceneNameArr = scenaName.split("-");
|
String[] sceneNameArr = scenaName.split("-");
|
||||||
if (sceneNameArr.length >= 4) {
|
if (sceneNameArr.length >= 4) {
|
||||||
|
//如果以yyyy-MM-dd 时间类型结尾
|
||||||
String endStr = "-" + sceneNameArr[sceneNameArr.length - 3] + "-" + sceneNameArr[sceneNameArr.length - 2] + "-" + sceneNameArr[sceneNameArr.length - 1];
|
String endStr = "-" + sceneNameArr[sceneNameArr.length - 3] + "-" + sceneNameArr[sceneNameArr.length - 2] + "-" + sceneNameArr[sceneNameArr.length - 1];
|
||||||
scenaName = scenaName.split(endStr)[0];
|
scenaName = scenaName.split(endStr)[0];
|
||||||
} else {
|
} else {
|
||||||
|
//如果以时间戳结尾
|
||||||
scenaName = scenaName.split("-")[0];
|
scenaName = scenaName.split("-")[0];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
ApiScenarioReport savedReport = apiScenarioReportService.get(testId);
|
||||||
|
String scenarioID = null;
|
||||||
|
if(savedReport!=null){
|
||||||
|
scenarioID = savedReport.getScenarioId();
|
||||||
|
}
|
||||||
|
if(scenarioID==null){
|
||||||
|
scenarioID = apiScenarioReportService.getApiScenarioId(scenaName, scenarioReport.getProjectId());
|
||||||
|
}
|
||||||
|
|
||||||
String scenarioID = apiScenarioReportService.getApiScenarioId(scenaName, scenarioReport.getProjectId());
|
|
||||||
testResult.setTestId(scenarioID);
|
testResult.setTestId(scenarioID);
|
||||||
} else {
|
} else {
|
||||||
apiTestService.changeStatus(testId, APITestStatus.Completed);
|
apiTestService.changeStatus(testId, APITestStatus.Completed);
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
</el-link>
|
</el-link>
|
||||||
<el-dropdown-menu slot="dropdown">
|
<el-dropdown-menu slot="dropdown">
|
||||||
<el-dropdown-item command="ref">{{ $t('api_test.automation.view_ref') }}</el-dropdown-item>
|
<el-dropdown-item command="ref">{{ $t('api_test.automation.view_ref') }}</el-dropdown-item>
|
||||||
<el-dropdown-item command="schedule">{{ $t('api_test.automation.schedule') }}</el-dropdown-item>
|
<el-dropdown-item command="schedule" v-tester>{{ $t('api_test.automation.schedule') }}</el-dropdown-item>
|
||||||
</el-dropdown-menu>
|
</el-dropdown-menu>
|
||||||
<ms-reference-view ref="viewRef"/>
|
<ms-reference-view ref="viewRef"/>
|
||||||
<ms-schedule-maintain ref="scheduleMaintain" />
|
<ms-schedule-maintain ref="scheduleMaintain" />
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
prop="cronValue">
|
prop="cronValue">
|
||||||
<el-input :disabled="isReadOnly" v-model="form.cronValue" class="inp"
|
<el-input :disabled="isReadOnly" v-model="form.cronValue" class="inp"
|
||||||
:placeholder="$t('schedule.please_input_cron_expression')"/>
|
:placeholder="$t('schedule.please_input_cron_expression')"/>
|
||||||
<el-button :disabled="isReadOnly" type="primary" @click="saveCron">{{
|
<el-button :disabled="isReadOnly" type="primary" @click="saveCron" v-tester>{{
|
||||||
$t('commons.save')
|
$t('commons.save')
|
||||||
}}
|
}}
|
||||||
</el-button>
|
</el-button>
|
||||||
|
|
|
@ -6,10 +6,10 @@
|
||||||
🤔️天凉了,保温杯买了吗?
|
🤔️天凉了,保温杯买了吗?
|
||||||
</div>
|
</div>
|
||||||
<div v-else-if="dateType==='2'">
|
<div v-else-if="dateType==='2'">
|
||||||
<el-link href="https://github.com/metersphere/metersphere/issues" target="_blank" type="primary">😔觉得MeterSphere不好用就来https://github.com/metersphere/metersphere/issues吐个槽吧!</el-link>
|
😔觉得MeterSphere不好用就来 <el-link href="https://github.com/metersphere/metersphere/issues" target="_blank" style="color: black" type="primary">https://github.com/metersphere/metersphere/issues</el-link> 吐个槽吧!
|
||||||
</div>
|
</div>
|
||||||
<div v-else-if="dateType==='3'">
|
<div v-else-if="dateType==='3'">
|
||||||
<el-link href="https://github.com/metersphere/metersphere" target="_blank" type="primary">😄觉得MeterSphere好用就来 https://github.com/metersphere/metersphere 点个star吧!</el-link>
|
😄觉得MeterSphere好用就来 <el-link href="https://github.com/metersphere/metersphere" target="_blank" style="color: black" type="primary">https://github.com/metersphere/metersphere</el-link> 点个star吧!
|
||||||
</div>
|
</div>
|
||||||
<div v-else>
|
<div v-else>
|
||||||
😊 MeterSphere温馨提醒 —— 多喝热水哟!
|
😊 MeterSphere温馨提醒 —— 多喝热水哟!
|
||||||
|
|
Loading…
Reference in New Issue