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 quartz.scheduler-name=msServerJob
# file upload # file upload
spring.servlet.multipart.max-file-size=30MB spring.servlet.multipart.max-file-size=500MB
spring.servlet.multipart.max-request-size=30MB spring.servlet.multipart.max-request-size=500MB
# actuator # actuator
management.server.port=8083 management.server.port=8083

View File

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

View File

@ -327,6 +327,7 @@ export class HttpRequest extends Request {
} }
isValid(environmentId) { isValid(environmentId) {
if (this.enable) {
if (this.useEnvironment) { if (this.useEnvironment) {
if (!environmentId) { if (!environmentId) {
return { return {
@ -350,6 +351,7 @@ export class HttpRequest extends Request {
} }
} }
} }
}
return { return {
isValid: true isValid: true
} }
@ -395,6 +397,7 @@ export class DubboRequest extends Request {
} }
isValid() { isValid() {
if (this.enable) {
if (!this.interface) { if (!this.interface) {
return { return {
isValid: false, isValid: false,
@ -419,6 +422,7 @@ export class DubboRequest extends Request {
info: 'api_test.request.dubbo.input_consumer_service' info: 'api_test.request.dubbo.input_consumer_service'
} }
} }
}
return { return {
isValid: true isValid: true
} }

View File

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

View File

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

View File

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