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

fix(接口定义): 修复Basic Auth 认证问题

This commit is contained in:
fit2-zhao 2021-03-04 16:52:09 +08:00
parent 18d6322636
commit eb416c3ef1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,8 +84,7 @@ public class MsAuthManager extends MsTestElement {
authManager.setProperty(TestElement.TEST_CLASS, AuthManager.class.getName()); authManager.setProperty(TestElement.TEST_CLASS, AuthManager.class.getName());
authManager.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("AuthPanel")); authManager.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("AuthPanel"));
Authorization auth = new Authorization(); Authorization auth = new Authorization();
auth.setURL(samplerProxy.getUrl().toString()); auth.setURL(samplerProxy.getProtocol() + "://" + samplerProxy.getDomain());
auth.setDomain(samplerProxy.getDomain());
auth.setUser(msAuthManager.getUsername()); auth.setUser(msAuthManager.getUsername());
auth.setPass(msAuthManager.getPassword()); auth.setPass(msAuthManager.getPassword());
auth.setMechanism(AuthManager.Mechanism.DIGEST); auth.setMechanism(AuthManager.Mechanism.DIGEST);

4
backend/src/main/java/io/metersphere/commons/utils/DateUtils.java
View File

@ -45,6 +45,10 @@ public class DateUtils {
SimpleDateFormat dateFormat = new SimpleDateFormat(TIME_PATTERN); SimpleDateFormat dateFormat = new SimpleDateFormat(TIME_PATTERN);
return dateFormat.format(timeStamp); return dateFormat.format(timeStamp);
} }
public static String getDataStr(long timeStamp) {
SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_PATTERM);
return dateFormat.format(timeStamp);
}
public static Date dateSum (Date date,int countDays){ public static Date dateSum (Date date,int countDays){