diff --git a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/SyncBugResult.java b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/SyncBugResult.java index 4f46dce884..b8c2b13d4e 100644 --- a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/SyncBugResult.java +++ b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/SyncBugResult.java @@ -1,6 +1,6 @@ package io.metersphere.plugin.platform.dto; -import io.metersphere.plugin.platform.dto.reponse.PlatformBugDTO; +import io.metersphere.plugin.platform.dto.response.PlatformBugDTO; import lombok.Data; import java.util.ArrayList; diff --git a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/request/DemandUpdateRequest.java b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/request/DemandUpdateRequest.java index cd0d9061a5..3ad1e7850d 100644 --- a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/request/DemandUpdateRequest.java +++ b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/request/DemandUpdateRequest.java @@ -1,6 +1,6 @@ package io.metersphere.plugin.platform.dto.request; -import io.metersphere.plugin.platform.dto.reponse.TestCaseDemandDTO; +import io.metersphere.plugin.platform.dto.response.TestCaseDemandDTO; import lombok.Getter; import lombok.Setter; diff --git a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/request/PlatformBugUpdateRequest.java b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/request/PlatformBugUpdateRequest.java index 0f8223fcc9..ef5d46378b 100644 --- a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/request/PlatformBugUpdateRequest.java +++ b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/request/PlatformBugUpdateRequest.java @@ -1,7 +1,7 @@ package io.metersphere.plugin.platform.dto.request; -import io.metersphere.plugin.platform.dto.reponse.PlatformBugDTO; -import io.metersphere.plugin.platform.dto.reponse.PlatformStatusDTO; +import io.metersphere.plugin.platform.dto.response.PlatformBugDTO; +import io.metersphere.plugin.platform.dto.response.PlatformStatusDTO; import lombok.Getter; import lombok.Setter; diff --git a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/request/SyncBugRequest.java b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/request/SyncBugRequest.java index 750eaf59f3..82bdcf838f 100644 --- a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/request/SyncBugRequest.java +++ b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/request/SyncBugRequest.java @@ -1,6 +1,6 @@ package io.metersphere.plugin.platform.dto.request; -import io.metersphere.plugin.platform.dto.reponse.PlatformBugDTO; +import io.metersphere.plugin.platform.dto.response.PlatformBugDTO; import lombok.Data; import java.util.List; diff --git a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/request/SyncPostParamRequest.java b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/request/SyncPostParamRequest.java index d3d1235e71..2cada758dc 100644 --- a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/request/SyncPostParamRequest.java +++ b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/request/SyncPostParamRequest.java @@ -1,7 +1,7 @@ package io.metersphere.plugin.platform.dto.request; import io.metersphere.plugin.platform.dto.PlatformAttachment; -import io.metersphere.plugin.platform.dto.reponse.PlatformBugDTO; +import io.metersphere.plugin.platform.dto.response.PlatformBugDTO; import lombok.Data; import java.util.List; diff --git a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/MsSyncBugDTO.java b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/MsSyncBugDTO.java similarity index 96% rename from backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/MsSyncBugDTO.java rename to backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/MsSyncBugDTO.java index 43e0412cff..b19d425d12 100644 --- a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/MsSyncBugDTO.java +++ b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/MsSyncBugDTO.java @@ -1,4 +1,4 @@ -package io.metersphere.plugin.platform.dto.reponse; +package io.metersphere.plugin.platform.dto.response; import lombok.Data; diff --git a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/PlatformBugDTO.java b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/PlatformBugDTO.java similarity index 93% rename from backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/PlatformBugDTO.java rename to backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/PlatformBugDTO.java index 2a54b6f23b..9b37f31b06 100644 --- a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/PlatformBugDTO.java +++ b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/PlatformBugDTO.java @@ -1,4 +1,4 @@ -package io.metersphere.plugin.platform.dto.reponse; +package io.metersphere.plugin.platform.dto.response; import lombok.Data; diff --git a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/PlatformBugUpdateDTO.java b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/PlatformBugUpdateDTO.java similarity index 91% rename from backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/PlatformBugUpdateDTO.java rename to backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/PlatformBugUpdateDTO.java index 0e9fa09160..65fd435868 100644 --- a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/PlatformBugUpdateDTO.java +++ b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/PlatformBugUpdateDTO.java @@ -1,4 +1,4 @@ -package io.metersphere.plugin.platform.dto.reponse; +package io.metersphere.plugin.platform.dto.response; import lombok.Data; diff --git a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/PlatformCustomFieldDTO.java b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/PlatformCustomFieldDTO.java similarity index 91% rename from backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/PlatformCustomFieldDTO.java rename to backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/PlatformCustomFieldDTO.java index 2b34ce02ac..794c326808 100644 --- a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/PlatformCustomFieldDTO.java +++ b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/PlatformCustomFieldDTO.java @@ -1,4 +1,4 @@ -package io.metersphere.plugin.platform.dto.reponse; +package io.metersphere.plugin.platform.dto.response; import lombok.Data; diff --git a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/PlatformCustomFieldItemDTO.java b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/PlatformCustomFieldItemDTO.java similarity index 89% rename from backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/PlatformCustomFieldItemDTO.java rename to backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/PlatformCustomFieldItemDTO.java index 8e6ed1a435..9c8a98e831 100644 --- a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/PlatformCustomFieldItemDTO.java +++ b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/PlatformCustomFieldItemDTO.java @@ -1,4 +1,4 @@ -package io.metersphere.plugin.platform.dto.reponse; +package io.metersphere.plugin.platform.dto.response; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/PlatformDemandDTO.java b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/PlatformDemandDTO.java similarity index 94% rename from backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/PlatformDemandDTO.java rename to backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/PlatformDemandDTO.java index b5317757e6..2ce739a902 100644 --- a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/PlatformDemandDTO.java +++ b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/PlatformDemandDTO.java @@ -1,4 +1,4 @@ -package io.metersphere.plugin.platform.dto.reponse; +package io.metersphere.plugin.platform.dto.response; import lombok.Data; diff --git a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/PlatformStatusDTO.java b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/PlatformStatusDTO.java similarity index 68% rename from backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/PlatformStatusDTO.java rename to backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/PlatformStatusDTO.java index e8e1db08d0..267554d1f7 100644 --- a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/PlatformStatusDTO.java +++ b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/PlatformStatusDTO.java @@ -1,4 +1,4 @@ -package io.metersphere.plugin.platform.dto.reponse; +package io.metersphere.plugin.platform.dto.response; import lombok.Data; diff --git a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/TestCaseDemandDTO.java b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/TestCaseDemandDTO.java similarity index 80% rename from backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/TestCaseDemandDTO.java rename to backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/TestCaseDemandDTO.java index 24acbec392..0811d9c948 100644 --- a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/reponse/TestCaseDemandDTO.java +++ b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/dto/response/TestCaseDemandDTO.java @@ -1,4 +1,4 @@ -package io.metersphere.plugin.platform.dto.reponse; +package io.metersphere.plugin.platform.dto.response; import lombok.Getter; import lombok.Setter; diff --git a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/spi/Platform.java b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/spi/Platform.java index 13d6cb5332..0b13fe069f 100644 --- a/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/spi/Platform.java +++ b/backend/framework/plugin/plugin-platform-sdk/src/main/java/io/metersphere/plugin/platform/spi/Platform.java @@ -2,10 +2,10 @@ package io.metersphere.plugin.platform.spi; import io.metersphere.plugin.platform.dto.SelectOption; import io.metersphere.plugin.platform.dto.SyncBugResult; -import io.metersphere.plugin.platform.dto.reponse.PlatformBugUpdateDTO; -import io.metersphere.plugin.platform.dto.reponse.PlatformCustomFieldItemDTO; -import io.metersphere.plugin.platform.dto.reponse.PlatformDemandDTO; import io.metersphere.plugin.platform.dto.request.*; +import io.metersphere.plugin.platform.dto.response.PlatformBugUpdateDTO; +import io.metersphere.plugin.platform.dto.response.PlatformCustomFieldItemDTO; +import io.metersphere.plugin.platform.dto.response.PlatformDemandDTO; import io.metersphere.plugin.platform.utils.PluginPager; import org.pf4j.ExtensionPoint; diff --git a/backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugService.java b/backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugService.java index d451190a37..f6f83c9175 100644 --- a/backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugService.java +++ b/backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugService.java @@ -13,10 +13,10 @@ import io.metersphere.bug.mapper.*; import io.metersphere.bug.utils.ExportUtils; import io.metersphere.plugin.platform.dto.SelectOption; import io.metersphere.plugin.platform.dto.SyncBugResult; -import io.metersphere.plugin.platform.dto.reponse.PlatformBugDTO; -import io.metersphere.plugin.platform.dto.reponse.PlatformBugUpdateDTO; -import io.metersphere.plugin.platform.dto.reponse.PlatformCustomFieldItemDTO; import io.metersphere.plugin.platform.dto.request.*; +import io.metersphere.plugin.platform.dto.response.PlatformBugDTO; +import io.metersphere.plugin.platform.dto.response.PlatformBugUpdateDTO; +import io.metersphere.plugin.platform.dto.response.PlatformCustomFieldItemDTO; import io.metersphere.plugin.platform.enums.PlatformCustomFieldType; import io.metersphere.plugin.platform.enums.SyncAttachmentType; import io.metersphere.plugin.platform.spi.Platform; @@ -836,10 +836,10 @@ public class BugService { bugContent.setDescription(StringUtils.isEmpty(request.getDescription()) ? StringUtils.EMPTY : request.getDescription()); bugContentMapper.insert(bugContent); } else { - Bug orignalBug = checkBugExist(request.getId()); + Bug originalBug = checkBugExist(request.getId()); // 追加处理人 - if (!StringUtils.equals(orignalBug.getHandleUser(), bug.getHandleUser())) { - bug.setHandleUsers(orignalBug.getHandleUsers() + "," + bug.getHandleUser()); + if (!StringUtils.equals(originalBug.getHandleUser(), bug.getHandleUser())) { + bug.setHandleUsers(originalBug.getHandleUsers() + "," + bug.getHandleUser()); } bug.setUpdateUser(currentUser); bug.setUpdateTime(System.currentTimeMillis()); diff --git a/backend/services/bug-management/src/test/resources/file/metersphere-jira-test.jar b/backend/services/bug-management/src/test/resources/file/metersphere-jira-test.jar index fd55952f78..c216222434 100644 Binary files a/backend/services/bug-management/src/test/resources/file/metersphere-jira-test.jar and b/backend/services/bug-management/src/test/resources/file/metersphere-jira-test.jar differ diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalCaseDemandController.java b/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalCaseDemandController.java index 156d6a2074..ea9fdcf6be 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalCaseDemandController.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalCaseDemandController.java @@ -9,7 +9,7 @@ import io.metersphere.functional.request.FunctionalThirdDemandPageRequest; import io.metersphere.functional.request.QueryDemandListRequest; import io.metersphere.functional.service.FunctionalCaseDemandService; import io.metersphere.functional.service.FunctionalCaseLogService; -import io.metersphere.plugin.platform.dto.reponse.PlatformDemandDTO; +import io.metersphere.plugin.platform.dto.response.PlatformDemandDTO; import io.metersphere.plugin.platform.utils.PluginPager; import io.metersphere.sdk.constants.PermissionConstants; import io.metersphere.system.log.annotation.Log; diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseDemandService.java b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseDemandService.java index ac9c77896f..3f583e38b1 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseDemandService.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseDemandService.java @@ -10,8 +10,8 @@ import io.metersphere.functional.mapper.ExtFunctionalCaseMapper; import io.metersphere.functional.mapper.FunctionalCaseDemandMapper; import io.metersphere.functional.mapper.FunctionalCaseMapper; import io.metersphere.functional.request.*; -import io.metersphere.plugin.platform.dto.reponse.PlatformDemandDTO; import io.metersphere.plugin.platform.dto.request.DemandPageRequest; +import io.metersphere.plugin.platform.dto.response.PlatformDemandDTO; import io.metersphere.plugin.platform.spi.Platform; import io.metersphere.plugin.platform.utils.PluginPager; import io.metersphere.project.service.ProjectApplicationService; diff --git a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseDemandControllerTests.java b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseDemandControllerTests.java index 51d77fe502..985890afd4 100644 --- a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseDemandControllerTests.java +++ b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseDemandControllerTests.java @@ -7,7 +7,7 @@ import io.metersphere.functional.dto.FunctionalDemandDTO; import io.metersphere.functional.mapper.FunctionalCaseDemandMapper; import io.metersphere.functional.request.*; import io.metersphere.functional.service.FunctionalCaseDemandService; -import io.metersphere.plugin.platform.dto.reponse.PlatformDemandDTO; +import io.metersphere.plugin.platform.dto.response.PlatformDemandDTO; import io.metersphere.plugin.platform.utils.PluginPager; import io.metersphere.sdk.constants.SessionConstants; import io.metersphere.sdk.domain.OperationLog; diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/utils/CustomFieldUtils.java b/backend/services/system-setting/src/main/java/io/metersphere/system/utils/CustomFieldUtils.java index 40f8cd9948..3459265b58 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/utils/CustomFieldUtils.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/utils/CustomFieldUtils.java @@ -96,10 +96,10 @@ public class CustomFieldUtils { if (StringUtils.isEmpty(originalVal)) { return appendVal; } - List orignalList = JSON.parseArray(originalVal, String.class); + List originalList = JSON.parseArray(originalVal, String.class); List appendList = JSON.parseArray(appendVal, String.class); - orignalList.addAll(appendList); + originalList.addAll(appendList); // 追加后需去重 - return JSON.toJSONString(orignalList.stream().distinct().toList()); + return JSON.toJSONString(originalList.stream().distinct().toList()); } }