Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
Captain.B 2020-08-26 15:52:36 +08:00
commit e483748b97
6 changed files with 50 additions and 43 deletions

View File

@ -71,8 +71,8 @@ quartz.enabled=true
quartz.scheduler-name=msServerJob
# file upload
spring.servlet.multipart.max-file-size=30MB
spring.servlet.multipart.max-request-size=30MB
spring.servlet.multipart.max-file-size=500MB
spring.servlet.multipart.max-request-size=500MB
# actuator
management.server.port=8083

View File

@ -57,10 +57,10 @@
this.parameter.files.push(file);
},
uploadValidate(file) {
// if (file.size / 1024 / 1024 > 20) {
// this.$warning(this.$t('test_track.case.import.upload_limit_size'));
// return false;
// }
if (file.size / 1024 / 1024 > 500) {
this.$warning(this.$t('api_test.request.body_upload_limit_size'));
return false;
}
return true;
},
},

View File

@ -327,26 +327,28 @@ export class HttpRequest extends Request {
}
isValid(environmentId) {
if (this.useEnvironment) {
if (!environmentId) {
return {
isValid: false,
info: 'api_test.request.please_configure_environment_in_scenario'
if (this.enable) {
if (this.useEnvironment) {
if (!environmentId) {
return {
isValid: false,
info: 'api_test.request.please_configure_environment_in_scenario'
}
}
}
} else {
if (!this.url) {
return {
isValid: false,
info: 'api_test.request.input_url'
} else {
if (!this.url) {
return {
isValid: false,
info: 'api_test.request.input_url'
}
}
}
try {
new URL(this.url)
} catch (e) {
return {
isValid: false,
info: 'api_test.request.url_invalid'
try {
new URL(this.url)
} catch (e) {
return {
isValid: false,
info: 'api_test.request.url_invalid'
}
}
}
}
@ -395,28 +397,30 @@ export class DubboRequest extends Request {
}
isValid() {
if (!this.interface) {
return {
isValid: false,
info: 'api_test.request.dubbo.input_interface'
if (this.enable) {
if (!this.interface) {
return {
isValid: false,
info: 'api_test.request.dubbo.input_interface'
}
}
}
if (!this.method) {
return {
isValid: false,
info: 'api_test.request.dubbo.input_method'
if (!this.method) {
return {
isValid: false,
info: 'api_test.request.dubbo.input_method'
}
}
}
if (!this.registryCenter.isValid()) {
return {
isValid: false,
info: 'api_test.request.dubbo.input_registry_center'
if (!this.registryCenter.isValid()) {
return {
isValid: false,
info: 'api_test.request.dubbo.input_registry_center'
}
}
}
if (!this.consumerAndService.isValid()) {
return {
isValid: false,
info: 'api_test.request.dubbo.input_consumer_service'
if (!this.consumerAndService.isValid()) {
return {
isValid: false,
info: 'api_test.request.dubbo.input_consumer_service'
}
}
}
return {

View File

@ -443,6 +443,7 @@ export default {
timeout_config: "Timeout Config",
connect_timeout: "Connect Timeout",
response_timeout: "Response Timeout",
body_upload_limit_size: "The file size does not exceed 500 MB",
assertions: {
label: "Assertion",
text: "Text",

View File

@ -444,6 +444,7 @@ export default {
timeout_config: "超时设置",
connect_timeout: "连接超时",
response_timeout: "响应超时",
body_upload_limit_size: "上传文件大小不能超过 500 MB!",
assertions: {
label: "断言",
text: "文本",

View File

@ -443,6 +443,7 @@ export default {
timeout_config: "超時設置",
connect_timeout: "連接超時",
response_timeout: "響應超時",
body_upload_limit_size: "上傳文件大小不能超過 500 MB!",
assertions: {
label: "斷言",
text: "文字",