From 991e87f03afe048f2855296a1c890abd39663d7f Mon Sep 17 00:00:00 2001 From: song-tianyang Date: Wed, 22 Sep 2021 11:21:30 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8):=20#1?= =?UTF-8?q?006784=20=20#1006780=20#1006758=20=E5=85=A8=E5=B1=80=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E4=B8=8D=E7=94=9F=E6=95=88=E3=80=81=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E4=B8=8D=E7=BB=9F=E8=AE=A1=E5=9B=9E=E6=94=B6=E7=AB=99=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=81=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=B1=95=E7=A4=BA=E6=89=80=E6=9C=89=E7=94=A8?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【【环境配置】全局环境认证配置没有生效】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001006758；【【报表统计】用例统计，按状态查询问题】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001006784；【【报表统计】-测试用例统计-更多选项中创建人或维护人可选列表和实际统计报表不一致】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001006780 --- .../definition/request/sampler/MsHTTPSamplerProxy.java | 8 ++++---- backend/src/main/java/io/metersphere/xpack | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java index 6dfc8bab59..eab7235cc7 100644 --- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java +++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java @@ -348,11 +348,11 @@ public class MsHTTPSamplerProxy extends MsTestElement { EnvironmentConfig environmentConfig = config.getConfig().get(this.getProjectId()); if (environmentConfig != null) { String useEvnId = environmentConfig.getApiEnvironmentid(); - if (this.authManager == null && environmentConfig.getAuthManager() != null && environmentConfig.getAuthManager().containsKey("hashTree")) { + if (this.authManager == null && environmentConfig.getAuthManager() != null && environmentConfig.getAuthManager().containsKey("authManager")) { try { - JSONArray jsonArray = environmentConfig.getAuthManager().getJSONArray("hashTree"); - if (jsonArray.size() > 0) { - this.authManager = jsonArray.getJSONObject(0).toJavaObject(MsAuthManager.class); + JSONObject authObject = environmentConfig.getAuthManager().getJSONObject("authManager"); + if (authObject != null) { + this.authManager = authObject.toJavaObject(MsAuthManager.class); } } catch (Exception e) { } diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index 2af1cbcd9b..fd37bcf940 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit 2af1cbcd9b816092ec66c3df7f4ac43da402aa30 +Subproject commit fd37bcf9408177e13747cd0cf4f03781bb35d97b