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

fix(接口测试): 场景步骤引用SQL步骤控制

This commit is contained in:
fit2-zhao 2022-03-24 11:58:43 +08:00 committed by 刘瑞斌
parent a3ed11cda3
commit 653bff8ee5
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/exec/queue/ExecThreadPoolExecutor.java
View File

@ -104,7 +104,7 @@ public class ExecThreadPoolExecutor {
public void setCorePoolSize(int maximumPoolSize) {
try {
int corePoolSize = maximumPoolSize > 1000 ? 1000 : maximumPoolSize;
int corePoolSize = maximumPoolSize > 500 ? 500 : maximumPoolSize;
if (corePoolSize > CORE_POOL_SIZE) {
threadPool.setCorePoolSize(corePoolSize);
}

8
frontend/src/business/components/api/automation/scenario/common/JDBCProcessorContent.vue
View File

@ -3,13 +3,13 @@
<el-row>
<el-col :span="21" style="padding-bottom: 20px">
<div style="border:1px #DCDFE6 solid; height: 100%;border-radius: 4px ;width: 100% ;margin: 20px">
<el-form :model="request" :rules="rules" ref="request" label-width="100px" :disabled="isReadOnly" style="margin: 10px">
<el-form :model="request" :rules="rules" ref="request" label-width="100px" :disabled="request.disabled" style="margin: 10px">
<el-row>
<el-col :span="8">
<el-form-item prop="environmentId" :label="$t('api_test.definition.request.run_env')">
<el-select v-model="request.environmentId" size="small" class="ms-htt-width"
:placeholder="$t('api_test.definition.request.run_env')"
@change="environmentChange" clearable>
@change="environmentChange" clearable :disabled="isReadOnly">
<el-option v-for="(environment, index) in environments" :key="index"
:label="environment.name"
:value="environment.id"/>
@ -28,7 +28,7 @@
</el-col>
<el-col :span="8">
<el-form-item :label="$t('api_test.request.sql.dataSource')" prop="dataSourceId" style="margin-left: 10px">
<el-select v-model="request.dataSourceId" size="small" @change="reload">
<el-select v-model="request.dataSourceId" size="small" @change="reload" :disabled="request.disabled">
<el-option v-for="(item, index) in databaseConfigsOptions" :key="index" :value="item.id" :label="item.name"/>
</el-select>
</el-form-item>
@ -36,7 +36,7 @@
</el-col>
<el-col :span="8">
<el-form-item :label="$t('api_test.request.sql.timeout')" prop="queryTimeout" style="margin-left: 10px">
<el-input-number :disabled="isReadOnly" size="small" v-model="request.queryTimeout" :placeholder="$t('commons.millisecond')" :max="1000*10000000" :min="0"/>
<el-input-number :disabled="request.disabled" size="small" v-model="request.queryTimeout" :placeholder="$t('commons.millisecond')" :max="1000*10000000" :min="0"/>
</el-form-item>
</el-col>
</el-row>

7
frontend/src/business/components/api/automation/scenario/component/JDBCProcessor.vue
View File

@ -12,12 +12,11 @@
:background-color="backgroundColor"
:title="title" v-loading="loading">
<legend style="width: 100%">
<template v-slot:request>
<jdbc-processor-content
:showScript="false"
:request="request"/>
</legend>
</template>
</api-base-component>
</template>
@ -56,7 +55,7 @@ export default {
default:
false
},
request:Object,
request: Object,
title: String,
color: String,
backgroundColor: String,