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

Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4

This commit is contained in:
chenjianxing 2020-11-02 14:36:14 +08:00
parent 917b3adc58 d5f231bf32
commit 6123a07787
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/ldap/service/LdapService.java
View File

@ -147,7 +147,7 @@ public class LdapService {
String credentials = EncryptUtils.aesDecrypt(password).toString(); String credentials = EncryptUtils.aesDecrypt(password).toString();
LdapContextSource sourceLdapCtx; LdapContextSource sourceLdapCtx;
if (StringUtils.startsWith(url, "ldaps://")) { if (StringUtils.startsWithIgnoreCase(url, "ldaps://")) {
sourceLdapCtx = new SSLLdapContextSource(); sourceLdapCtx = new SSLLdapContextSource();
// todo 这里加上strategy 会报错 // todo 这里加上strategy 会报错
// DefaultTlsDirContextAuthenticationStrategy strategy = new DefaultTlsDirContextAuthenticationStrategy(); // DefaultTlsDirContextAuthenticationStrategy strategy = new DefaultTlsDirContextAuthenticationStrategy();

14
backend/src/main/java/io/metersphere/performance/notice/PerformanceNoticeTask.java
View File

@ -1,6 +1,7 @@
package io.metersphere.performance.notice; package io.metersphere.performance.notice;
import io.metersphere.base.domain.LoadTestReportWithBLOBs; import io.metersphere.base.domain.LoadTestReportWithBLOBs;
import io.metersphere.base.mapper.LoadTestReportMapper;
import io.metersphere.commons.constants.NoticeConstants; import io.metersphere.commons.constants.NoticeConstants;
import io.metersphere.commons.constants.PerformanceTestStatus; import io.metersphere.commons.constants.PerformanceTestStatus;
import io.metersphere.commons.utils.LogUtil; import io.metersphere.commons.utils.LogUtil;
@ -34,6 +35,9 @@ public class PerformanceNoticeTask {
private MailService mailService; private MailService mailService;
@Resource @Resource
private SystemParameterService systemParameterService; private SystemParameterService systemParameterService;
@Resource
private LoadTestReportMapper loadTestReportMapper;
private final ExecutorService executorService = Executors.newFixedThreadPool(20); private final ExecutorService executorService = Executors.newFixedThreadPool(20);
private boolean isRunning = true; private boolean isRunning = true;
@ -45,14 +49,16 @@ public class PerformanceNoticeTask {
public void registerNoticeTask(LoadTestReportWithBLOBs loadTestReport) { public void registerNoticeTask(LoadTestReportWithBLOBs loadTestReport) {
executorService.submit(() -> { executorService.submit(() -> {
while (isRunning) { while (isRunning) {
if (StringUtils.equals(loadTestReport.getStatus(), PerformanceTestStatus.Completed.name())) { LoadTestReportWithBLOBs loadTestReportFromDatabase = loadTestReportMapper.selectByPrimaryKey(loadTestReport.getId());
if (StringUtils.equals(loadTestReportFromDatabase.getStatus(), PerformanceTestStatus.Completed.name())) {
isRunning = false; isRunning = false;
sendSuccessNotice(loadTestReport); sendSuccessNotice(loadTestReportFromDatabase);
return; return;
} }
if (StringUtils.equals(loadTestReport.getStatus(), PerformanceTestStatus.Error.name())) { if (StringUtils.equals(loadTestReportFromDatabase.getStatus(), PerformanceTestStatus.Error.name())) {
isRunning = false; isRunning = false;
sendFailNotice(loadTestReport); sendFailNotice(loadTestReportFromDatabase);
return; return;
} }
try { try {