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

Merge branch 'master' of https://github.com/metersphere/metersphere

This commit is contained in:
fit2-zhao 2021-03-22 14:11:59 +08:00
parent ec6a019b62 58d7ddbdd5
commit 02558f6d66
5 changed files with 19 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/xpack

@ -1 +1 @@
Subproject commit c9fd084c8f4453d7697677a79d9a0a953c045e38
Subproject commit 2fb883803fa9909162ce9f6fab8a15b63af66923

9
frontend/src/business/components/settings/system/TestResourcePool.vue
View File

@ -104,12 +104,18 @@
</el-col>
</el-row>
<el-row>
<el-col>
<el-col :span="12">
<el-form-item :label="$t('test_resource_pool.max_threads')"
:rules="requiredRules">
<el-input-number v-model="item.maxConcurrency" :min="1" :max="1000000000"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('test_resource_pool.pod_thread_limit')"
:rules="requiredRules">
<el-input-number v-model="item.podThreadLimit" :min="1" :max="1000000"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
@ -237,6 +243,7 @@ export default {
info.masterUrl = '';
info.token = '';
info.namespace = '';
info.podThreadLimit = 5000;
}
info.maxConcurrency = 100;
this.infoList.push(info);

7
frontend/src/i18n/en-US.js
View File

@ -891,8 +891,8 @@ export default {
code_template_get_response_header: "Get Response Header",
code_template_get_response_code: "Get Response Code",
code_template_get_response_result: "Get Response Result",
code_add_report_length : "Add report length to head",
code_hide_report_length : "Hide report length"
code_add_report_length: "Add report length to head",
code_hide_report_length: "Hide report length"
},
dubbo: {
protocol: "protocol",
@ -1434,7 +1434,8 @@ export default {
status_change_success: 'Successfully changed the status!',
status_change_failed: 'Failed to change the status, resource pool is invalid!',
check_in: 'Check in',
node_selector_invalid: 'nodeSelector must be JSON'
node_selector_invalid: 'nodeSelector must be JSON',
pod_thread_limit: 'Maximum number of threads per POD'
},
system_parameter_setting: {
mailbox_service_settings: 'Mailbox Settings',

7
frontend/src/i18n/zh-CN.js
View File

@ -893,8 +893,8 @@ export default {
code_template_get_response_header: "获取响应头",
code_template_get_response_code: "获取响应码",
code_template_get_response_result: "获取响应结果",
code_add_report_length : "报文头添加长度",
code_hide_report_length : "隐藏报文长度"
code_add_report_length: "报文头添加长度",
code_hide_report_length: "隐藏报文长度"
},
dubbo: {
protocol: "协议",
@ -1438,7 +1438,8 @@ export default {
status_change_success: '状态修改成功!',
status_change_failed: '状态修改失败, 校验不通过!',
check_in: '校验中',
node_selector_invalid: 'nodeSelector 必须是有效的JSON'
node_selector_invalid: 'nodeSelector 必须是有效的JSON',
pod_thread_limit: '单POD最大线程数'
},
system_parameter_setting: {
mailbox_service_settings: '邮件设置',

3
frontend/src/i18n/zh-TW.js
View File

@ -1436,7 +1436,8 @@ export default {
status_change_success: '狀態修改成功!',
status_change_failed: '狀態修改失敗, 校驗不通過!',
check_in: '校驗中',
node_selector_invalid: 'nodeSelector 必須是有效的JSON'
node_selector_invalid: 'nodeSelector 必須是有效的JSON',
pod_thread_limit: '單POD最大線程數'
},
system_parameter_setting: {
mailbox_service_settings: '郵件設置',