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