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

refactor(接口测试): 禁用本地执行授权校验优化

This commit is contained in:
fit2-zhao 2022-11-17 15:23:07 +08:00
parent 4ecbef00df
commit 64cb68e213
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/metersphere/api/exec/ApiPoolDebugService.java
View File

@ -1,7 +1,10 @@
package io.metersphere.api.exec;
import io.metersphere.dto.JmeterRunRequestDTO;
import io.metersphere.dto.RunModeConfigDTO;
public interface ApiPoolDebugService {
public void run(JmeterRunRequestDTO request);
public void verifyPool(String projectId, RunModeConfigDTO runConfig);
}

30
backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java
View File

@ -9,19 +9,19 @@ import io.metersphere.api.jmeter.utils.SmoothWeighted;
import io.metersphere.api.service.RemakeReportService;
import io.metersphere.commons.constants.ApiRunMode;
import io.metersphere.commons.constants.ExtendedParameter;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.CommonBeanFactory;
import io.metersphere.config.JmeterProperties;
import io.metersphere.config.KafkaConfig;
import io.metersphere.constants.BackendListenerConstants;
import io.metersphere.constants.RunModeConstants;
import io.metersphere.dto.*;
import io.metersphere.dto.JmeterRunRequestDTO;
import io.metersphere.dto.JvmInfoDTO;
import io.metersphere.dto.NodeDTO;
import io.metersphere.dto.RunModeConfigDTO;
import io.metersphere.jmeter.JMeterBase;
import io.metersphere.jmeter.LocalRunner;
import io.metersphere.performance.engine.Engine;
import io.metersphere.performance.engine.EngineFactory;
import io.metersphere.service.ProjectApplicationService;
import io.metersphere.service.SystemParameterService;
import io.metersphere.utils.LoggerUtil;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
@ -46,7 +46,6 @@ import java.util.List;
@Service
public class JMeterService {
public static final String BASE_URL = "http://%s:%d";
public static final String POOL = "POOL";
@Resource
private JmeterProperties jmeterProperties;
@ -55,11 +54,6 @@ public class JMeterService {
@Resource
private RedisTemplate<String, Object> redisTemplate;
@Resource
private SystemParameterService systemParameterService;
@Resource
private ProjectApplicationService projectApplicationService;
@Resource
private ExecThreadPoolExecutor execThreadPoolExecutor;
@Resource
private RemakeReportService remakeReportService;
@ -242,18 +236,10 @@ public class JMeterService {
}
}
public void verifyPool(String projectId, RunModeConfigDTO runConfig) {
// 检查是否禁用了本地执行
if (runConfig != null && StringUtils.isNotBlank(projectId) && StringUtils.isEmpty(runConfig.getResourcePoolId())) {
BaseSystemConfigDTO configDTO = systemParameterService.getBaseInfo();
if (StringUtils.equals(configDTO.getRunMode(), POOL)) {
ProjectConfig config = projectApplicationService.getProjectConfig(projectId);
if (config == null || !config.getPoolEnable() || StringUtils.isEmpty(config.getResourcePoolId())) {
MSException.throwException("请在【项目设置-应用管理-接口测试】中选择资源池");
}
runConfig = runConfig == null ? new RunModeConfigDTO() : runConfig;
runConfig.setResourcePoolId(config.getResourcePoolId());
}
public void verifyPool(String projectId, RunModeConfigDTO runModeConfigDTO) {
ApiPoolDebugService debugService = CommonBeanFactory.getBean(ApiPoolDebugService.class);
if (debugService != null) {
debugService.verifyPool(projectId, runModeConfigDTO);
}
}
}