From bc18c5d8338dd2acb029afe55f4560fd055702b7 Mon Sep 17 00:00:00 2001 From: qinyouzeng Date: Fri, 24 Oct 2025 15:09:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0dcc=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=AA=8C=E8=AF=81=EF=BC=8C=E8=B0=83=E6=95=B4?= =?UTF-8?q?label=E5=94=AF=E4=B8=80=E6=80=A7=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/LabelDomainService.cs | 10 +++-- .../App/IAppConfigObjectRepository.cs | 2 +- .../App/IAppPinRepository.cs | 2 +- .../App/IBizConfigObjectRepository.cs | 2 +- .../App/IBizConfigRepository.cs | 2 +- .../App/IConfigObjectReleaseRepository.cs | 2 +- .../App/IConfigObjectRepository.cs | 2 +- .../App/IPublicConfigObjectRepository.cs | 2 +- .../App/IPublicConfigRepository.cs | 2 +- .../IRepositoryExtensition.cs | 11 ++++++ .../Label/ILabelRepository.cs | 2 +- .../App/AppConfigObjectRepository.cs | 2 +- .../Repositories/App/AppPinRepository.cs | 2 +- .../App/BizConfigObjectRepository.cs | 2 +- .../Repositories/App/BizConfigRepository.cs | 2 +- .../App/ConfigObjectReleaseRepository.cs | 2 +- .../App/ConfigObjectRepository.cs | 2 +- .../App/PublicConfigObjectRepository.cs | 2 +- .../App/PublicConfigRepository.cs | 2 +- .../Repositories/EFBaseRepository.cs | 21 ++++++++++ .../Repositories/Label/LabelRepository.cs | 2 +- .../App/Dtos/AddConfigObjectDto.cs | 9 +---- .../App/Dtos/AddConfigObjectReleaseDto.cs | 17 ++------- .../App/Dtos/AddObjectConfigDto.cs | 36 +++++++----------- .../Dtos/ConfigObjectPropertyContentDto.cs | 1 - .../Dtos/RollbackConfigObjectReleaseDto.cs | 15 +++----- .../App/Dtos/UpdateObjectConfigDto.cs | 6 --- .../App/Enums/ConfigObjectType.cs | 13 +++---- .../App/Enums/ReleaseType.cs | 15 ++++---- .../App/Enums/SecretType.cs | 15 ++++---- .../Label/Dtos/UpdateLabelDto.cs | 38 ++++++------------- .../Masa.Dcc.Contracts.Admin.csproj | 3 +- .../App/AddConfigObjectDtoValidator.cs | 15 ++++++++ .../AddConfigObjectReleaseDtoValidators.cs | 24 ++++++++++++ .../App/AddObjectConfigDtoValidator.cs | 20 ++++++++++ ...ConfigObjectPropertyContentDtoValidator.cs | 12 ++++++ ...RollbackConfigObjectReleaseDtoValidator.cs | 13 +++++++ .../App/UpdateObjectConfigDtoValidator.cs | 14 +++++++ .../Label/UpdateLabelDtoValidator.cs | 31 +++++++++++++++ .../Masa.Dcc.Contracts.Admin/_imports.cs | 5 ++- .../Masa.Dcc.Service/Assets/I18n/zh-CN.json | 3 +- .../Infrastructure/CustomResultFactory .cs | 15 ++++++++ .../Masa.Dcc.Service.Admin.csproj | 8 ++-- src/Services/Masa.Dcc.Service/Program.cs | 32 ++++++++++++---- .../Properties/launchSettings.json | 21 +++++++--- .../Masa.Dcc.Service/Services/AppService.cs | 14 +++---- .../Services/BizConfigService.cs | 8 ++-- .../Services/ClusterService.cs | 8 ++-- .../Services/ConfigObjectService.cs | 24 ++++++------ .../Services/EnvironmentService.cs | 4 +- .../Masa.Dcc.Service/Services/LabelService.cs | 10 ++--- .../Services/OpenApiService.cs | 8 ++-- .../Services/ProjectService.cs | 12 +++--- .../Services/PublicConfigService.cs | 10 ++--- src/Services/Masa.Dcc.Service/_Imports.cs | 2 +- 55 files changed, 358 insertions(+), 201 deletions(-) create mode 100644 Masa.Dcc.Infrastructure.Repository/IRepositoryExtensition.cs create mode 100644 Masa.Dcc.Infrastructure.Repository/Repositories/EFBaseRepository.cs create mode 100644 src/Contracts/Masa.Dcc.Contracts.Admin/Validators/App/AddConfigObjectDtoValidator.cs create mode 100644 src/Contracts/Masa.Dcc.Contracts.Admin/Validators/App/AddConfigObjectReleaseDtoValidators.cs create mode 100644 src/Contracts/Masa.Dcc.Contracts.Admin/Validators/App/AddObjectConfigDtoValidator.cs create mode 100644 src/Contracts/Masa.Dcc.Contracts.Admin/Validators/App/ConfigObjectPropertyContentDtoValidator.cs create mode 100644 src/Contracts/Masa.Dcc.Contracts.Admin/Validators/App/RollbackConfigObjectReleaseDtoValidator.cs create mode 100644 src/Contracts/Masa.Dcc.Contracts.Admin/Validators/App/UpdateObjectConfigDtoValidator.cs create mode 100644 src/Contracts/Masa.Dcc.Contracts.Admin/Validators/Label/UpdateLabelDtoValidator.cs create mode 100644 src/Services/Masa.Dcc.Service/Infrastructure/CustomResultFactory .cs diff --git a/Masa.Dcc.Infrastructure.Domain/Services/LabelDomainService.cs b/Masa.Dcc.Infrastructure.Domain/Services/LabelDomainService.cs index 36448dba..637b5372 100644 --- a/Masa.Dcc.Infrastructure.Domain/Services/LabelDomainService.cs +++ b/Masa.Dcc.Infrastructure.Domain/Services/LabelDomainService.cs @@ -27,10 +27,10 @@ public async Task AddLabelAsync(UpdateLabelDto labelDto) } else { - var label = await _labelRepository.FindAsync(x => x.TypeCode == labelDto.TypeCode); + var label = await _labelRepository.FindAsync(x => x.TypeCode == labelDto.TypeCode || x.TypeName == labelDto.TypeName); if (label is not null) { - throw new UserFriendlyException(_i18n.T("Duplicate label type code")); + throw new UserFriendlyException(_i18n.T(label.TypeCode == labelDto.TypeCode ? "Duplicate label type code" : "Duplicate label type name")); } List