From 126430b18f3d45d2948b1ec2618ed1f9c466c8cb Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Tue, 22 Dec 2020 16:31:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E6=98=BE=E7=A4=BAavgTransactio?= =?UTF-8?q?ns?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/metersphere/performance/base/TestOverview.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/metersphere/performance/base/TestOverview.java b/backend/src/main/java/io/metersphere/performance/base/TestOverview.java index 2cdc238888..1f67a0e1b1 100644 --- a/backend/src/main/java/io/metersphere/performance/base/TestOverview.java +++ b/backend/src/main/java/io/metersphere/performance/base/TestOverview.java @@ -11,5 +11,5 @@ public class TestOverview { private String avgResponseTime; private String responseTime90; private String avgBandwidth; - + private String avgTransactions; } From 58a52520b1b405f3fdca131c40607dccbac314d1 Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Tue, 22 Dec 2020 16:34:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DLDAP=E7=99=BB?= =?UTF-8?q?=E5=85=A5=E8=AF=B7=E6=B1=82=E9=87=8D=E5=AE=9A=E5=90=91=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/common/js/ajax.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/common/js/ajax.js b/frontend/src/common/js/ajax.js index e8c3e7f929..6fa1566545 100644 --- a/frontend/src/common/js/ajax.js +++ b/frontend/src/common/js/ajax.js @@ -7,7 +7,7 @@ export default { install(Vue) { // 登入请求不重定向 - let unRedirectUrls = new Set(['signin']); + let unRedirectUrls = new Set(['signin','ldap/signin']); if (!axios) { window.console.error('You have to install axios');