test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(统计报表): #1006784 #1006780 #1006758 全局认证不生效、用例不统计回收站的数据、用户查询条件展示所有用户 

【【环境配置】全局环境认证配置没有生效】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
This commit is contained in:
song-tianyang 2021-09-22 11:21:30 +08:00 committed by 刘瑞斌
parent bccdc59fd2
commit 991e87f03a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
View File

@ -348,11 +348,11 @@ public class MsHTTPSamplerProxy extends MsTestElement {
EnvironmentConfig environmentConfig = config.getConfig().get(this.getProjectId()); EnvironmentConfig environmentConfig = config.getConfig().get(this.getProjectId());
if (environmentConfig != null) { if (environmentConfig != null) {
String useEvnId = environmentConfig.getApiEnvironmentid(); 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 { try {
JSONArray jsonArray = environmentConfig.getAuthManager().getJSONArray("hashTree"); JSONObject authObject = environmentConfig.getAuthManager().getJSONObject("authManager");
if (jsonArray.size() > 0) { if (authObject != null) {
this.authManager = jsonArray.getJSONObject(0).toJavaObject(MsAuthManager.class); this.authManager = authObject.toJavaObject(MsAuthManager.class);
} }
} catch (Exception e) { } catch (Exception e) {
} }

2
backend/src/main/java/io/metersphere/xpack

@ -1 +1 @@
Subproject commit 2af1cbcd9b816092ec66c3df7f4ac43da402aa30 Subproject commit fd37bcf9408177e13747cd0cf4f03781bb35d97b