From f22bc7260281e40ca56ccc1ebc021434a674d524 Mon Sep 17 00:00:00 2001 From: wenyann <64353056+wenyann@users.noreply.github.com> Date: Sat, 29 Aug 2020 12:00:33 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=AD=97=E7=AC=A6=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/track/case/components/TestCaseEdit.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue index 6a289f5443..e43b8a8e06 100644 --- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue +++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue @@ -269,8 +269,8 @@ export default { type: [{required: true, message: this.$t('test_track.case.input_type'), trigger: 'change'}], testId: [{required: true, message: this.$t('commons.please_select'), trigger: 'change'}], method: [{required: true, message: this.$t('test_track.case.input_method'), trigger: 'change'}], - prerequisite: [{max: 300, message: this.$t('test_track.length_less_than') + '300', trigger: 'blur'}], - remark: [{max: 300, message: this.$t('test_track.length_less_than') + '300', trigger: 'blur'}] + prerequisite: [{max: 500, message: this.$t('test_track.length_less_than') + '500', trigger: 'blur'}], + remark: [{max: 500, message: this.$t('test_track.length_less_than') + '500', trigger: 'blur'}] }, formLabelWidth: "120px", operationType: '', From e851aa2311f5a9daa6595c0b5deb6ec1cbfc8463 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Mon, 31 Aug 2020 12:36:53 +0800 Subject: [PATCH 2/5] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=20jmeter=20h?= =?UTF-8?q?eap=E9=85=8D=E7=BD=AE=EF=BC=8C=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=9C=A8node-controller=E4=B8=AD=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/jmeter-master/run-test.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/jmeter-master/run-test.sh b/docker/jmeter-master/run-test.sh index 54c94d91a9..98b1a02e7e 100644 --- a/docker/jmeter-master/run-test.sh +++ b/docker/jmeter-master/run-test.sh @@ -1,4 +1,3 @@ -export HEAP=$(cat /proc/meminfo | grep MemTotal | awk '{ mem=int($2/1024/1024 * 3/4 + 0.5); metasize=int(mem/4+0.5)"g"; if(mem<1) mem=1; if (metasize == "0g") metasize="256m"; HEAP="-Xms"mem"g -Xmx"mem"g -XX:MaxMetaspaceSize="metasize; print HEAP }') for file in ${TESTS_DIR}/*.jmx; do jmeter -n -t ${file} -Jserver.rmi.ssl.disable=${SSL_DISABLED} done From 336020322da4c90054b9e7bdfb435c98062d837b Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Mon, 31 Aug 2020 14:06:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?refactor:=20track=20home=20=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/track/home/TrackHome.vue | 47 ++++++++++--------- .../home/components/HomeBaseComponent.vue | 30 +++++------- 2 files changed, 35 insertions(+), 42 deletions(-) diff --git a/frontend/src/business/components/track/home/TrackHome.vue b/frontend/src/business/components/track/home/TrackHome.vue index 80254f5488..3a01d6b921 100644 --- a/frontend/src/business/components/track/home/TrackHome.vue +++ b/frontend/src/business/components/track/home/TrackHome.vue @@ -1,7 +1,7 @@ diff --git a/frontend/src/business/components/track/home/components/HomeBaseComponent.vue b/frontend/src/business/components/track/home/components/HomeBaseComponent.vue index 508f44bb01..5bb8f5f5c1 100644 --- a/frontend/src/business/components/track/home/components/HomeBaseComponent.vue +++ b/frontend/src/business/components/track/home/components/HomeBaseComponent.vue @@ -1,8 +1,8 @@ From 63fc4c0f1eebb6671097030d2f12758affb1f8a9 Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Mon, 31 Aug 2020 15:15:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?refactor:=20=E4=BF=9D=E5=AD=98jira=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E4=BF=A1=E6=81=AF=E6=97=B6=E8=A1=A5=E5=85=A8=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/IssuesManagement.vue | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/frontend/src/business/components/settings/organization/IssuesManagement.vue b/frontend/src/business/components/settings/organization/IssuesManagement.vue index b92784626b..86b10cf319 100644 --- a/frontend/src/business/components/settings/organization/IssuesManagement.vue +++ b/frontend/src/business/components/settings/organization/IssuesManagement.vue @@ -161,18 +161,26 @@ this.$warning(this.$t('organization.integration.choose_platform')); return; } - let param = {}; - let auth = { - account: this.form.account, - password: this.form.password, - url: this.form.url, - issuetype: this.form.issuetype - }; - param.organizationId = getCurrentUser().lastOrganizationId; - param.platform = this.platform; - param.configuration = JSON.stringify(auth); + this.$refs[form].validate(valid => { if (valid) { + + let formatUrl = this.form.url; + if (!formatUrl.endsWith('/')) { + formatUrl = formatUrl + '/'; + } + + let param = {}; + let auth = { + account: this.form.account, + password: this.form.password, + url: formatUrl, + issuetype: this.form.issuetype + }; + param.organizationId = getCurrentUser().lastOrganizationId; + param.platform = this.platform; + param.configuration = JSON.stringify(auth); + this.result = this.$post("service/integration/save", param, () => { this.show = true; this.showEdit = true; From 708c3deb1a5250e3db63869730937d24912ccd80 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Mon, 31 Aug 2020 17:06:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?refactor:=20=E9=A1=B5=E9=9D=A2=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/api/report/ApiReportView.vue | 2 +- .../components/api/test/ApiTestConfig.vue | 2 +- .../view/comonents/test/ApiTestDetail.vue | 32 ++++++++--------- .../view/comonents/test/ApiTestResult.vue | 36 +++++++++---------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/frontend/src/business/components/api/report/ApiReportView.vue b/frontend/src/business/components/api/report/ApiReportView.vue index 946200126d..9827f371b9 100644 --- a/frontend/src/business/components/api/report/ApiReportView.vue +++ b/frontend/src/business/components/api/report/ApiReportView.vue @@ -171,7 +171,7 @@ export default {