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

refactor(系统设置): 禁用本地调试后给项目初始化一个默认资源池 

【【接口测试】接口测试禁用本地执行之后，执行接口测试未自动选择可用资源池】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001025470

Signed-off-by: fit2-zhao <yong.zhao@fit2cloud.com>
This commit is contained in:
fit2-zhao 2023-04-17 20:06:05 +08:00 committed by fit2-zhao
parent ca49ed59ef
commit 76f078e12d
5 changed files with 113 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseProjectMapper.java
View File

@ -51,4 +51,6 @@ public interface BaseProjectMapper {
List<String> getThirdPartProjectIds();
Project selectOne();
List<String> selectPage(long pageNum, long pageSize);
}

4
framework/sdk-parent/sdk/src/main/java/io/metersphere/base/mapper/ext/BaseProjectMapper.xml
View File

@ -438,4 +438,8 @@
<select id="selectOne" resultType="io.metersphere.base.domain.Project">
SELECT * FROM project LIMIT 1
</select>
<select id="selectPage" resultType="java.lang.String">
SELECT id FROM project LIMIT #{pageNum}, #{pageSize}
</select>
</mapper>

20
framework/sdk-parent/sdk/src/main/java/io/metersphere/service/BaseProjectApplicationService.java
View File

@ -15,17 +15,15 @@ import io.metersphere.log.utils.ReflexObjectUtil;
import io.metersphere.log.vo.DetailColumn;
import io.metersphere.log.vo.OperatingLogDetails;
import io.metersphere.log.vo.system.SystemReference;
import jakarta.annotation.Resource;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import jakarta.annotation.Resource;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
@Service
@ -192,4 +190,16 @@ public class BaseProjectApplicationService {
return projectApplications.size() > 0;
}
public List<String> getProjectIds(List<String> projectIds) {
if(CollectionUtils.isEmpty(projectIds)){
return new ArrayList<>();
}
ProjectApplicationExample example = new ProjectApplicationExample();
example.createCriteria()
.andProjectIdIn(projectIds)
.andTypeEqualTo(ProjectApplicationType.POOL_ENABLE.name());
List<ProjectApplication> projectApplications = projectApplicationMapper.selectByExample(example);
return projectApplications.stream().map(ProjectApplication::getProjectId).collect(Collectors.toList());
}
}

9
framework/sdk-parent/sdk/src/main/java/io/metersphere/service/BaseProjectService.java
View File

@ -31,6 +31,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import jakarta.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@ -378,4 +379,12 @@ public class BaseProjectService {
public Project selectOne() {
return baseProjectMapper.selectOne();
}
public long count() {
return projectMapper.countByExample(new ProjectExample());
}
public List<String> getPage(long pageNum, long pageSize) {
return baseProjectMapper.selectPage(pageNum, pageSize);
}
}

86
framework/sdk-parent/sdk/src/main/java/io/metersphere/service/SystemParameterService.java
View File

@ -1,17 +1,18 @@
package io.metersphere.service;
import io.metersphere.base.domain.*;
import io.metersphere.base.mapper.SystemHeaderMapper;
import io.metersphere.base.mapper.SystemParameterMapper;
import io.metersphere.base.mapper.UserHeaderMapper;
import io.metersphere.base.mapper.*;
import io.metersphere.base.mapper.ext.BaseSystemParameterMapper;
import io.metersphere.commons.constants.MicroServiceName;
import io.metersphere.commons.constants.ParamConstants;
import io.metersphere.commons.constants.ProjectApplicationType;
import io.metersphere.commons.constants.ResourceStatusEnum;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.EncryptUtils;
import io.metersphere.commons.utils.JSON;
import io.metersphere.commons.utils.LogUtil;
import io.metersphere.dto.BaseSystemConfigDTO;
import io.metersphere.dto.TestResourcePoolDTO;
import io.metersphere.environment.service.BaseEnvironmentService;
import io.metersphere.i18n.Translator;
import io.metersphere.ldap.domain.LdapInfo;
@ -24,10 +25,15 @@ import io.metersphere.notice.domain.Receiver;
import io.metersphere.notice.sender.NoticeModel;
import io.metersphere.notice.sender.impl.MailNoticeSender;
import io.metersphere.request.HeaderRequest;
import io.metersphere.request.resourcepool.QueryResourcePoolRequest;
import jakarta.annotation.Resource;
import jakarta.mail.MessagingException;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.session.ExecutorType;
import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionUtils;
import org.springframework.mail.javamail.JavaMailSenderImpl;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -36,6 +42,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
@Service
@ -55,6 +62,15 @@ public class SystemParameterService {
private BaseEnvironmentService baseEnvironmentService;
@Resource
private MicroService microService;
@Resource
private BaseTestResourcePoolService baseTestResourcePoolService;
@Resource
private BaseProjectService baseProjectService;
@Resource
private BaseProjectApplicationService baseProjectApplicationService;
@Resource
private SqlSessionFactory sqlSessionFactory;
public String searchEmail() {
return baseSystemParameterMapper.email();
@ -245,6 +261,62 @@ public class SystemParameterService {
return baseSystemConfigDTO;
}
public TestResourcePoolDTO getTestResourcePool() {
QueryResourcePoolRequest resourcePoolRequest = new QueryResourcePoolRequest();
resourcePoolRequest.setStatus(ResourceStatusEnum.VALID.name());
List<TestResourcePoolDTO> poolDTOS = baseTestResourcePoolService.listResourcePools(resourcePoolRequest);
if (CollectionUtils.isNotEmpty(poolDTOS)) {
List<TestResourcePoolDTO> localPools = poolDTOS.stream().filter(item ->
StringUtils.equals(item.getName(), "LOCAL")).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(localPools)) {
return localPools.get(0);
} else {
return poolDTOS.get(0);
}
}
return null;
}
public void saveProjectApplication(List<String> projectIds, String poolId, ProjectApplicationMapper batchMapper) {
if (CollectionUtils.isNotEmpty(projectIds)) {
List<String> appProjectIds = baseProjectApplicationService.getProjectIds(projectIds);
projectIds.removeAll(appProjectIds);
// 添加
projectIds.forEach(item -> {
ProjectApplication application = new ProjectApplication();
application.setProjectId(item);
application.setType(ProjectApplicationType.POOL_ENABLE.name());
application.setTypeValue(String.valueOf(true));
batchMapper.insert(application);
ProjectApplication applicationValue = new ProjectApplication();
applicationValue.setProjectId(item);
applicationValue.setType(ProjectApplicationType.RESOURCE_POOL_ID.name());
applicationValue.setTypeValue(poolId);
batchMapper.insert(applicationValue);
});
}
}
public void saveProjectApp(String poolId, long size) {
SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
ProjectApplicationMapper batchMapper = sqlSession.getMapper(ProjectApplicationMapper.class);
final long pageSize = 500;
long pageTotal = size / pageSize;
pageTotal = pageTotal > 0 ? pageTotal : 1;
for (int i = 0; i < pageTotal; i++) {
long pageNum = i * pageSize;
List<String> projectIds = baseProjectService.getPage(pageNum, pageSize);
if (CollectionUtils.isNotEmpty(projectIds)) {
saveProjectApplication(projectIds, poolId, batchMapper);
}
}
sqlSession.flushStatements();
if (sqlSession != null && sqlSessionFactory != null) {
SqlSessionUtils.closeSqlSession(sqlSession, sqlSessionFactory);
}
}
public void saveBaseInfo(List<SystemParameter> parameters) {
SystemParameterExample example = new SystemParameterExample();
@ -262,6 +334,14 @@ public class SystemParameterService {
}
}
}
// 启用资源池
if (param.getParamKey().equals("base.run.mode") && param.getParamValue().equals("POOL")) {
TestResourcePoolDTO poolDTO = getTestResourcePool();
if (poolDTO != null) {
long size = baseProjectService.count();
saveProjectApp(poolDTO.getId(), size);
}
}
// 去掉路径最后的 /
param.setParamValue(StringUtils.removeEnd(param.getParamValue(), "/"));
if (StringUtils.equals(param.getParamKey(), "base.url")) {