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

fix(系统设置): 修改系统日志操作对象key

This commit is contained in:
AgAngle 2024-02-23 21:22:39 +08:00 committed by Craftsman
parent 18ac2c019d
commit c8fd930be2
25 changed files with 242 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/services/api-test/src/main/java/io/metersphere/api/service/CleanupApiResourceServiceImpl.java
View File

@ -156,7 +156,7 @@ public class CleanupApiResourceServiceImpl implements CleanupProjectResourceServ
//删除文件
String scenarioDir = DefaultRepositoryDir.getApiDebugDir(scenario.getProjectId(), scenario.getId());
try {
apiFileResourceService.deleteByResourceId(scenarioDir, scenario.getId(), scenario.getProjectId(), operator, OperationLogModule.API_DEBUG);
apiFileResourceService.deleteByResourceId(scenarioDir, scenario.getId(), scenario.getProjectId(), operator, OperationLogModule.API_TEST_DEBUG_MANAGEMENT_DEBUG);
} catch (Exception ignore) {
}
@ -233,7 +233,7 @@ public class CleanupApiResourceServiceImpl implements CleanupProjectResourceServ
deleteCaseFollows(ids);
ids.forEach(id -> {
String apiCaseDir = DefaultRepositoryDir.getApiCaseDir(projectId, id);
apiFileResourceService.deleteByResourceId(apiCaseDir, id, projectId, OperationLogConstants.SYSTEM, OperationLogModule.API_DEFINITION_CASE);
apiFileResourceService.deleteByResourceId(apiCaseDir, id, projectId, OperationLogConstants.SYSTEM, OperationLogModule.API_TEST_MANAGEMENT_CASE);
});
ApiTestCaseExample example = new ApiTestCaseExample();
example.createCriteria().andIdIn(ids);
@ -246,7 +246,7 @@ public class CleanupApiResourceServiceImpl implements CleanupProjectResourceServ
private void deleteMock(List<String> ids, String projectId) {
ids.forEach(id -> {
String apiCaseDir = DefaultRepositoryDir.getApiDefinitionDir(projectId, id);
apiFileResourceService.deleteByResourceId(apiCaseDir, id, projectId, OperationLogConstants.SYSTEM, OperationLogModule.API_DEFINITION_CASE);
apiFileResourceService.deleteByResourceId(apiCaseDir, id, projectId, OperationLogConstants.SYSTEM, OperationLogModule.API_TEST_MANAGEMENT_CASE);
});
ApiDefinitionMockConfigExample configExample = new ApiDefinitionMockConfigExample();
configExample.createCriteria().andIdIn(ids);
@ -260,7 +260,7 @@ public class CleanupApiResourceServiceImpl implements CleanupProjectResourceServ
deleteApiFollows(ids);
ids.forEach(id -> {
String apiDefinitionDir = DefaultRepositoryDir.getApiDefinitionDir(projectId, id);
apiFileResourceService.deleteByResourceId(apiDefinitionDir, id, projectId, OperationLogConstants.SYSTEM, OperationLogModule.API_DEFINITION);
apiFileResourceService.deleteByResourceId(apiDefinitionDir, id, projectId, OperationLogConstants.SYSTEM, OperationLogModule.API_TEST_MANAGEMENT_DEFINITION);
});
ApiDefinitionExample example = new ApiDefinitionExample();
example.createCriteria().andIdIn(ids);

8
backend/services/api-test/src/main/java/io/metersphere/api/service/debug/ApiDebugLogService.java
View File

@ -30,7 +30,7 @@ public class ApiDebugLogService {
null,
null,
OperationLogType.ADD.name(),
OperationLogModule.API_DEBUG,
OperationLogModule.API_TEST_DEBUG_MANAGEMENT_DEBUG,
request.getName());
dto.setOriginalValue(JSON.toJSONBytes(request));
return dto;
@ -46,7 +46,7 @@ public class ApiDebugLogService {
apiDebug.getId(),
null,
OperationLogType.UPDATE.name(),
OperationLogModule.API_DEBUG,
OperationLogModule.API_TEST_DEBUG_MANAGEMENT_DEBUG,
apiDebug.getName());
dto.setOriginalValue(JSON.toJSONBytes(apiDebug));
}
@ -61,7 +61,7 @@ public class ApiDebugLogService {
apiDebug.getId(),
null,
OperationLogType.DELETE.name(),
OperationLogModule.API_DEBUG,
OperationLogModule.API_TEST_DEBUG_MANAGEMENT_DEBUG,
apiDebug.getName());
dto.setOriginalValue(JSON.toJSONBytes(apiDebug));
return dto;
@ -75,7 +75,7 @@ public class ApiDebugLogService {
apiDebug.getId(),
null,
OperationLogType.UPDATE.name(),
OperationLogModule.API_DEBUG,
OperationLogModule.API_TEST_DEBUG_MANAGEMENT_DEBUG,
apiDebug.getName());
dto.setOriginalValue(JSON.toJSONBytes(apiDebug));
return dto;

10
backend/services/api-test/src/main/java/io/metersphere/api/service/debug/ApiDebugModuleLogService.java
View File

@ -44,7 +44,7 @@ public class ApiDebugModuleLogService {
.projectId(module.getProjectId())
.organizationId(project.getOrganizationId())
.type(OperationLogType.ADD.name())
.module(OperationLogModule.API_DEBUG)
.module(OperationLogModule.API_TEST_DEBUG_MANAGEMENT_MODULE)
.method(HttpMethodConstants.POST.name())
.path(ADD)
.sourceId(module.getId())
@ -61,7 +61,7 @@ public class ApiDebugModuleLogService {
.projectId(projectId)
.organizationId(project.getOrganizationId())
.type(OperationLogType.UPDATE.name())
.module(OperationLogModule.API_DEBUG)
.module(OperationLogModule.API_TEST_DEBUG_MANAGEMENT_MODULE)
.method(HttpMethodConstants.POST.name())
.path(UPDATE)
.sourceId(module.getId())
@ -81,7 +81,7 @@ public class ApiDebugModuleLogService {
.projectId(project.getId())
.organizationId(project.getOrganizationId())
.type(OperationLogType.DELETE.name())
.module(OperationLogModule.API_DEBUG)
.module(OperationLogModule.API_TEST_DEBUG_MANAGEMENT_MODULE)
.method(HttpMethodConstants.GET.name())
.path(DELETE + "/%s")
.sourceId(item.getId())
@ -102,7 +102,7 @@ public class ApiDebugModuleLogService {
.projectId(project.getId())
.organizationId(project.getOrganizationId())
.type(OperationLogType.DELETE.name())
.module(OperationLogModule.API_DEBUG)
.module(OperationLogModule.API_TEST_DEBUG_MANAGEMENT_MODULE)
.method(HttpMethodConstants.GET.name())
.path(DELETE + "/%s")
.sourceId(item.getId())
@ -137,7 +137,7 @@ public class ApiDebugModuleLogService {
.projectId(moveNode.getProjectId())
.organizationId(project.getOrganizationId())
.type(OperationLogType.UPDATE.name())
.module(OperationLogModule.API_DEBUG)
.module(OperationLogModule.API_TEST_DEBUG_MANAGEMENT_MODULE)
.method(HttpMethodConstants.POST.name())
.path(MOVE)
.sourceId(moveNode.getId())

2
backend/services/api-test/src/main/java/io/metersphere/api/service/debug/ApiDebugModuleService.java
View File

@ -213,7 +213,7 @@ public class ApiDebugModuleService extends ModuleTreeService {
//删除文件关联关系
apiDebugs.forEach(apiDebug -> {
String apiDebugDir = DefaultRepositoryDir.getApiDebugDir(apiDebug.getProjectId(), apiDebug.getId());
apiFileResourceService.deleteByResourceId(apiDebugDir, apiDebug.getId(), projectId, currentUser, OperationLogModule.API_DEBUG);
apiFileResourceService.deleteByResourceId(apiDebugDir, apiDebug.getId(), projectId, currentUser, OperationLogModule.API_TEST_DEBUG_MANAGEMENT_DEBUG);
});
apiDebugModuleLogService.saveDeleteDataLog(apiDebugs, currentUser, projectId);
}

4
backend/services/api-test/src/main/java/io/metersphere/api/service/debug/ApiDebugService.java
View File

@ -125,7 +125,7 @@ public class ApiDebugService {
resourceUpdateRequest.setResourceId(sourceId);
resourceUpdateRequest.setApiResourceType(ApiResourceType.API_DEBUG);
resourceUpdateRequest.setOperator(operator);
resourceUpdateRequest.setLogModule(OperationLogModule.API_DEBUG);
resourceUpdateRequest.setLogModule(OperationLogModule.API_TEST_DEBUG_MANAGEMENT_DEBUG);
resourceUpdateRequest.setFileAssociationSourceType(FileAssociationSourceUtil.SOURCE_TYPE_API_DEBUG);
return resourceUpdateRequest;
}
@ -167,7 +167,7 @@ public class ApiDebugService {
ApiDebug apiDebug = apiDebugMapper.selectByPrimaryKey(id);
checkResourceExist(id);
String apiDebugDir = DefaultRepositoryDir.getApiDebugDir(apiDebug.getProjectId(), apiDebug.getId());
apiFileResourceService.deleteByResourceId(apiDebugDir, id, apiDebug.getProjectId(), operator, OperationLogModule.API_DEBUG);
apiFileResourceService.deleteByResourceId(apiDebugDir, id, apiDebug.getProjectId(), operator, OperationLogModule.API_TEST_DEBUG_MANAGEMENT_DEBUG);
apiDebugMapper.deleteByPrimaryKey(id);
apiDebugBlobMapper.deleteByPrimaryKey(id);
}

4
backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionImportUtilService.java
View File

@ -321,7 +321,7 @@ public class ApiDefinitionImportUtilService {
v.getId(),
request.getUserId(),
OperationLogType.IMPORT.name(),
OperationLogModule.API_DEFINITION,
OperationLogModule.API_TEST_MANAGEMENT_DEFINITION,
v.getName());
dto.setHistory(true);
dto.setPath("/api/definition/import");
@ -363,7 +363,7 @@ public class ApiDefinitionImportUtilService {
t.getId(),
request.getUserId(),
OperationLogType.IMPORT.name(),
OperationLogModule.API_DEFINITION,
OperationLogModule.API_TEST_MANAGEMENT_DEFINITION,
t.getName());
dto.setHistory(true);
dto.setPath("/api/definition/import");

22
backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionLogService.java
View File

@ -50,7 +50,7 @@ public class ApiDefinitionLogService {
null,
null,
OperationLogType.ADD.name(),
OperationLogModule.API_DEFINITION,
OperationLogModule.API_TEST_MANAGEMENT_DEFINITION,
request.getName());
dto.setHistory(false);
dto.setPath("/api/definition/add");
@ -74,7 +74,7 @@ public class ApiDefinitionLogService {
request.getId(),
null,
OperationLogType.UPDATE.name(),
OperationLogModule.API_DEFINITION,
OperationLogModule.API_TEST_MANAGEMENT_DEFINITION,
request.getName());
dto.setHistory(true);
dto.setPath("/api/definition/update");
@ -100,7 +100,7 @@ public class ApiDefinitionLogService {
request.getId(),
null,
OperationLogType.DELETE.name(),
OperationLogModule.API_DEFINITION,
OperationLogModule.API_TEST_MANAGEMENT_DEFINITION,
apiDefinition.getName());
dto.setHistory(false);
dto.setPath("/api/definition/delete");
@ -139,7 +139,7 @@ public class ApiDefinitionLogService {
null,
null,
OperationLogType.UPDATE.name(),
OperationLogModule.API_DEFINITION,
OperationLogModule.API_TEST_MANAGEMENT_DEFINITION,
apiDefinition.getName());
dto.setHistory(false);
dto.setPath("/api/definition/copy");
@ -164,7 +164,7 @@ public class ApiDefinitionLogService {
id,
null,
OperationLogType.UPDATE.name(),
OperationLogModule.API_DEFINITION,
OperationLogModule.API_TEST_MANAGEMENT_DEFINITION,
Translator.get("follow") + apiDefinition.getName());
dto.setPath("/api/definition/follow/" + id);
@ -190,7 +190,7 @@ public class ApiDefinitionLogService {
request.getId(),
null,
OperationLogType.RECOVER.name(),
OperationLogModule.API_DEFINITION,
OperationLogModule.API_TEST_MANAGEMENT_DEFINITION,
apiDefinition.getName());
dto.setHistory(false);
dto.setPath("/api/definition/recover");
@ -225,7 +225,7 @@ public class ApiDefinitionLogService {
request.getId(),
null,
OperationLogType.DELETE.name(),
OperationLogModule.API_DEFINITION,
OperationLogModule.API_TEST_MANAGEMENT_DEFINITION,
apiDefinition.getName());
dto.setPath("/api/definition/trash-del");
@ -274,7 +274,7 @@ public class ApiDefinitionLogService {
item.getId(),
userId,
operationType,
OperationLogModule.API_DEFINITION,
OperationLogModule.API_TEST_MANAGEMENT_DEFINITION,
item.getName());
dto.setHistory(isHistory);
@ -295,7 +295,7 @@ public class ApiDefinitionLogService {
apiDefinitionDTO.getId(),
userId,
OperationLogType.UPDATE.name(),
OperationLogModule.API_DEFINITION,
OperationLogModule.API_TEST_MANAGEMENT_DEFINITION,
apiDefinitionDTO.getName());
dto.setHistory(true);
dto.setPath("/api/definition/operation-history/save");
@ -313,7 +313,7 @@ public class ApiDefinitionLogService {
apiDefinitionDTO.getId(),
userId,
OperationLogType.RECOVER.name(),
OperationLogModule.API_DEFINITION,
OperationLogModule.API_TEST_MANAGEMENT_DEFINITION,
apiDefinitionDTO.getName());
dto.setHistory(true);
dto.setPath("/api/definition/operation-history/recover");
@ -332,7 +332,7 @@ public class ApiDefinitionLogService {
apiDefinitionDTO.getId(),
null,
OperationLogType.UPDATE.name(),
OperationLogModule.API_DEFINITION,
OperationLogModule.API_TEST_MANAGEMENT_DEFINITION,
apiDefinitionDTO.getName());
dto.setOriginalValue(JSON.toJSONBytes(apiDefinitionDTO));
return dto;

10
backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionMockLogService.java
View File

@ -44,7 +44,7 @@ public class ApiDefinitionMockLogService {
null,
null,
OperationLogType.ADD.name(),
OperationLogModule.API_DEFINITION_MOCK,
OperationLogModule.API_TEST_MANAGEMENT_MOCK,
request.getName());
dto.setHistory(true);
dto.setPath("/api/definition/mock/add");
@ -68,7 +68,7 @@ public class ApiDefinitionMockLogService {
request.getId(),
null,
OperationLogType.UPDATE.name(),
OperationLogModule.API_DEFINITION_MOCK,
OperationLogModule.API_TEST_MANAGEMENT_MOCK,
request.getName());
dto.setHistory(true);
dto.setPath("/api/definition/mock/update");
@ -88,7 +88,7 @@ public class ApiDefinitionMockLogService {
apiDefinitionMock.getId(),
null,
OperationLogType.UPDATE.name(),
OperationLogModule.API_DEFINITION_MOCK,
OperationLogModule.API_TEST_MANAGEMENT_MOCK,
apiDefinitionMock.getName());
dto.setHistory(true);
dto.setPath("/api/definition/mock/enable/" + id);
@ -114,7 +114,7 @@ public class ApiDefinitionMockLogService {
request.getId(),
null,
OperationLogType.DELETE.name(),
OperationLogModule.API_DEFINITION_MOCK,
OperationLogModule.API_TEST_MANAGEMENT_MOCK,
apiDefinitionMock.getName());
dto.setHistory(true);
dto.setPath("/api/definition/mock/delete");
@ -135,7 +135,7 @@ public class ApiDefinitionMockLogService {
null,
null,
OperationLogType.UPDATE.name(),
OperationLogModule.API_DEFINITION_MOCK,
OperationLogModule.API_TEST_MANAGEMENT_MOCK,
apiDefinitionMock.getName());
dto.setHistory(true);
dto.setPath("/api/definition/mock/copy");

6
backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionMockService.java
View File

@ -147,7 +147,7 @@ public class ApiDefinitionMockService {
resourceUpdateRequest.setResourceId(sourceId);
resourceUpdateRequest.setApiResourceType(ApiResourceType.API_MOCK);
resourceUpdateRequest.setOperator(operator);
resourceUpdateRequest.setLogModule(OperationLogModule.API_DEFINITION_MOCK);
resourceUpdateRequest.setLogModule(OperationLogModule.API_TEST_MANAGEMENT_MOCK);
resourceUpdateRequest.setFileAssociationSourceType(FileAssociationSourceUtil.SOURCE_TYPE_API_DEFINITION_MOCK);
return resourceUpdateRequest;
}
@ -205,7 +205,7 @@ public class ApiDefinitionMockService {
public void delete(ApiDefinitionMockRequest request, String userId) {
checkApiDefinitionMock(request.getId());
String apiDefinitionMockDir = DefaultRepositoryDir.getApiDefinitionDir(request.getProjectId(), request.getId());
apiFileResourceService.deleteByResourceId(apiDefinitionMockDir, request.getId(), request.getProjectId(), userId, OperationLogModule.API_DEFINITION_MOCK);
apiFileResourceService.deleteByResourceId(apiDefinitionMockDir, request.getId(), request.getProjectId(), userId, OperationLogModule.API_TEST_MANAGEMENT_MOCK);
apiDefinitionMockConfigMapper.deleteByPrimaryKey(request.getId());
apiDefinitionMockMapper.deleteByPrimaryKey(request.getId());
}
@ -264,7 +264,7 @@ public class ApiDefinitionMockService {
if (!apiDefinitionMocks.isEmpty()) {
apiDefinitionMocks.forEach(item -> {
String apiDefinitionMockDir = DefaultRepositoryDir.getApiDefinitionDir(item.getProjectId(), item.getId());
apiFileResourceService.deleteByResourceId(apiDefinitionMockDir, item.getId(), item.getProjectId(), userId, OperationLogModule.API_DEFINITION_MOCK);
apiFileResourceService.deleteByResourceId(apiDefinitionMockDir, item.getId(), item.getProjectId(), userId, OperationLogModule.API_TEST_MANAGEMENT_MOCK);
});
List<String> mockIds = apiDefinitionMocks.stream().map(ApiDefinitionMock::getId).toList();

12
backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionModuleLogService.java
View File

@ -45,7 +45,7 @@ public class ApiDefinitionModuleLogService {
.projectId(module.getProjectId())
.organizationId(project.getOrganizationId())
.type(OperationLogType.ADD.name())
.module(OperationLogModule.API_DEFINITION)
.module(OperationLogModule.API_TEST_MANAGEMENT_MODULE)
.method(HttpMethodConstants.POST.name())
.path(ADD)
.sourceId(module.getId())
@ -62,7 +62,7 @@ public class ApiDefinitionModuleLogService {
.projectId(project.getId())
.organizationId(project.getOrganizationId())
.type(OperationLogType.UPDATE.name())
.module(OperationLogModule.API_DEFINITION)
.module(OperationLogModule.API_TEST_MANAGEMENT_MODULE)
.method(HttpMethodConstants.POST.name())
.path(UPDATE)
.sourceId(module.getId())
@ -82,7 +82,7 @@ public class ApiDefinitionModuleLogService {
.projectId(project.getId())
.organizationId(project.getOrganizationId())
.type(OperationLogType.DELETE.name())
.module(OperationLogModule.API_DEFINITION)
.module(OperationLogModule.API_TEST_MANAGEMENT_MODULE)
.method(HttpMethodConstants.GET.name())
.path(DELETE + "/%s")
.sourceId(item.getId())
@ -102,7 +102,7 @@ public class ApiDefinitionModuleLogService {
.projectId(project.getId())
.organizationId(project.getOrganizationId())
.type(OperationLogType.DELETE.name())
.module(OperationLogModule.API_DEFINITION)
.module(OperationLogModule.API_TEST_MANAGEMENT_MODULE)
.method(HttpMethodConstants.GET.name())
.path(DELETE + "/%s")
.sourceId(item.getId())
@ -123,7 +123,7 @@ public class ApiDefinitionModuleLogService {
.projectId(project.getId())
.organizationId(project.getOrganizationId())
.type(OperationLogType.DELETE.name())
.module(OperationLogModule.API_DEFINITION)
.module(OperationLogModule.API_TEST_MANAGEMENT_MODULE)
.method(HttpMethodConstants.GET.name())
.path(DELETE + "/%s")
.sourceId(item.getId())
@ -158,7 +158,7 @@ public class ApiDefinitionModuleLogService {
.projectId(moveNode.getProjectId())
.organizationId(project.getOrganizationId())
.type(OperationLogType.UPDATE.name())
.module(OperationLogModule.API_DEFINITION)
.module(OperationLogModule.API_TEST_MANAGEMENT_MODULE)
.method(HttpMethodConstants.POST.name())
.path(MOVE)
.sourceId(moveNode.getId())

4
backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionScheduleService.java
View File

@ -80,7 +80,7 @@ public class ApiDefinitionScheduleService {
request.getId(),
userId,
OperationLogType.ADD.name(),
OperationLogModule.API_DEFINITION,
OperationLogModule.API_TEST_MANAGEMENT_DEFINITION,
Translator.get("api_import_schedule") + ": " + request.getName());
dto.setHistory(false);
dto.setPath("/api/definition/schedule/add");
@ -138,7 +138,7 @@ public class ApiDefinitionScheduleService {
request.getId(),
userId,
OperationLogType.UPDATE.name(),
OperationLogModule.API_DEFINITION,
OperationLogModule.API_TEST_MANAGEMENT_DEFINITION,
Translator.get("api_import_schedule") + ": " + request.getName());
dto.setHistory(false);
dto.setPath("/api/definition/schedule/update");

4
backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionService.java
View File

@ -233,7 +233,7 @@ public class ApiDefinitionService {
resourceUpdateRequest.setResourceId(sourceId);
resourceUpdateRequest.setApiResourceType(ApiResourceType.API);
resourceUpdateRequest.setOperator(operator);
resourceUpdateRequest.setLogModule(OperationLogModule.API_DEFINITION);
resourceUpdateRequest.setLogModule(OperationLogModule.API_TEST_MANAGEMENT_DEFINITION);
resourceUpdateRequest.setFileAssociationSourceType(FileAssociationSourceUtil.SOURCE_TYPE_API_DEFINITION);
return resourceUpdateRequest;
}
@ -799,7 +799,7 @@ public class ApiDefinitionService {
// 删除上传的文件
ids.forEach(id -> {
String apiDefinitionDir = DefaultRepositoryDir.getApiDefinitionDir(projectId, id);
apiFileResourceService.deleteByResourceId(apiDefinitionDir, id, projectId, userId, OperationLogModule.API_DEFINITION);
apiFileResourceService.deleteByResourceId(apiDefinitionDir, id, projectId, userId, OperationLogModule.API_TEST_MANAGEMENT_DEFINITION);
});
// 删除接口关注人
ApiDefinitionFollowerExample apiDefinitionFollowerExample = new ApiDefinitionFollowerExample();

20
backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiTestCaseLogService.java
View File

@ -56,7 +56,7 @@ public class ApiTestCaseLogService {
null,
null,
OperationLogType.ADD.name(),
OperationLogModule.API_DEFINITION_CASE,
OperationLogModule.API_TEST_MANAGEMENT_CASE,
request.getName());
dto.setPath("/api/case/add");
@ -74,7 +74,7 @@ public class ApiTestCaseLogService {
id,
null,
OperationLogType.DELETE.name(),
OperationLogModule.API_DEFINITION_CASE,
OperationLogModule.API_TEST_MANAGEMENT_CASE,
apiTestCase.getName());
dto.setPath("/api/case/delete/" + id);
@ -93,7 +93,7 @@ public class ApiTestCaseLogService {
id,
null,
OperationLogType.DELETE.name(),
OperationLogModule.API_DEFINITION_CASE,
OperationLogModule.API_TEST_MANAGEMENT_CASE,
apiTestCase.getName());
dto.setPath("/api/case/move-gc/" + id);
@ -111,7 +111,7 @@ public class ApiTestCaseLogService {
id,
null,
OperationLogType.RECOVER.name(),
OperationLogModule.API_DEFINITION_CASE,
OperationLogModule.API_TEST_MANAGEMENT_CASE,
apiTestCase.getName());
dto.setHistory(false);
dto.setPath("/api/case/recover/" + id);
@ -129,7 +129,7 @@ public class ApiTestCaseLogService {
id,
null,
OperationLogType.UPDATE.name(),
OperationLogModule.API_DEFINITION_CASE,
OperationLogModule.API_TEST_MANAGEMENT_CASE,
Translator.get("follow") + apiTestCase.getName());
dto.setPath("/api/case/follow/" + id);
@ -147,7 +147,7 @@ public class ApiTestCaseLogService {
id,
null,
OperationLogType.UPDATE.name(),
OperationLogModule.API_DEFINITION_CASE,
OperationLogModule.API_TEST_MANAGEMENT_CASE,
Translator.get("unfollow") + apiTestCase.getName());
dto.setPath("/api/case/unfollow/" + id);
@ -166,7 +166,7 @@ public class ApiTestCaseLogService {
request.getId(),
null,
OperationLogType.UPDATE.name(),
OperationLogModule.API_DEFINITION_CASE,
OperationLogModule.API_TEST_MANAGEMENT_CASE,
request.getName());
dto.setPath("/api/case/update");
@ -189,7 +189,7 @@ public class ApiTestCaseLogService {
id,
null,
OperationLogType.UPDATE.name(),
OperationLogModule.API_DEFINITION_CASE,
OperationLogModule.API_TEST_MANAGEMENT_CASE,
apiTestCase.getName());
dto.setPath("/api/case/update");
@ -210,7 +210,7 @@ public class ApiTestCaseLogService {
.projectId(project.getId())
.organizationId(project.getOrganizationId())
.type(OperationLogType.DELETE.name())
.module(OperationLogModule.API_DEFINITION_CASE)
.module(OperationLogModule.API_TEST_MANAGEMENT_CASE)
.method(HttpMethodConstants.POST.name())
.path("/api/case/batch/delete")
.sourceId(item.getId())
@ -261,7 +261,7 @@ public class ApiTestCaseLogService {
.projectId(project.getId())
.organizationId(project.getOrganizationId())
.type(operationType)
.module(OperationLogModule.API_DEFINITION_CASE)
.module(OperationLogModule.API_TEST_MANAGEMENT_CASE)
.method(HttpMethodConstants.POST.name())
.path(path)
.sourceId(item.getId())

4
backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiTestCaseService.java
View File

@ -135,7 +135,7 @@ public class ApiTestCaseService {
resourceUpdateRequest.setResourceId(sourceId);
resourceUpdateRequest.setApiResourceType(ApiResourceType.API_CASE);
resourceUpdateRequest.setOperator(operator);
resourceUpdateRequest.setLogModule(OperationLogModule.API_DEFINITION_CASE);
resourceUpdateRequest.setLogModule(OperationLogModule.API_TEST_MANAGEMENT_CASE);
resourceUpdateRequest.setFileAssociationSourceType(FileAssociationSourceUtil.SOURCE_TYPE_API_TEST_CASE);
return resourceUpdateRequest;
}
@ -365,7 +365,7 @@ public class ApiTestCaseService {
//删除文件关联关系
ids.forEach(id -> {
String apiCaseDir = DefaultRepositoryDir.getApiCaseDir(projectId, id);
apiFileResourceService.deleteByResourceId(apiCaseDir, id, projectId, userId, OperationLogModule.API_DEFINITION_CASE);
apiFileResourceService.deleteByResourceId(apiCaseDir, id, projectId, userId, OperationLogModule.API_TEST_MANAGEMENT_CASE);
});
ApiTestCaseExample example = new ApiTestCaseExample();
example.createCriteria().andIdIn(ids);

20
backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioLogService.java
View File

@ -51,7 +51,7 @@ public class ApiScenarioLogService {
.projectId(project.getId())
.organizationId(project.getOrganizationId())
.type(operationType)
.module(OperationLogModule.API_SCENARIO)
.module(OperationLogModule.API_SCENARIO_MANAGEMENT_SCENARIO)
.method(HttpMethodConstants.POST.name())
.path(path)
.sourceId(item.getId())
@ -75,7 +75,7 @@ public class ApiScenarioLogService {
id,
operator,
OperationLogType.UPDATE.name(),
OperationLogModule.API_SCENARIO,
OperationLogModule.API_SCENARIO_MANAGEMENT_SCENARIO,
Translator.get("follow") + scenario.getName());
dto.setPath("/api/scenario/follow/" + id);
@ -93,7 +93,7 @@ public class ApiScenarioLogService {
id,
operator,
OperationLogType.UPDATE.name(),
OperationLogModule.API_SCENARIO,
OperationLogModule.API_SCENARIO_MANAGEMENT_SCENARIO,
Translator.get("unfollow") + apiTestCase.getName());
dto.setPath("/api/scenario/follow/" + id);
@ -110,7 +110,7 @@ public class ApiScenarioLogService {
null,
null,
OperationLogType.ADD.name(),
OperationLogModule.API_SCENARIO,
OperationLogModule.API_SCENARIO_MANAGEMENT_SCENARIO,
request.getName());
dto.setHistory(true);
dto.setOriginalValue(JSON.toJSONBytes(request));
@ -126,7 +126,7 @@ public class ApiScenarioLogService {
apiScenario.getId(),
null,
OperationLogType.UPDATE.name(),
OperationLogModule.API_SCENARIO,
OperationLogModule.API_SCENARIO_MANAGEMENT_SCENARIO,
apiScenario.getName());
dto.setHistory(true);
dto.setOriginalValue(JSON.toJSONBytes(request));
@ -140,7 +140,7 @@ public class ApiScenarioLogService {
.projectId(project.getId())
.organizationId(project.getOrganizationId())
.type(OperationLogType.UPDATE.name())
.module(OperationLogModule.API_SCENARIO)
.module(OperationLogModule.API_SCENARIO_MANAGEMENT_SCENARIO)
.sourceId(apiScenario.getId())
.content(Translator.get("api_automation_schedule") + ":" + apiScenario.getName())
.build().getLogDTO();
@ -156,7 +156,7 @@ public class ApiScenarioLogService {
apiScenario.getId(),
null,
OperationLogType.UPDATE.name(),
OperationLogModule.API_SCENARIO,
OperationLogModule.API_SCENARIO_MANAGEMENT_SCENARIO,
apiScenario.getName());
dto.setHistory(true);
dto.setOriginalValue(JSON.toJSONBytes(apiScenario));
@ -171,7 +171,7 @@ public class ApiScenarioLogService {
apiScenario.getId(),
null,
OperationLogType.DELETE.name(),
OperationLogModule.API_SCENARIO,
OperationLogModule.API_SCENARIO_MANAGEMENT_SCENARIO,
apiScenario.getName());
dto.setOriginalValue(JSON.toJSONBytes(apiScenario));
return dto;
@ -185,7 +185,7 @@ public class ApiScenarioLogService {
apiScenario.getId(),
null,
OperationLogType.RESTORE.name(),
OperationLogModule.API_SCENARIO,
OperationLogModule.API_SCENARIO_MANAGEMENT_SCENARIO,
apiScenario.getName());
dto.setOriginalValue(JSON.toJSONBytes(apiScenario));
return dto;
@ -201,7 +201,7 @@ public class ApiScenarioLogService {
.projectId(project.getId())
.organizationId(project.getOrganizationId())
.type(operationType)
.module(OperationLogModule.API_SCENARIO)
.module(OperationLogModule.API_SCENARIO_MANAGEMENT_SCENARIO)
.method(logInsertModule.getRequestMethod())
.path(logInsertModule.getRequestUrl())
.sourceId(item.getId())

10
backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioModuleLogService.java
View File

@ -44,7 +44,7 @@ public class ApiScenarioModuleLogService {
.projectId(module.getProjectId())
.organizationId(project.getOrganizationId())
.type(OperationLogType.ADD.name())
.module(OperationLogModule.API_DEFINITION)
.module(OperationLogModule.API_SCENARIO_MANAGEMENT_MODULE)
.method(HttpMethodConstants.POST.name())
.path(ADD)
.sourceId(module.getId())
@ -61,7 +61,7 @@ public class ApiScenarioModuleLogService {
.projectId(project.getId())
.organizationId(project.getOrganizationId())
.type(OperationLogType.UPDATE.name())
.module(OperationLogModule.API_DEFINITION)
.module(OperationLogModule.API_SCENARIO_MANAGEMENT_MODULE)
.method(HttpMethodConstants.POST.name())
.path(UPDATE)
.sourceId(module.getId())
@ -81,7 +81,7 @@ public class ApiScenarioModuleLogService {
.projectId(project.getId())
.organizationId(project.getOrganizationId())
.type(OperationLogType.DELETE.name())
.module(OperationLogModule.API_DEFINITION)
.module(OperationLogModule.API_SCENARIO_MANAGEMENT_MODULE)
.method(HttpMethodConstants.GET.name())
.path(DELETE + "/%s")
.sourceId(item.getId())
@ -101,7 +101,7 @@ public class ApiScenarioModuleLogService {
.projectId(project.getId())
.organizationId(project.getOrganizationId())
.type(OperationLogType.DELETE.name())
.module(OperationLogModule.API_DEFINITION)
.module(OperationLogModule.API_SCENARIO_MANAGEMENT_MODULE)
.method(HttpMethodConstants.GET.name())
.path(DELETE + "/%s")
.sourceId(item.getId())
@ -136,7 +136,7 @@ public class ApiScenarioModuleLogService {
.projectId(moveNode.getProjectId())
.organizationId(project.getOrganizationId())
.type(OperationLogType.UPDATE.name())
.module(OperationLogModule.API_DEFINITION)
.module(OperationLogModule.API_SCENARIO_MANAGEMENT_MODULE)
.method(HttpMethodConstants.POST.name())
.path(MOVE)
.sourceId(moveNode.getId())

8
backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioService.java
View File

@ -507,7 +507,7 @@ public class ApiScenarioService {
refFilesMap = fileList.stream().collect(Collectors.toMap(FileMetadata::getId, f -> f.getName() + "." + f.getType()));
}
fileAssociationService.association(resourceUpdateRequest.getResourceId(), FileAssociationSourceUtil.SOURCE_TYPE_API_SCENARIO, linkFileIds,
apiFileResourceService.createFileLogRecord(resourceUpdateRequest.getOperator(), resourceUpdateRequest.getProjectId(), OperationLogModule.API_SCENARIO));
apiFileResourceService.createFileLogRecord(resourceUpdateRequest.getOperator(), resourceUpdateRequest.getProjectId(), OperationLogModule.API_SCENARIO_MANAGEMENT_SCENARIO));
}
Map<String, String> finalRefFilesMap = refFilesMap;
// 添加文件与接口的关联关系
@ -872,7 +872,7 @@ public class ApiScenarioService {
resourceUpdateRequest.setResourceId(sourceId);
resourceUpdateRequest.setApiResourceType(ApiResourceType.API_SCENARIO);
resourceUpdateRequest.setOperator(operator);
resourceUpdateRequest.setLogModule(OperationLogModule.API_SCENARIO);
resourceUpdateRequest.setLogModule(OperationLogModule.API_SCENARIO_MANAGEMENT_SCENARIO);
resourceUpdateRequest.setFileAssociationSourceType(FileAssociationSourceUtil.SOURCE_TYPE_API_DEBUG);
return resourceUpdateRequest;
}
@ -923,7 +923,7 @@ public class ApiScenarioService {
//删除文件
String scenarioDir = DefaultRepositoryDir.getApiDebugDir(scenario.getProjectId(), scenario.getId());
try {
apiFileResourceService.deleteByResourceId(scenarioDir, scenario.getId(), scenario.getProjectId(), operator, OperationLogModule.API_DEBUG);
apiFileResourceService.deleteByResourceId(scenarioDir, scenario.getId(), scenario.getProjectId(), operator, OperationLogModule.API_TEST_DEBUG_MANAGEMENT_DEBUG);
} catch (Exception ignore) {
}
@ -969,7 +969,7 @@ public class ApiScenarioService {
//删除文件
String scenarioDir = DefaultRepositoryDir.getApiDebugDir(scenario.getProjectId(), scenario.getId());
try {
apiFileResourceService.deleteByResourceId(scenarioDir, scenario.getId(), scenario.getProjectId(), operator, OperationLogModule.API_DEBUG);
apiFileResourceService.deleteByResourceId(scenarioDir, scenario.getId(), scenario.getProjectId(), operator, OperationLogModule.API_TEST_DEBUG_MANAGEMENT_DEBUG);
//删除定时任务
scheduleService.deleteByResourceId(scenario.getId(), ApiScenarioScheduleJob.class.getName());
} catch (Exception ignore) {

4
backend/services/project-management/src/main/java/io/metersphere/project/api/KeyValueParam.java
View File

@ -14,12 +14,12 @@ public class KeyValueParam {
/**
* 键
*/
@Size(max = 100)
@Size(max = 255)
private String key;
/**
* 值
*/
@Size(max = 100)
@Size(max = 255)
private String value;
public boolean isValid() {

26
backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectCustomFieldLogService.java
View File

@ -1,5 +1,7 @@
package io.metersphere.project.service;
import io.metersphere.sdk.constants.TemplateScene;
import io.metersphere.sdk.util.EnumValidator;
import io.metersphere.system.log.dto.LogDTO;
import io.metersphere.system.dto.sdk.request.CustomFieldUpdateRequest;
import io.metersphere.sdk.util.JSON;
@ -28,12 +30,30 @@ public class ProjectCustomFieldLogService {
null,
null,
OperationLogType.ADD.name(),
OperationLogModule.PROJECT_CUSTOM_FIELD,
getOperationLogModule(request.getScene()),
request.getName());
dto.setOriginalValue(JSON.toJSONBytes(request));
return dto;
}
public String getOperationLogModule(String scene) {
TemplateScene templateScene = EnumValidator.validateEnum(TemplateScene.class, scene);
switch (templateScene) {
case API:
return OperationLogModule.PROJECT_MANAGEMENT_TEMPLATE_API_FIELD;
case FUNCTIONAL:
return OperationLogModule.PROJECT_MANAGEMENT_TEMPLATE_FUNCTIONAL_FIELD;
case UI:
return OperationLogModule.PROJECT_MANAGEMENT_TEMPLATE_UI_FIELD;
case BUG:
return OperationLogModule.PROJECT_MANAGEMENT_TEMPLATE_BUG_FIELD;
case TEST_PLAN:
return OperationLogModule.PROJECT_MANAGEMENT_TEMPLATE_TEST_PLAN_FIELD;
default:
return null;
}
}
public LogDTO updateLog(CustomFieldUpdateRequest request) {
CustomField customField = projectCustomFieldService.getWithCheck(request.getId());
LogDTO dto = new LogDTO(
@ -42,7 +62,7 @@ public class ProjectCustomFieldLogService {
customField.getId(),
null,
OperationLogType.UPDATE.name(),
OperationLogModule.PROJECT_CUSTOM_FIELD,
getOperationLogModule(customField.getScene()),
customField.getName());
dto.setOriginalValue(JSON.toJSONBytes(customField));
return dto;
@ -56,7 +76,7 @@ public class ProjectCustomFieldLogService {
customField.getId(),
null,
OperationLogType.DELETE.name(),
OperationLogModule.PROJECT_CUSTOM_FIELD,
getOperationLogModule(customField.getScene()),
customField.getName());
dto.setOriginalValue(JSON.toJSONBytes(customField));
return dto;

14
backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectStatusFlowSettingLogService.java
View File

@ -1,5 +1,7 @@
package io.metersphere.project.service;
import io.metersphere.sdk.constants.TemplateScene;
import io.metersphere.sdk.util.EnumValidator;
import io.metersphere.system.log.dto.LogDTO;
import io.metersphere.system.dto.sdk.request.StatusDefinitionUpdateRequest;
import io.metersphere.system.dto.sdk.request.StatusFlowUpdateRequest;
@ -65,9 +67,19 @@ public class ProjectStatusFlowSettingLogService {
scopeId,
null,
OperationLogType.UPDATE.name(),
OperationLogModule.SETTING_SYSTEM_ORGANIZATION_STATUS_FLOW_SETTING,
getOperationLogModule(scene),
Translator.get("status_flow.name"));
dto.setOriginalValue(JSON.toJSONBytes(statusItemDTOS));
return dto;
}
public String getOperationLogModule(String scene) {
TemplateScene templateScene = EnumValidator.validateEnum(TemplateScene.class, scene);
switch (templateScene) {
case BUG:
return OperationLogModule.PROJECT_MANAGEMENT_TEMPLATE_BUG_WORKFLOW;
default:
return null;
}
}
}

28
backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectTemplateLogService.java
View File

@ -1,5 +1,7 @@
package io.metersphere.project.service;
import io.metersphere.sdk.constants.TemplateScene;
import io.metersphere.sdk.util.EnumValidator;
import io.metersphere.system.log.dto.LogDTO;
import io.metersphere.system.dto.sdk.request.TemplateUpdateRequest;
import io.metersphere.sdk.util.JSON;
@ -29,12 +31,30 @@ public class ProjectTemplateLogService {
null,
null,
OperationLogType.ADD.name(),
OperationLogModule.PROJECT_TEMPLATE,
getOperationLogModule(request.getScene()),
request.getName());
dto.setOriginalValue(JSON.toJSONBytes(request));
return dto;
}
public String getOperationLogModule(String scene) {
TemplateScene templateScene = EnumValidator.validateEnum(TemplateScene.class, scene);
switch (templateScene) {
case API:
return OperationLogModule.PROJECT_MANAGEMENT_TEMPLATE_API_TEMPLATE;
case FUNCTIONAL:
return OperationLogModule.PROJECT_MANAGEMENT_TEMPLATE_FUNCTIONAL_TEMPLATE;
case UI:
return OperationLogModule.PROJECT_MANAGEMENT_TEMPLATE_UI_TEMPLATE;
case BUG:
return OperationLogModule.PROJECT_MANAGEMENT_TEMPLATE_BUG_TEMPLATE;
case TEST_PLAN:
return OperationLogModule.PROJECT_MANAGEMENT_TEMPLATE_TEST_PLAN_TEMPLATE;
default:
return null;
}
}
public LogDTO updateLog(TemplateUpdateRequest request) {
Template template = projectTemplateService.getWithCheck(request.getId());
LogDTO dto = null;
@ -45,7 +65,7 @@ public class ProjectTemplateLogService {
template.getId(),
null,
OperationLogType.UPDATE.name(),
OperationLogModule.PROJECT_TEMPLATE,
getOperationLogModule(template.getScene()),
template.getName());
dto.setOriginalValue(JSON.toJSONBytes(template));
}
@ -62,7 +82,7 @@ public class ProjectTemplateLogService {
template.getId(),
null,
String.join(Translator.get("set_default_template"), ":", OperationLogType.UPDATE.name()),
OperationLogModule.PROJECT_TEMPLATE,
getOperationLogModule(template.getScene()),
template.getName());
dto.setOriginalValue(JSON.toJSONBytes(template));
}
@ -77,7 +97,7 @@ public class ProjectTemplateLogService {
template.getId(),
null,
OperationLogType.DELETE.name(),
OperationLogModule.PROJECT_TEMPLATE,
getOperationLogModule(template.getScene()),
template.getName());
dto.setOriginalValue(JSON.toJSONBytes(template));
return dto;

52
backend/services/system-setting/src/main/java/io/metersphere/system/log/constants/OperationLogModule.java
View File

@ -18,10 +18,15 @@ public class OperationLogModule {
public static final String API_AUTOMATION = "API_AUTOMATION";
public static final String API_AUTOMATION_SCHEDULE = "API_AUTOMATION_SCHEDULE";
public static final String API_AUTOMATION_REPORT = "API_AUTOMATION_REPORT";
public static final String API_DEFINITION = "API_DEFINITION";
public static final String API_DEFINITION_MOCK = "API_DEFINITION_MOCK";
public static final String API_DEFINITION_CASE = "API_DEFINITION_CASE";
public static final String API_SCENARIO = "API_SCENARIO";
// 接口管理
public static final String API_TEST_MANAGEMENT_DEFINITION = "API_TEST_MANAGEMENT_DEFINITION";
public static final String API_TEST_MANAGEMENT_MODULE = "API_TEST_MANAGEMENT_MODULE";
public static final String API_TEST_MANAGEMENT_MOCK = "API_TEST_MANAGEMENT_MOCK";
public static final String API_TEST_MANAGEMENT_CASE = "API_TEST_MANAGEMENT_CASE";
// 场景管理
public static final String API_SCENARIO_MANAGEMENT_SCENARIO = "API_SCENARIO_MANAGEMENT_SCENARIO";
public static final String API_SCENARIO_MANAGEMENT_MODULE = "API_SCENARIO_MANAGEMENT_MODULE";
public static final String API_REPORT = "API_REPORT";
public static final String AUTH_TITLE = "AUTH_TITLE";
public static final String PROJECT_ENVIRONMENT_SETTING = "PROJECT_ENVIRONMENT_SETTING";
@ -62,10 +67,20 @@ public class OperationLogModule {
//系统设置-组织-项目
public static final String SETTING_ORGANIZATION_PROJECT = "SETTING_ORGANIZATION_PROJECT";
// 模板管理
public static final String SETTING_SYSTEM_ORGANIZATION_CUSTOM_FIELD = "SETTING_SYSTEM_ORGANIZATION_CUSTOM_FIELD";
public static final String SETTING_SYSTEM_ORGANIZATION_TEMPLATE = "SETTING_SYSTEM_ORGANIZATION_TEMPLATE";
public static final String SETTING_SYSTEM_ORGANIZATION_STATUS_FLOW_SETTING = "SETTING_SYSTEM_ORGANIZATION_STATUS_FLOW_SETTING";
// 模板管理-字段
public static final String SETTING_ORGANIZATION_TEMPLATE_BUG_FIELD = "SETTING_ORGANIZATION_TEMPLATE_BUG_FIELD";
public static final String SETTING_ORGANIZATION_TEMPLATE_API_FIELD = "SETTING_ORGANIZATION_TEMPLATE_API_FIELD";
public static final String SETTING_ORGANIZATION_TEMPLATE_FUNCTIONAL_FIELD = "SETTING_ORGANIZATION_TEMPLATE_FUNCTIONAL_FIELD";
public static final String SETTING_ORGANIZATION_TEMPLATE_UI_FIELD = "SETTING_ORGANIZATION_TEMPLATE_UI_FIELD";
public static final String SETTING_ORGANIZATION_TEMPLATE_TEST_PLAN_FIELD = "SETTING_ORGANIZATION_TEMPLATE_TEST_PLAN_FIELD";
// 模板管理-模板
public static final String SETTING_ORGANIZATION_TEMPLATE_FUNCTIONAL_TEMPLATE = "SETTING_ORGANIZATION_TEMPLATE_FUNCTIONAL_TEMPLATE";
public static final String SETTING_ORGANIZATION_TEMPLATE_API_TEMPLATE = "SETTING_ORGANIZATION_TEMPLATE_API_TEMPLATE";
public static final String SETTING_ORGANIZATION_TEMPLATE_UI_TEMPLATE = "SETTING_ORGANIZATION_TEMPLATE_UI_TEMPLATE";
public static final String SETTING_ORGANIZATION_TEMPLATE_TEST_PLAN_TEMPLATE = "SETTING_ORGANIZATION_TEMPLATE_TEST_PLAN_TEMPLATE";
public static final String SETTING_ORGANIZATION_TEMPLATE_BUG_TEMPLATE = "SETTING_ORGANIZATION_TEMPLATE_BUG_TEMPLATE";
// 模板管理-状态流
public static final String SETTING_ORGANIZATION_TEMPLATE_BUG_WORKFLOW = "SETTING_ORGANIZATION_TEMPLATE_BUG_WORKFLOW";
// 项目管理
public static final String PROJECT_MANAGEMENT = "PROJECT_MANAGEMENT";
@ -86,8 +101,21 @@ public class OperationLogModule {
public static final String PROJECT_MANAGEMENT_MESSAGE_MANAGEMENT_ROBOT = "PROJECT_MANAGEMENT_MESSAGE_MANAGEMENT_ROBOT";
//项目管理-应用管理
public static final String PROJECT_MANAGEMENT_PERMISSION_MENU_MANAGEMENT = "PROJECT_MANAGEMENT_PERMISSION_MENU_MANAGEMENT";
public static final String PROJECT_TEMPLATE = "PROJECT_TEMPLATE";// 项目模板
public static final String PROJECT_CUSTOM_FIELD = "PROJECT_CUSTOM_FIELD";// 项目字段
// 项目模板管理-模板
public static final String PROJECT_MANAGEMENT_TEMPLATE_FUNCTIONAL_TEMPLATE = "PROJECT_MANAGEMENT_TEMPLATE_FUNCTIONAL_TEMPLATE";
public static final String PROJECT_MANAGEMENT_TEMPLATE_API_TEMPLATE = "PROJECT_MANAGEMENT_TEMPLATE_API_TEMPLATE";
public static final String PROJECT_MANAGEMENT_TEMPLATE_UI_TEMPLATE = "PROJECT_MANAGEMENT_TEMPLATE_UI_TEMPLATE";
public static final String PROJECT_MANAGEMENT_TEMPLATE_TEST_PLAN_TEMPLATE = "PROJECT_MANAGEMENT_TEMPLATE_TEST_PLAN_TEMPLATE";
public static final String PROJECT_MANAGEMENT_TEMPLATE_BUG_TEMPLATE = "PROJECT_MANAGEMENT_TEMPLATE_BUG_TEMPLATE";
// 项目模板管理-状态流
public static final String PROJECT_MANAGEMENT_TEMPLATE_BUG_WORKFLOW = "PROJECT_MANAGEMENT_TEMPLATE_BUG_WORKFLOW";
// 项目模板管理-字段
public static final String PROJECT_MANAGEMENT_TEMPLATE_API_FIELD = "PROJECT_MANAGEMENT_TEMPLATE_API_FIELD";
public static final String PROJECT_MANAGEMENT_TEMPLATE_FUNCTIONAL_FIELD = "PROJECT_MANAGEMENT_TEMPLATE_API_FIELD";
public static final String PROJECT_MANAGEMENT_TEMPLATE_UI_FIELD = "PROJECT_MANAGEMENT_TEMPLATE_API_FIELD";
public static final String PROJECT_MANAGEMENT_TEMPLATE_BUG_FIELD = "PROJECT_MANAGEMENT_TEMPLATE_API_FIELD";
public static final String PROJECT_MANAGEMENT_TEMPLATE_TEST_PLAN_FIELD = "PROJECT_MANAGEMENT_TEMPLATE_API_FIELD";
public static final String PROJECT_CUSTOM_FUNCTION = "PROJECT_CUSTOM_FUNCTION";// 项目公共脚本
//用例
@ -103,7 +131,9 @@ public class OperationLogModule {
public static final String CASE_REVIEW_DETAIL = "CASE_MANAGEMENT_REVIEW_DETAIL";
//接口调试
public static final String API_DEBUG = "API_DEBUG";
public static final String API_TEST_DEBUG_MANAGEMENT_DEBUG = "API_TEST_DEBUG_MANAGEMENT_DEBUG";
//接口调试模块
public static final String API_TEST_DEBUG_MANAGEMENT_MODULE = "API_TEST_DEBUG_MANAGEMENT_MODULE";
//接口管理-环境
public static final String API_DEFINITION_ENVIRONMENT = "API_DEFINITION_ENVIRONMENT";
// 缺陷管理

26
backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationCustomFieldLogService.java
View File

@ -1,6 +1,8 @@
package io.metersphere.system.service;
import io.metersphere.sdk.constants.OperationLogConstants;
import io.metersphere.sdk.constants.TemplateScene;
import io.metersphere.sdk.util.EnumValidator;
import io.metersphere.system.log.dto.LogDTO;
import io.metersphere.system.dto.sdk.request.CustomFieldUpdateRequest;
import io.metersphere.system.log.constants.OperationLogModule;
@ -29,12 +31,30 @@ public class OrganizationCustomFieldLogService {
null,
null,
OperationLogType.ADD.name(),
OperationLogModule.SETTING_SYSTEM_ORGANIZATION_CUSTOM_FIELD,
getOperationLogModule(request.getScene()),
request.getName());
dto.setOriginalValue(JSON.toJSONBytes(request));
return dto;
}
public String getOperationLogModule(String scene) {
TemplateScene templateScene = EnumValidator.validateEnum(TemplateScene.class, scene);
switch (templateScene) {
case API:
return OperationLogModule.SETTING_ORGANIZATION_TEMPLATE_API_FIELD;
case FUNCTIONAL:
return OperationLogModule.SETTING_ORGANIZATION_TEMPLATE_FUNCTIONAL_FIELD;
case UI:
return OperationLogModule.SETTING_ORGANIZATION_TEMPLATE_UI_FIELD;
case BUG:
return OperationLogModule.SETTING_ORGANIZATION_TEMPLATE_BUG_FIELD;
case TEST_PLAN:
return OperationLogModule.SETTING_ORGANIZATION_TEMPLATE_TEST_PLAN_FIELD;
default:
return null;
}
}
public LogDTO updateLog(CustomFieldUpdateRequest request) {
CustomField customField = organizationCustomFieldService.getWithCheck(request.getId());
LogDTO dto = new LogDTO(
@ -43,7 +63,7 @@ public class OrganizationCustomFieldLogService {
customField.getId(),
null,
OperationLogType.UPDATE.name(),
OperationLogModule.SETTING_SYSTEM_ORGANIZATION_CUSTOM_FIELD,
getOperationLogModule(customField.getScene()),
customField.getName());
dto.setOriginalValue(JSON.toJSONBytes(customField));
return dto;
@ -57,7 +77,7 @@ public class OrganizationCustomFieldLogService {
customField.getId(),
null,
OperationLogType.DELETE.name(),
OperationLogModule.SETTING_SYSTEM_ORGANIZATION_CUSTOM_FIELD,
getOperationLogModule(customField.getScene()),
customField.getName());
dto.setOriginalValue(JSON.toJSONBytes(customField));
return dto;

14
backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationStatusFlowSettingLogService.java
View File

@ -1,6 +1,8 @@
package io.metersphere.system.service;
import io.metersphere.sdk.constants.OperationLogConstants;
import io.metersphere.sdk.constants.TemplateScene;
import io.metersphere.sdk.util.EnumValidator;
import io.metersphere.system.log.dto.LogDTO;
import io.metersphere.system.dto.sdk.request.StatusDefinitionUpdateRequest;
import io.metersphere.system.dto.sdk.request.StatusFlowUpdateRequest;
@ -65,9 +67,19 @@ public class OrganizationStatusFlowSettingLogService {
scopeId,
null,
OperationLogType.UPDATE.name(),
OperationLogModule.SETTING_SYSTEM_ORGANIZATION_STATUS_FLOW_SETTING,
getOperationLogModule(scene),
Translator.get("status_flow.name"));
dto.setOriginalValue(JSON.toJSONBytes(statusFlowSetting));
return dto;
}
public String getOperationLogModule(String scene) {
TemplateScene templateScene = EnumValidator.validateEnum(TemplateScene.class, scene);
switch (templateScene) {
case BUG:
return OperationLogModule.SETTING_ORGANIZATION_TEMPLATE_BUG_WORKFLOW;
default:
return null;
}
}
}

30
backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationTemplateLogService.java
View File

@ -1,6 +1,8 @@
package io.metersphere.system.service;
import io.metersphere.sdk.constants.OperationLogConstants;
import io.metersphere.sdk.constants.TemplateScene;
import io.metersphere.sdk.util.EnumValidator;
import io.metersphere.system.log.dto.LogDTO;
import io.metersphere.system.dto.sdk.request.TemplateUpdateRequest;
import io.metersphere.sdk.util.Translator;
@ -30,12 +32,30 @@ public class OrganizationTemplateLogService {
null,
null,
OperationLogType.ADD.name(),
OperationLogModule.SETTING_SYSTEM_ORGANIZATION_TEMPLATE,
getOperationLogModule(request.getScene()),
request.getName());
dto.setOriginalValue(JSON.toJSONBytes(request));
return dto;
}
public String getOperationLogModule(String scene) {
TemplateScene templateScene = EnumValidator.validateEnum(TemplateScene.class, scene);
switch (templateScene) {
case API:
return OperationLogModule.SETTING_ORGANIZATION_TEMPLATE_API_TEMPLATE;
case FUNCTIONAL:
return OperationLogModule.SETTING_ORGANIZATION_TEMPLATE_FUNCTIONAL_TEMPLATE;
case UI:
return OperationLogModule.SETTING_ORGANIZATION_TEMPLATE_UI_TEMPLATE;
case BUG:
return OperationLogModule.SETTING_ORGANIZATION_TEMPLATE_BUG_TEMPLATE;
case TEST_PLAN:
return OperationLogModule.SETTING_ORGANIZATION_TEMPLATE_TEST_PLAN_TEMPLATE;
default:
return null;
}
}
public LogDTO setDefaultTemplateLog(TemplateUpdateRequest request) {
Template template = organizationTemplateService.getWithCheck(request.getId());
LogDTO dto = null;
@ -46,7 +66,7 @@ public class OrganizationTemplateLogService {
template.getId(),
null,
OperationLogType.UPDATE.name(),
OperationLogModule.SETTING_SYSTEM_ORGANIZATION_TEMPLATE,
getOperationLogModule(template.getScene()),
String.join(Translator.get("set_default_template"), ":", template.getName()));
dto.setOriginalValue(JSON.toJSONBytes(template));
}
@ -60,7 +80,7 @@ public class OrganizationTemplateLogService {
scene,
null,
OperationLogType.UPDATE.name(),
OperationLogModule.SETTING_SYSTEM_ORGANIZATION_TEMPLATE,
getOperationLogModule(scene),
Translator.get("project_template_enable"));
}
@ -74,7 +94,7 @@ public class OrganizationTemplateLogService {
template.getId(),
null,
OperationLogType.UPDATE.name(),
OperationLogModule.SETTING_SYSTEM_ORGANIZATION_TEMPLATE,
getOperationLogModule(template.getScene()),
template.getName());
dto.setOriginalValue(JSON.toJSONBytes(template));
}
@ -89,7 +109,7 @@ public class OrganizationTemplateLogService {
template.getId(),
null,
OperationLogType.DELETE.name(),
OperationLogModule.SETTING_SYSTEM_ORGANIZATION_TEMPLATE,
getOperationLogModule(template.getScene()),
template.getName());
dto.setOriginalValue(JSON.toJSONBytes(template));
return dto;