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

build: 替换全部的UUID

This commit is contained in:
CaptainB 2023-09-05 15:55:10 +08:00 committed by 刘瑞斌
parent 52093c562f
commit cf6b28a133
17 changed files with 61 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/framework/sdk/src/main/java/io/metersphere/sdk/sechedule/BaseScheduleService.java
View File

@ -15,7 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
import io.metersphere.sdk.uid.UUID;
@Transactional(rollbackFor = Exception.class)
public class BaseScheduleService {

2
backend/framework/sdk/src/main/java/io/metersphere/sdk/service/BaseUserRolePermissionService.java
View File

@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import io.metersphere.sdk.uid.UUID;
import java.util.stream.Collectors;
/**

1
backend/framework/sdk/src/main/java/io/metersphere/sdk/service/BaseUserRoleService.java
View File

@ -4,6 +4,7 @@ import io.metersphere.sdk.dto.Permission;
import io.metersphere.sdk.dto.PermissionDefinitionItem;
import io.metersphere.sdk.dto.request.PermissionSettingUpdateRequest;
import io.metersphere.sdk.exception.MSException;
import io.metersphere.sdk.uid.UUID;
import io.metersphere.sdk.util.JSON;
import io.metersphere.sdk.util.PermissionCache;
import io.metersphere.sdk.util.ServiceUtils;

2
backend/framework/sdk/src/main/java/io/metersphere/sdk/service/TestResourcePoolService.java
View File

@ -28,7 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import io.metersphere.sdk.uid.UUID;
@Service
@Transactional

2
backend/framework/sdk/src/main/java/io/metersphere/sdk/service/UserKeyService.java
View File

@ -13,7 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.UUID;
import io.metersphere.sdk.uid.UUID;
@Service
@Transactional(rollbackFor = Exception.class)

9
backend/framework/sdk/src/test/java/TestTotp.java → backend/framework/sdk/src/test/java/io/metersphere/sdk/TotpTests.java
View File

@ -1,6 +1,7 @@
package io.metersphere.sdk;
import com.bastiaanjansen.otp.HMACAlgorithm;
import com.bastiaanjansen.otp.HOTPGenerator;
import com.bastiaanjansen.otp.SecretGenerator;
import com.bastiaanjansen.otp.TOTPGenerator;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
@ -8,14 +9,14 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import java.time.Duration;
import java.util.UUID;
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class TestTotp {
public class TotpTests {
public static String code;
// Generate a secret (or use your own secret)
// private static final byte[] secret = SecretGenerator.generate(256);
private static final byte[] secret = UUID.randomUUID().toString().getBytes();
private static final byte[] secret = "3c4a9b79-c45d-4d64-b5f4-ec7620ca3108".getBytes();
@Test
@Order(1)

22
backend/framework/sdk/src/test/java/io/metersphere/sdk/base/BaseTest.java
View File

@ -10,6 +10,7 @@ import io.metersphere.sdk.domain.OperationLogExample;
import io.metersphere.sdk.exception.MSException;
import io.metersphere.sdk.log.constants.OperationLogType;
import io.metersphere.sdk.mapper.OperationLogMapper;
import io.metersphere.sdk.uid.UUID;
import io.metersphere.sdk.util.JSON;
import io.metersphere.sdk.util.Pager;
import io.metersphere.system.domain.User;
@ -45,7 +46,10 @@ import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.util.*;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
@ -183,9 +187,10 @@ public abstract class BaseTest {
protected MvcResult requestMultipartWithOkAndReturn(String url, MultiValueMap<String, Object> paramMap, Object... uriVariables) throws Exception {
return this.requestMultipartWithOk(url, paramMap, uriVariables).andReturn();
}
private MockHttpServletRequestBuilder getPermissionMultipartRequestBuilder(String roleId, String url,
MultiValueMap<String, Object> paramMap,
Object[] uriVariables) {
MultiValueMap<String, Object> paramMap,
Object[] uriVariables) {
AuthInfo authInfo = getPermissionAuthInfo(roleId);
return getMultipartRequestBuilderWithParam(url, paramMap, uriVariables)
.header(SessionConstants.HEADER_TOKEN, authInfo.getSessionId())
@ -193,8 +198,8 @@ public abstract class BaseTest {
}
private MockHttpServletRequestBuilder getMultipartRequestBuilder(String url,
MultiValueMap<String, Object> paramMap,
Object[] uriVariables) {
MultiValueMap<String, Object> paramMap,
Object[] uriVariables) {
return getMultipartRequestBuilderWithParam(url, paramMap, uriVariables)
.header(SessionConstants.HEADER_TOKEN, adminAuthInfo.getSessionId())
.header(SessionConstants.CSRF_TOKEN, adminAuthInfo.getCsrfToken());
@ -202,6 +207,7 @@ public abstract class BaseTest {
/**
* 构建 multipart 带参数的请求
*
* @param url
* @param paramMap
* @param uriVariables
@ -406,10 +412,10 @@ public abstract class BaseTest {
}
/**
* 校验多个权限(同级别权限: 列如都是SYSTEM)
* 校验多个权限(同级别权限: 列如都是SYSTEM)
*
* @param permissionIds 多个权限
* @param url 请求url
* @param permissionIds 多个权限
* @param url 请求url
* @param requestBuilderGetFunc 请求构造器
* @throws Exception 请求抛出异常
*/

2
backend/services/api-test/src/test/java/io/metersphere/api/controller/PluginSubTypeTests.java
View File

@ -9,7 +9,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMock
import org.springframework.boot.test.context.SpringBootTest;
import java.util.LinkedList;
import java.util.UUID;
import io.metersphere.sdk.uid.UUID;
@SpringBootTest

2
backend/services/bug-management/src/test/java/io/metersphere/bug/controller/BugControllerTest.java
View File

@ -16,7 +16,7 @@ import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.MvcResult;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import java.util.UUID;
import io.metersphere.sdk.uid.UUID;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;

36
backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectMemberService.java
View File

@ -17,6 +17,7 @@ import io.metersphere.sdk.exception.MSException;
import io.metersphere.sdk.log.constants.OperationLogModule;
import io.metersphere.sdk.log.constants.OperationLogType;
import io.metersphere.sdk.log.service.OperationLogService;
import io.metersphere.sdk.uid.UUID;
import io.metersphere.sdk.util.BeanUtils;
import io.metersphere.sdk.util.JSON;
import io.metersphere.sdk.util.Translator;
@ -30,7 +31,10 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
@ -149,7 +153,7 @@ public class ProjectMemberService {
/**
* 添加成员(项目)
*
* @param request 请求参数
* @param request 请求参数
* @param currentUserId 当前用户ID
*/
public void addMember(ProjectMemberAddRequest request, String currentUserId) {
@ -159,7 +163,7 @@ public class ProjectMemberService {
/**
* 更新成员(项目)
*
* @param request 请求参数
* @param request 请求参数
* @param currentUserId 当前用户ID
*/
public void updateMember(ProjectMemberEditRequest request, String currentUserId) {
@ -213,7 +217,7 @@ public class ProjectMemberService {
* 移除成员(项目)
*
* @param projectId 项目ID
* @param userId 用户ID
* @param userId 用户ID
*/
public void removeMember(String projectId, String userId, String currentUserId) {
// 操作记录
@ -231,7 +235,8 @@ public class ProjectMemberService {
/**
* 批量添加成员至用户组(项目)
* @param request 请求参数
*
* @param request 请求参数
* @param currentUserId 当前用户ID
*/
public void addRole(ProjectMemberAddRequest request, String currentUserId) {
@ -242,10 +247,10 @@ public class ProjectMemberService {
/**
* 处理成员及用户组关系, 并生成操作记录
*
* @param request 请求参数
* @param request 请求参数
* @param currentUserId 创建人
* @param operationType 操作记录类型
* @param path 操作记录路径
* @param path 操作记录路径
*/
public void addMemberRole(ProjectMemberAddRequest request, String currentUserId, String operationType, String path) {
// 操作记录
@ -261,7 +266,7 @@ public class ProjectMemberService {
Collectors.groupingBy(UserRoleRelation::getUserId, Collectors.mapping(UserRoleRelation::getRoleId, Collectors.toList())));
// 比较用户组是否已经存在, 如果不存在则添加
List<UserRoleRelation> relations = new ArrayList<>();
request.getUserIds().forEach(userId ->{
request.getUserIds().forEach(userId -> {
AtomicBoolean isLog = new AtomicBoolean(false);
// 追加的用户组ID, 操作记录使用
List<String> roleIds = new ArrayList<>();
@ -304,6 +309,7 @@ public class ProjectMemberService {
/**
* 批量移除成员(项目)
*
* @param request 请求参数
*/
public void batchRemove(ProjectMemberBatchDeleteRequest request, String currentUserId) {
@ -326,6 +332,7 @@ public class ProjectMemberService {
/**
* 查看项目是否存在
*
* @param projectId 项目ID
*/
private Project checkProjectExist(String projectId) {
@ -338,6 +345,7 @@ public class ProjectMemberService {
/**
* 查看用户或用户组是否存在
*
* @param userId 用户ID
* @param roleId 用户组ID
* @return 是否存在
@ -351,13 +359,13 @@ public class ProjectMemberService {
/**
* 操作记录
*
* @param projectId 项目ID
* @param memberId 成员ID
* @param projectId 项目ID
* @param memberId 成员ID
* @param createUserId 创建用户
* @param type 操作类型
* @param path 路径
* @param method 请求方法
* @param logs 日志集合
* @param type 操作类型
* @param path 路径
* @param method 请求方法
* @param logs 日志集合
*/
private void setLog(String projectId, String memberId, String createUserId, String type, String path, String method, Object originalVal, Object modifiedVal, List<LogDTO> logs) {
Project project = projectMapper.selectByPrimaryKey(projectId);

2
backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectRobotService.java
View File

@ -16,7 +16,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.UUID;
import io.metersphere.sdk.uid.UUID;
@Service
@Transactional

3
backend/services/system-setting/src/test/java/io/metersphere/system/controller/GlobalUserRoleControllerTests.java
View File

@ -9,6 +9,7 @@ import io.metersphere.sdk.dto.request.UserRoleUpdateRequest;
import io.metersphere.sdk.log.constants.OperationLogType;
import io.metersphere.sdk.service.BaseUserRolePermissionService;
import io.metersphere.sdk.service.BaseUserRoleRelationService;
import io.metersphere.sdk.uid.UUID;
import io.metersphere.sdk.util.BeanUtils;
import io.metersphere.sdk.util.SessionUtils;
import io.metersphere.system.controller.param.PermissionSettingUpdateRequestDefinition;
@ -60,6 +61,7 @@ class GlobalUserRoleControllerTests extends BaseTest {
private UserMapper userMapper;
@Resource
private UserRoleRelationMapper userRoleRelationMapper;
@Override
protected String getBasePath() {
return BASE_PATH;
@ -355,7 +357,6 @@ class GlobalUserRoleControllerTests extends BaseTest {
/**
* 创建一个用户和只有一个用户组的
* 用于测试删除该用户组后，没有用户组的用户会默认添加系统成员用户组
*
*/
private UserRoleRelation prepareOneLimitTest(String userRoleId) {
// 插入一条用户数据

2
backend/services/system-setting/src/test/java/io/metersphere/system/controller/GlobalUserRoleRelationControllerTests.java
View File

@ -31,7 +31,7 @@ import org.springframework.test.web.servlet.MvcResult;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import io.metersphere.sdk.uid.UUID;
import java.util.stream.Collectors;
import static io.metersphere.sdk.constants.InternalUserRole.ADMIN;

11
backend/services/system-setting/src/test/java/io/metersphere/system/controller/user/UserControllerTests.java
View File

@ -6,6 +6,7 @@ import io.metersphere.sdk.base.BaseTest;
import io.metersphere.sdk.controller.handler.ResultHolder;
import io.metersphere.sdk.dto.*;
import io.metersphere.sdk.log.constants.OperationLogType;
import io.metersphere.sdk.uid.UUID;
import io.metersphere.sdk.util.BeanUtils;
import io.metersphere.sdk.util.CodingUtil;
import io.metersphere.sdk.util.JSON;
@ -996,11 +997,11 @@ public class UserControllerTests extends BaseTest {
//删除USER_LIST用户
TableBatchProcessDTO request = new TableBatchProcessDTO();
request.setSelectIds(USER_LIST.stream().map(UserCreateInfo::getId).toList());
TableBatchProcessResponse response = userRequestUtils.parseObjectFromMvcResult(
userRequestUtils.responsePost(UserRequestUtils.URL_USER_DELETE, request), TableBatchProcessResponse.class);
Assertions.assertEquals(request.getSelectIds().size(), response.getTotalCount());
Assertions.assertEquals(request.getSelectIds().size(), response.getSuccessCount());
//检查数据库
TableBatchProcessResponse response = userRequestUtils.parseObjectFromMvcResult(
userRequestUtils.responsePost(UserRequestUtils.URL_USER_DELETE, request), TableBatchProcessResponse.class);
Assertions.assertEquals(request.getSelectIds().size(), response.getTotalCount());
Assertions.assertEquals(request.getSelectIds().size(), response.getSuccessCount());
//检查数据库
List<UserCreateInfo> removeList = new ArrayList<>();
for (UserCreateInfo deleteUser : USER_LIST) {
User user = userMapper.selectByPrimaryKey(deleteUser.getId());

2
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanService.java
View File

@ -20,7 +20,7 @@ import org.springframework.validation.annotation.Validated;
import jakarta.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import io.metersphere.sdk.uid.UUID;
@Service
@Transactional(rollbackFor = Exception.class)

2
backend/services/test-plan/src/test/java/io/metersphere/plan/controller/TestPlanApiCaseControllerTests.java
View File

@ -20,7 +20,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
import java.util.UUID;
import io.metersphere.sdk.uid.UUID;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

2
backend/services/test-plan/src/test/java/io/metersphere/plan/controller/TestPlanControllerTests.java
View File

@ -19,7 +19,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import io.metersphere.sdk.uid.UUID;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;