From 44521c61fc597cd7da3876e94bb6fa8c00fe2935 Mon Sep 17 00:00:00 2001 From: wxg0103 <727495428@qq.com> Date: Tue, 7 May 2024 19:14:54 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?= =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BAswaggerUrl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/dto/taskcenter/TaskCenterScheduleDTO.java | 2 ++ .../system/log/constants/OperationLogModule.java | 2 +- .../java/io/metersphere/system/mapper/ExtScheduleMapper.xml | 3 ++- .../organization/project/components/addProjectModal.vue | 6 +++--- .../organizationAndProject/components/addProjectModal.vue | 6 +++--- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskcenter/TaskCenterScheduleDTO.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskcenter/TaskCenterScheduleDTO.java index 7e3f1e3759..4191b8a68f 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskcenter/TaskCenterScheduleDTO.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/taskcenter/TaskCenterScheduleDTO.java @@ -57,6 +57,8 @@ public class TaskCenterScheduleDTO implements Serializable { @Schema(description = "操作时间") private Long createTime; + @Schema(description = "swaggerUrl") + private String swaggerUrl; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/log/constants/OperationLogModule.java b/backend/services/system-setting/src/main/java/io/metersphere/system/log/constants/OperationLogModule.java index 502a84340d..37cc2dabe0 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/log/constants/OperationLogModule.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/log/constants/OperationLogModule.java @@ -38,7 +38,7 @@ public class OperationLogModule { public static final String PROJECT_TEMPLATE_MANAGEMENT = "PROJECT_TEMPLATE_MANAGEMENT"; public static final String PERSONAL_INFORMATION_PERSONAL_SETTINGS = "PERSONAL_INFORMATION_PERSONAL_SETTINGS"; public static final String PERSONAL_INFORMATION_APIKEYS = "PERSONAL_INFORMATION_APIKEYS"; - public static final String PERSONAL_INFORMATION_LOCAL_CONFIG = "PERSONAL_INFORMATION_LOCAL_CONFIG"; + public static final String PERSONAL_INFORMATION_LOCAL_CONFIG = "PERSONAL_INFORMATION_LOCAL_EXECUTE"; public static final String GROUP_PERMISSION = "GROUP_PERMISSION"; public static final String PERFORMANCE_TEST_REPORT = "PERFORMANCE_TEST_REPORT"; public static final String SYSTEM_QUOTA_MANAGEMENT = "SYSTEM_QUOTA_MANAGEMENT"; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtScheduleMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtScheduleMapper.xml index 021472807c..bde5e90092 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtScheduleMapper.xml +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtScheduleMapper.xml @@ -15,7 +15,8 @@ schedule.value, schedule.enable, schedule.create_user AS createUserName, - schedule.create_time + schedule.create_time, + ads.swagger_url FROM schedule inner join api_definition_swagger ads on schedule.resource_id = ads.id diff --git a/frontend/src/views/setting/organization/project/components/addProjectModal.vue b/frontend/src/views/setting/organization/project/components/addProjectModal.vue index dfadda2460..4baad82248 100644 --- a/frontend/src/views/setting/organization/project/components/addProjectModal.vue +++ b/frontend/src/views/setting/organization/project/components/addProjectModal.vue @@ -173,7 +173,7 @@ }); const moduleOption = [ // { label: 'menu.workbench', value: 'workstation' }, - // { label: 'menu.testPlan', value: 'testPlan' }, + { label: 'menu.testPlan', value: 'testPlan' }, { label: 'menu.bugManagement', value: 'bugManagement' }, { label: 'menu.caseManagement', value: 'caseManagement' }, { label: 'menu.apiTest', value: 'apiTest' }, @@ -185,9 +185,9 @@ (e: 'cancel', shouldSearch: boolean): void; }>(); - const allModuleIds = ['bugManagement', 'caseManagement', 'apiTest']; + const allModuleIds = ['bugManagement', 'caseManagement', 'apiTest', 'testPlan']; - const showPoolModuleIds = ['uiTest', 'apiTest', 'loadTest']; + const showPoolModuleIds = ['apiTest']; const form = reactive({ name: '', diff --git a/frontend/src/views/setting/system/organizationAndProject/components/addProjectModal.vue b/frontend/src/views/setting/system/organizationAndProject/components/addProjectModal.vue index 1bea14b723..805872627e 100644 --- a/frontend/src/views/setting/system/organizationAndProject/components/addProjectModal.vue +++ b/frontend/src/views/setting/system/organizationAndProject/components/addProjectModal.vue @@ -170,7 +170,7 @@ }); const moduleOption = [ // { label: 'menu.workbench', value: 'workstation' }, - // { label: 'menu.testPlan', value: 'testPlan' }, + { label: 'menu.testPlan', value: 'testPlan' }, { label: 'menu.bugManagement', value: 'bugManagement' }, { label: 'menu.caseManagement', value: 'caseManagement' }, { label: 'menu.apiTest', value: 'apiTest' }, @@ -182,9 +182,9 @@ (e: 'cancel', shouldSearch: boolean): void; }>(); - const allModuleIds = ['bugManagement', 'caseManagement', 'apiTest']; + const allModuleIds = ['bugManagement', 'caseManagement', 'apiTest', 'testPlan']; - const showPoolModuleIds = ['uiTest', 'apiTest', 'loadTest']; + const showPoolModuleIds = ['apiTest']; const form = reactive({ name: '',