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

fix(接口定义): 新版本auth 完善

This commit is contained in:
fit2-zhao 2021-03-01 12:11:21 +08:00
parent d961a96081
commit a49eb5a416
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/metersphere/api/dto/definition/request/auth/MsAuthManager.java
View File

@ -71,9 +71,13 @@ public class MsAuthManager extends MsTestElement {
ApiTestEnvironmentWithBLOBs environmentWithBLOBs = environmentService.get(environment); ApiTestEnvironmentWithBLOBs environmentWithBLOBs = environmentService.get(environment);
EnvironmentConfig envConfig = JSONObject.parseObject(environmentWithBLOBs.getConfig(), EnvironmentConfig.class); EnvironmentConfig envConfig = JSONObject.parseObject(environmentWithBLOBs.getConfig(), EnvironmentConfig.class);
this.url = envConfig.getHttpConfig().getProtocol() + "://" + envConfig.getHttpConfig().getSocket(); this.url = envConfig.getHttpConfig().getProtocol() + "://" + envConfig.getHttpConfig().getSocket();
} else if (config != null && config.isEffective(this.getProjectId())) {
if (config.isEffective(this.getProjectId())) {
String url = config.getConfig().get(this.getProjectId()).getHttpConfig().getProtocol() + "://" + config.getConfig().get(this.getProjectId()).getHttpConfig().getSocket();
auth.setURL(url);
}
} }
} }
auth.setDomain(this.domain);
auth.setUser(this.username); auth.setUser(this.username);
auth.setPass(this.password); auth.setPass(this.password);
auth.setMechanism(AuthManager.Mechanism.DIGEST); auth.setMechanism(AuthManager.Mechanism.DIGEST);