From afe895b223c75df3af835f1ccf61c4f485a28a3b Mon Sep 17 00:00:00 2001 From: wangjun Date: Mon, 3 Jul 2023 18:18:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=B0=83=E6=95=B4=E5=A4=9A=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Lion/AbpPro/Core/CustomListResultDto.cs | 2 +- .../Lion/AbpPro/Core/CustomPagedResultDto.cs | 1 - .../Lion/AbpPro/Core/Guard.cs | 8 +- .../Lion/AbpPro/Core/PagingBase.cs | 23 +++-- .../AbpPro/AbpProLocalizationErrorCodes.cs | 8 ++ .../AbpPro/Localization/Resources/en.json | 5 +- .../Localization/Resources/zh-Hans.json | 5 +- .../Lion/AbpPro/AbpProLocalizationTests.cs | 10 +- .../GlobalUsings.cs | 3 + .../Dto/CreateOrganizationUnitInput.cs | 15 ++- .../Dto/UpdateOrganizationUnitInput.cs | 15 ++- .../Roles/Dtos/GetPermissionInput.cs | 24 ++++- .../Roles/Dtos/UpdateRolePermissionsInput.cs | 24 ++++- .../UpdateDefaultConnectionStringInput.cs | 16 ++- .../Tenants/Dtos/UpdateTenantInput.cs | 16 ++- .../Users/Dtos/LockUserInput.cs | 4 +- .../Users/Dtos/LoginGithubResponse.cs | 99 ------------------- .../Users/Dtos/LoginInput.cs | 13 ++- .../Users/Dtos/LoginStsResponse.cs | 21 ---- .../Dtos/CreateDataDictinaryDetailInput.cs | 27 ++++- .../Dtos/CreateDataDictinaryInput.cs | 24 ++++- .../Dtos/SetDataDictinaryDetailInput.cs | 6 +- .../Dtos/UpdateDataDictinaryInput.cs | 29 +++++- .../Dtos/UpdateDetailInput.cs | 24 +++-- .../GlobalUsings.cs | 3 + .../GlobalUsings.cs | 4 + .../LanguageTexts/CreateLanguageTextInput.cs | 79 ++++++++++----- .../LanguageTexts/UpdateLanguageTextInput.cs | 2 - .../Languages/CreateLanguageInput.cs | 80 ++++++++++----- .../Languages/UpdateLanguageInput.cs | 90 +++++++++++------ .../Localization/AbpPro/en.json | 15 +-- .../Localization/AbpPro/zh-Hans.json | 14 +-- 32 files changed, 413 insertions(+), 296 deletions(-) create mode 100644 aspnet-core/frameworks/src/Lion.AbpPro.Localization/Lion/AbpPro/AbpProLocalizationErrorCodes.cs delete mode 100644 aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/LoginGithubResponse.cs delete mode 100644 aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/LoginStsResponse.cs diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/CustomListResultDto.cs b/aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/CustomListResultDto.cs index 8e5e455d..8fa3600f 100644 --- a/aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/CustomListResultDto.cs +++ b/aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/CustomListResultDto.cs @@ -1,6 +1,6 @@ namespace Lion.AbpPro.Core; -[Serializable] + public class CustomListResultDto { public IReadOnlyList Items diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/CustomPagedResultDto.cs b/aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/CustomPagedResultDto.cs index 9c167a1c..92a602c8 100644 --- a/aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/CustomPagedResultDto.cs +++ b/aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/CustomPagedResultDto.cs @@ -1,6 +1,5 @@ namespace Lion.AbpPro.Core; -[Serializable] public class CustomPagedResultDto : CustomListResultDto { public long TotalCount { get; set; } diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/Guard.cs b/aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/Guard.cs index 8b9bd719..eb16bb94 100644 --- a/aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/Guard.cs +++ b/aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/Guard.cs @@ -112,9 +112,7 @@ public static class Guard /// /// /// 参数名称。 - public static Guid NotEmpty( - Guid value, - string valueName) + public static Guid NotEmpty(Guid value, string valueName) { if (value == Guid.Empty) { @@ -130,9 +128,7 @@ public static class Guard /// 集合项的类型。 /// /// 参数名称。 - public static void NotNullOrEmpty( - IReadOnlyList list, - string valueName) + public static void NotNullOrEmpty(IReadOnlyList list, string valueName) { if (null == list || !list.Any()) { diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/PagingBase.cs b/aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/PagingBase.cs index 33bbd28f..eb8bbac2 100644 --- a/aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/PagingBase.cs +++ b/aspnet-core/frameworks/src/Lion.AbpPro.Core/Lion/AbpPro/Core/PagingBase.cs @@ -1,3 +1,7 @@ +using Lion.AbpPro.Localization; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Localization; + namespace Lion.AbpPro.Core; /// @@ -6,7 +10,7 @@ namespace Lion.AbpPro.Core; public class PagingBase : IValidatableObject { public const int MaxPageSize = 100000; - + /// /// 当前页面.默认从1开始 /// @@ -16,7 +20,7 @@ public class PagingBase : IValidatableObject /// 每页多少条.每页显示多少记录 /// public int PageSize { get; set; } = 10; - + /// /// 跳过多少条 /// @@ -25,28 +29,29 @@ public class PagingBase : IValidatableObject protected PagingBase() { } - + public PagingBase(int pageIndex = 1, int pageSize = 10) { PageIndex = pageIndex; PageSize = pageSize; } - + public virtual IEnumerable Validate(ValidationContext validationContext) { + var localization = validationContext.GetRequiredService>(); if (PageIndex < 1) { yield return new ValidationResult( - "起始页必须大于等于1", - new[] { "PageIndex"} + localization[AbpProLocalizationErrorCodes.ErrorCode100001], + new[] { "PageIndex" } ); } - + if (PageSize > MaxPageSize) { yield return new ValidationResult( - $"每页最大记录数不能超过'{MaxPageSize}'", - new[] { "PageSize"} + localization[AbpProLocalizationErrorCodes.ErrorCode100002], + new[] { "PageSize" } ); } } diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.Localization/Lion/AbpPro/AbpProLocalizationErrorCodes.cs b/aspnet-core/frameworks/src/Lion.AbpPro.Localization/Lion/AbpPro/AbpProLocalizationErrorCodes.cs new file mode 100644 index 00000000..ec8f0133 --- /dev/null +++ b/aspnet-core/frameworks/src/Lion.AbpPro.Localization/Lion/AbpPro/AbpProLocalizationErrorCodes.cs @@ -0,0 +1,8 @@ +namespace Lion.AbpPro; + +public class AbpProLocalizationErrorCodes +{ + public const string ErrorCode100001 = AbpProLocalizationConsts.NameSpace + ":100001"; + public const string ErrorCode100002 = AbpProLocalizationConsts.NameSpace + ":100002"; + public const string ErrorCode100003 = AbpProLocalizationConsts.NameSpace + ":100003"; +} \ No newline at end of file diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.Localization/Lion/AbpPro/Localization/Resources/en.json b/aspnet-core/frameworks/src/Lion.AbpPro.Localization/Lion/AbpPro/Localization/Resources/en.json index 5dca3bc9..423998c3 100644 --- a/aspnet-core/frameworks/src/Lion.AbpPro.Localization/Lion/AbpPro/Localization/Resources/en.json +++ b/aspnet-core/frameworks/src/Lion.AbpPro.Localization/Lion/AbpPro/Localization/Resources/en.json @@ -2,6 +2,9 @@ "culture": "en", "texts": { "Welcome": "Welcome", - "Permission:Cap": "CAP Dashboard" + "Permission:Cap": "CAP Dashboard", + "Lion.AbpPro:100001": "The start page must be greater than or equal to 1", + "Lion.AbpPro:100002": "The maximum number of records per page cannot exceed 100,000", + "Lion.AbpPro:100003": "{0} can not be empty" } } diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.Localization/Lion/AbpPro/Localization/Resources/zh-Hans.json b/aspnet-core/frameworks/src/Lion.AbpPro.Localization/Lion/AbpPro/Localization/Resources/zh-Hans.json index 49131ee6..00607761 100644 --- a/aspnet-core/frameworks/src/Lion.AbpPro.Localization/Lion/AbpPro/Localization/Resources/zh-Hans.json +++ b/aspnet-core/frameworks/src/Lion.AbpPro.Localization/Lion/AbpPro/Localization/Resources/zh-Hans.json @@ -2,6 +2,9 @@ "culture": "zh-Hans", "texts": { "Welcome": "欢迎", - "Permission:Cap": "CAP面板" + "Permission:Cap": "CAP面板", + "Lion.AbpPro:100001": "起始页必须大于等于1", + "Lion.AbpPro:100002": "每页最大记录数不能超过100000", + "Lion.AbpPro:100003": "{0}不能为空" } } \ No newline at end of file diff --git a/aspnet-core/frameworks/test/Lion.AbpPro.Localization.Tests/Lion/AbpPro/AbpProLocalizationTests.cs b/aspnet-core/frameworks/test/Lion.AbpPro.Localization.Tests/Lion/AbpPro/AbpProLocalizationTests.cs index 4db9fc8a..cb6854d6 100644 --- a/aspnet-core/frameworks/test/Lion.AbpPro.Localization.Tests/Lion/AbpPro/AbpProLocalizationTests.cs +++ b/aspnet-core/frameworks/test/Lion.AbpPro.Localization.Tests/Lion/AbpPro/AbpProLocalizationTests.cs @@ -20,14 +20,16 @@ namespace Lion.AbpPro { using (CultureHelper.Use("en")) { - _stringLocalizer["Welcome"].Value - .ShouldBe("Welcome"); + _stringLocalizer["Welcome"].Value.ShouldBe("Welcome"); + _stringLocalizer[AbpProLocalizationErrorCodes.ErrorCode100001].Value.ShouldBe("The start page must be greater than or equal to 1"); + _stringLocalizer[AbpProLocalizationErrorCodes.ErrorCode100003,"Name"].Value.ShouldBe("Name can not be empty"); } using (CultureHelper.Use("zh-Hans")) { - _stringLocalizer["Welcome"].Value - .ShouldBe("欢迎"); + _stringLocalizer["Welcome"].Value.ShouldBe("欢迎"); + _stringLocalizer[AbpProLocalizationErrorCodes.ErrorCode100001].Value.ShouldBe("起始页必须大于等于1"); + _stringLocalizer[AbpProLocalizationErrorCodes.ErrorCode100003,"Name"].Value.ShouldBe("Name不能为空"); } } } diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/GlobalUsings.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/GlobalUsings.cs index 7562c69d..908a8b83 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/GlobalUsings.cs +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/GlobalUsings.cs @@ -4,6 +4,9 @@ global using System.ComponentModel.DataAnnotations; global using Lion.AbpPro.BasicManagement.OrganizationUnits.Dto; global using Lion.AbpPro.BasicManagement.Tenants.Dtos; global using Lion.AbpPro.Core; +global using Lion.AbpPro.Localization; +global using Microsoft.Extensions.DependencyInjection; +global using Microsoft.Extensions.Localization; global using Volo.Abp.Application.Dtos; global using Volo.Abp.Application.Services; global using Volo.Abp.AspNetCore.Mvc.MultiTenancy; diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/OrganizationUnits/Dto/CreateOrganizationUnitInput.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/OrganizationUnits/Dto/CreateOrganizationUnitInput.cs index 61a50586..c72fdf88 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/OrganizationUnits/Dto/CreateOrganizationUnitInput.cs +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/OrganizationUnits/Dto/CreateOrganizationUnitInput.cs @@ -1,9 +1,20 @@ namespace Lion.AbpPro.BasicManagement.OrganizationUnits.Dto; -public class CreateOrganizationUnitInput +public class CreateOrganizationUnitInput : IValidatableObject { - [Required] public string DisplayName { get; set; } public Guid? ParentId { get; set; } + + public IEnumerable Validate(ValidationContext validationContext) + { + var localization = validationContext.GetRequiredService>(); + if (DisplayName.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(DisplayName)], + new[] { nameof(DisplayName) } + ); + } + } } \ No newline at end of file diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/OrganizationUnits/Dto/UpdateOrganizationUnitInput.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/OrganizationUnits/Dto/UpdateOrganizationUnitInput.cs index 5246fb03..ca4474bb 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/OrganizationUnits/Dto/UpdateOrganizationUnitInput.cs +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/OrganizationUnits/Dto/UpdateOrganizationUnitInput.cs @@ -1,9 +1,20 @@ namespace Lion.AbpPro.BasicManagement.OrganizationUnits.Dto; -public class UpdateOrganizationUnitInput +public class UpdateOrganizationUnitInput : IValidatableObject { - [Required] public string DisplayName { get; set; } public Guid Id { get; set; } + + public IEnumerable Validate(ValidationContext validationContext) + { + var localization = validationContext.GetRequiredService>(); + if (DisplayName.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(DisplayName)], + new[] { nameof(DisplayName) } + ); + } + } } \ No newline at end of file diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Roles/Dtos/GetPermissionInput.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Roles/Dtos/GetPermissionInput.cs index c5766f96..8f1255d6 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Roles/Dtos/GetPermissionInput.cs +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Roles/Dtos/GetPermissionInput.cs @@ -1,10 +1,28 @@ namespace Lion.AbpPro.BasicManagement.Roles.Dtos { - public class GetPermissionInput + public class GetPermissionInput : IValidatableObject { - [Required] public string ProviderName { get; set; } - [Required] public string ProviderKey { get; set; } + + public IEnumerable Validate(ValidationContext validationContext) + { + var localization = validationContext.GetRequiredService>(); + if (ProviderName.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(ProviderName)], + new[] { nameof(ProviderName) } + ); + } + + if (ProviderKey.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(ProviderKey)], + new[] { nameof(ProviderKey) } + ); + } + } } } \ No newline at end of file diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Roles/Dtos/UpdateRolePermissionsInput.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Roles/Dtos/UpdateRolePermissionsInput.cs index 6844a7e4..70326a0e 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Roles/Dtos/UpdateRolePermissionsInput.cs +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Roles/Dtos/UpdateRolePermissionsInput.cs @@ -1,13 +1,31 @@ namespace Lion.AbpPro.BasicManagement.Roles.Dtos { - public class UpdateRolePermissionsInput + public class UpdateRolePermissionsInput : IValidatableObject { - [Required] public string ProviderName { get; set; } - [Required] public string ProviderKey { get; set; } public UpdatePermissionsDto UpdatePermissionsDto { get; set; } + + public IEnumerable Validate(ValidationContext validationContext) + { + var localization = validationContext.GetRequiredService>(); + if (ProviderName.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(ProviderName)], + new[] { nameof(ProviderName) } + ); + } + + if (ProviderKey.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(ProviderKey)], + new[] { nameof(ProviderKey) } + ); + } + } } } \ No newline at end of file diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Tenants/Dtos/UpdateDefaultConnectionStringInput.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Tenants/Dtos/UpdateDefaultConnectionStringInput.cs index e60de924..ae55048e 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Tenants/Dtos/UpdateDefaultConnectionStringInput.cs +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Tenants/Dtos/UpdateDefaultConnectionStringInput.cs @@ -1,8 +1,20 @@ namespace Lion.AbpPro.BasicManagement.Tenants.Dtos { - public class UpdateConnectionStringInput + public class UpdateConnectionStringInput : IValidatableObject { public Guid Id { get; set; } - [Required(ErrorMessage = "连接字符串不能为空")] public string ConnectionString { get; set; } + public string ConnectionString { get; set; } + + public IEnumerable Validate(ValidationContext validationContext) + { + var localization = validationContext.GetRequiredService>(); + if (ConnectionString.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(ConnectionString)], + new[] { nameof(ConnectionString) } + ); + } + } } } \ No newline at end of file diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Tenants/Dtos/UpdateTenantInput.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Tenants/Dtos/UpdateTenantInput.cs index 4aa78c29..4e6d3224 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Tenants/Dtos/UpdateTenantInput.cs +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Tenants/Dtos/UpdateTenantInput.cs @@ -1,9 +1,21 @@ namespace Lion.AbpPro.BasicManagement.Tenants.Dtos { - public class UpdateTenantInput + public class UpdateTenantInput : IValidatableObject { public Guid Id { get; set; } - [Required(ErrorMessage = "租户名称不能为空")] public string Name { get; set; } + public string Name { get; set; } + + public IEnumerable Validate(ValidationContext validationContext) + { + var localization = validationContext.GetRequiredService>(); + if (Name.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(Name)], + new[] { nameof(Name) } + ); + } + } } } \ No newline at end of file diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/LockUserInput.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/LockUserInput.cs index aa450ce5..3a6d67eb 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/LockUserInput.cs +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/LockUserInput.cs @@ -2,10 +2,8 @@ namespace Lion.AbpPro.BasicManagement.Users.Dtos { public class LockUserInput { - [Required] public Guid UserId { get; set; } - - [Required] + public bool Locked { get; set; } } } diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/LoginGithubResponse.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/LoginGithubResponse.cs deleted file mode 100644 index d4d02dee..00000000 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/LoginGithubResponse.cs +++ /dev/null @@ -1,99 +0,0 @@ -namespace Lion.AbpPro.BasicManagement.Users.Dtos; - -public class LoginGithubResponse -{ - public string login { get; set; } - - - public int id { get; set; } - - - public string node_id { get; set; } - - - public string avatar_url { get; set; } - - - public string gravatar_id { get; set; } - - - public string url { get; set; } - - - public string html_url { get; set; } - - - public string followers_url { get; set; } - - - public string following_url { get; set; } - - - public string gists_url { get; set; } - - - public string starred_url { get; set; } - - - public string subscriptions_url { get; set; } - - - public string organizations_url { get; set; } - - - public string repos_url { get; set; } - - - public string events_url { get; set; } - - - public string received_events_url { get; set; } - - - public string type { get; set; } - - - public string site_admin { get; set; } - - - public string name { get; set; } - - - public string company { get; set; } - - - public string blog { get; set; } - - - public string location { get; set; } - - - public string email { get; set; } - - - public string hireable { get; set; } - - - public string bio { get; set; } - - - public string twitter_username { get; set; } - - - public int public_repos { get; set; } - - - public int public_gists { get; set; } - - - public int followers { get; set; } - - - public int following { get; set; } - - - public string created_at { get; set; } - - - public string updated_at { get; set; } -} \ No newline at end of file diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/LoginInput.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/LoginInput.cs index 9b6ec59d..ac47072a 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/LoginInput.cs +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/LoginInput.cs @@ -21,15 +21,22 @@ namespace Lion.AbpPro.BasicManagement.Users.Dtos public IEnumerable Validate(ValidationContext validationContext) { + var localization = validationContext.GetRequiredService>(); if (Name.IsNullOrWhiteSpace()) { - yield return new ValidationResult("Email can not be null", new[] { "Email" }); + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(Name)], + new[] { "Name" } + ); } if (Password.IsNullOrWhiteSpace()) { - yield return new ValidationResult("Password can not be null", new[] { "Password" }); + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(Password)], + new[] { "Password" } + ); } } } -} +} \ No newline at end of file diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/LoginStsResponse.cs b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/LoginStsResponse.cs deleted file mode 100644 index 80af74ed..00000000 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Users/Dtos/LoginStsResponse.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace Lion.AbpPro.BasicManagement.Users.Dtos -{ - public class LoginStsResponse - { - public string name { get; set; } - - public string preferred_username { get; set; } - - public string family_name { get; set; } - - public string email { get; set; } - - public string given_name { get; set; } - - public string avatar { get; set; } - - public string sub { get; set; } - - public Guid? tenantId { get; set; } - } -} diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/CreateDataDictinaryDetailInput.cs b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/CreateDataDictinaryDetailInput.cs index 11f429ec..8bc83944 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/CreateDataDictinaryDetailInput.cs +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/CreateDataDictinaryDetailInput.cs @@ -1,14 +1,33 @@ namespace Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Dtos { - public class CreateDataDictinaryDetailInput + public class CreateDataDictinaryDetailInput : IValidatableObject { - [Required] public Guid Id { get; set; } - [Required] + public string Code { get; set; } - [Required] + public string DisplayText { get; set; } public string Description { get; set; } public int Order { get; set; } + + public IEnumerable Validate(ValidationContext validationContext) + { + var localization = validationContext.GetRequiredService>(); + if (Code.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(Code)], + new[] { nameof(Code) } + ); + } + + if (DisplayText.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(DisplayText)], + new[] { nameof(DisplayText) } + ); + } + } } } \ No newline at end of file diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/CreateDataDictinaryInput.cs b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/CreateDataDictinaryInput.cs index fc370761..377e1959 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/CreateDataDictinaryInput.cs +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/CreateDataDictinaryInput.cs @@ -1,11 +1,29 @@ namespace Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Dtos { - public class CreateDataDictinaryInput + public class CreateDataDictinaryInput : IValidatableObject { - [Required] public string Code { get; set; } - [Required] public string DisplayText { get; set; } public string Description { get; set; } + + public IEnumerable Validate(ValidationContext validationContext) + { + var localization = validationContext.GetRequiredService>(); + if (Code.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(Code)], + new[] { nameof(Code) } + ); + } + + if (DisplayText.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(DisplayText)], + new[] { nameof(DisplayText) } + ); + } + } } } \ No newline at end of file diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/SetDataDictinaryDetailInput.cs b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/SetDataDictinaryDetailInput.cs index 1e6a2663..72f59c28 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/SetDataDictinaryDetailInput.cs +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/SetDataDictinaryDetailInput.cs @@ -2,13 +2,11 @@ namespace Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Dtos { public class SetDataDictinaryDetailInput { - [Required] public Guid DataDictionaryId { get; set; } - [Required] + public Guid DataDictionayDetailId { get; set; } - [Required] - public bool IsEnabled { get; set; } + [Required] public bool IsEnabled { get; set; } } } \ No newline at end of file diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/UpdateDataDictinaryInput.cs b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/UpdateDataDictinaryInput.cs index deea9837..fa65c4f4 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/UpdateDataDictinaryInput.cs +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/UpdateDataDictinaryInput.cs @@ -1,13 +1,32 @@ namespace Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Dtos { - public class UpdateDataDictinaryInput + public class UpdateDataDictinaryInput : IValidatableObject { - [Required] public Guid Id { get; set; } - [Required] + public string Code { get; set; } - [Required] + public string DisplayText { get; set; } public string Description { get; set; } + + public IEnumerable Validate(ValidationContext validationContext) + { + var localization = validationContext.GetRequiredService>(); + if (Code.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(Code)], + new[] { nameof(Code) } + ); + } + + if (DisplayText.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(DisplayText)], + new[] { nameof(DisplayText) } + ); + } + } } -} +} \ No newline at end of file diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/UpdateDetailInput.cs b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/UpdateDetailInput.cs index 8a83abdf..10023acd 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/UpdateDetailInput.cs +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/DataDictionaries/Dtos/UpdateDetailInput.cs @@ -1,16 +1,28 @@ namespace Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Dtos { - public class UpdateDetailInput + public class UpdateDetailInput : IValidatableObject { - [Required] public Guid DataDictionaryId { get; set; } + public Guid DataDictionaryId { get; set; } - [Required] public Guid Id { get; set; } + public Guid Id { get; set; } - [Required] public string DisplayText { get; set; } + public string DisplayText { get; set; } public string Description { get; set; } public int Order { get; set; } - } -} + public IEnumerable Validate(ValidationContext validationContext) + { + var localization = validationContext.GetRequiredService>(); + + if (DisplayText.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(DisplayText)], + new[] { nameof(DisplayText) } + ); + } + } + } +} \ No newline at end of file diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/GlobalUsings.cs b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/GlobalUsings.cs index f863732f..ef7477b5 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/GlobalUsings.cs +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/GlobalUsings.cs @@ -10,6 +10,9 @@ global using System.Threading.Tasks; global using Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Dtos; global using Lion.AbpPro.DataDictionaryManagement.Localization; global using Lion.AbpPro.Core; +global using Lion.AbpPro.Localization; +global using Microsoft.Extensions.DependencyInjection; +global using Microsoft.Extensions.Localization; global using Volo.Abp.Application; global using Volo.Abp.Application.Dtos; global using Volo.Abp.Application.Services; diff --git a/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/GlobalUsings.cs b/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/GlobalUsings.cs index 6812945b..61f55d33 100644 --- a/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/GlobalUsings.cs +++ b/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/GlobalUsings.cs @@ -2,12 +2,16 @@ global using System; global using System.Collections.Generic; +global using System.ComponentModel.DataAnnotations; global using System.Linq; global using System.Text; global using System.Threading; global using System.Threading.Tasks; global using Lion.AbpPro.Core; global using Lion.AbpPro.LanguageManagement.Localization; +global using Lion.AbpPro.Localization; +global using Microsoft.Extensions.DependencyInjection; +global using Microsoft.Extensions.Localization; global using Volo.Abp.Application; global using Volo.Abp.Application.Dtos; global using Volo.Abp.Application.Services; diff --git a/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/LanguageTexts/CreateLanguageTextInput.cs b/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/LanguageTexts/CreateLanguageTextInput.cs index 4514d4c3..4841741c 100644 --- a/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/LanguageTexts/CreateLanguageTextInput.cs +++ b/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/LanguageTexts/CreateLanguageTextInput.cs @@ -1,30 +1,63 @@ -using System.ComponentModel.DataAnnotations; - namespace Lion.AbpPro.LanguageManagement.LanguageTexts; /// /// 创建语言文本 /// -public class CreateLanguageTextInput +public class CreateLanguageTextInput : IValidatableObject { - /// - /// 资源名称 - /// - [Required(ErrorMessage = "资源名称不能为空")] - public string ResourceName { get; set; } - /// - /// 语言名称 - /// - [Required(ErrorMessage = "语言名称不能为空")] - public string CultureName { get; set; } - /// - /// 名称 - /// - [Required(ErrorMessage = "名称不能为空")] - public string Name { get; set; } - /// - /// 值 - /// - [Required(ErrorMessage = "值不能为空")] - public string Value { get; set; } + /// + /// 资源名称 + /// + public string ResourceName { get; set; } + + /// + /// 语言名称 + /// + public string CultureName { get; set; } + + /// + /// 名称 + /// + public string Name { get; set; } + + /// + /// 值 + /// + public string Value { get; set; } + + public IEnumerable Validate(ValidationContext validationContext) + { + var localization = validationContext.GetRequiredService>(); + if (CultureName.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(CultureName)], + new[] { nameof(CultureName) } + ); + } + + if (ResourceName.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(ResourceName)], + new[] { nameof(ResourceName) } + ); + } + + if (Name.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(Name)], + new[] { nameof(Name) } + ); + } + + if (Value.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(Value)], + new[] { nameof(Value) } + ); + } + } } \ No newline at end of file diff --git a/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/LanguageTexts/UpdateLanguageTextInput.cs b/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/LanguageTexts/UpdateLanguageTextInput.cs index 1a7706aa..e15efef9 100644 --- a/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/LanguageTexts/UpdateLanguageTextInput.cs +++ b/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/LanguageTexts/UpdateLanguageTextInput.cs @@ -1,5 +1,3 @@ -using System.ComponentModel.DataAnnotations; - namespace Lion.AbpPro.LanguageManagement.LanguageTexts; /// diff --git a/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/Languages/CreateLanguageInput.cs b/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/Languages/CreateLanguageInput.cs index d1d635dc..b0dd575b 100644 --- a/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/Languages/CreateLanguageInput.cs +++ b/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/Languages/CreateLanguageInput.cs @@ -1,34 +1,60 @@ -using System.ComponentModel.DataAnnotations; - namespace Lion.AbpPro.LanguageManagement.Languages; /// /// 创建语言 /// -public class CreateLanguageInput +public class CreateLanguageInput : IValidatableObject { - /// - /// 语言名称 - /// - [Required(ErrorMessage = "语言名称不能为空")] - public string CultureName { get; set; } - /// - /// Ui语言名称 - /// - [Required(ErrorMessage = "Ui语言名称不能为空")] - public string UiCultureName { get; set; } - /// - /// 显示名称 - /// - [Required(ErrorMessage = "显示名称不能为空")] - public string DisplayName { get; set; } - /// - /// 图标 - /// - public string FlagIcon { get; set; } - /// - /// 是否启用 - /// - [Required(ErrorMessage = "是否启用不能为空")] - public bool IsEnabled { get; set; } + /// + /// 语言名称 + /// + public string CultureName { get; set; } + + /// + /// Ui语言名称 + /// + public string UiCultureName { get; set; } + + /// + /// 显示名称 + /// + public string DisplayName { get; set; } + + /// + /// 图标 + /// + public string FlagIcon { get; set; } + + /// + /// 是否启用 + /// + public bool IsEnabled { get; set; } + + public IEnumerable Validate(ValidationContext validationContext) + { + var localization = validationContext.GetRequiredService>(); + if (CultureName.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(CultureName)], + new[] { nameof(CultureName) } + ); + } + + if (UiCultureName.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(UiCultureName)], + new[] { nameof(UiCultureName) } + ); + } + + if (DisplayName.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(DisplayName)], + new[] { nameof(DisplayName) } + ); + } + } } \ No newline at end of file diff --git a/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/Languages/UpdateLanguageInput.cs b/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/Languages/UpdateLanguageInput.cs index ab30de3f..9321ac44 100644 --- a/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/Languages/UpdateLanguageInput.cs +++ b/aspnet-core/modules/LanguageManagement/src/Lion.AbpPro.LanguageManagement.Application.Contracts/Languages/UpdateLanguageInput.cs @@ -1,39 +1,65 @@ -using System.ComponentModel.DataAnnotations; - namespace Lion.AbpPro.LanguageManagement.Languages; /// /// 删除语言 /// -public class UpdateLanguageInput +public class UpdateLanguageInput : IValidatableObject { - /// - /// 语言Id - /// - public Guid Id { get; set; } - - /// - /// 语言名称 - /// - [Required(ErrorMessage = "语言名称不能为空")] - public string CultureName { get; set; } - /// - /// Ui语言名称 - /// - [Required(ErrorMessage = "Ui语言名称不能为空")] - public string UiCultureName { get; set; } - /// - /// 显示名称 - /// - [Required(ErrorMessage = "显示名称不能为空")] - public string DisplayName { get; set; } - /// - /// 图标 - /// - public string FlagIcon { get; set; } - /// - /// 是否启用 - /// - [Required(ErrorMessage = "是否启用不能为空")] - public bool IsEnabled { get; set; } + /// + /// 语言Id + /// + public Guid Id { get; set; } + + /// + /// 语言名称 + /// + public string CultureName { get; set; } + + /// + /// Ui语言名称 + /// + public string UiCultureName { get; set; } + + /// + /// 显示名称 + /// + public string DisplayName { get; set; } + + /// + /// 图标 + /// + public string FlagIcon { get; set; } + + /// + /// 是否启用 + /// + public bool IsEnabled { get; set; } + + public IEnumerable Validate(ValidationContext validationContext) + { + var localization = validationContext.GetRequiredService>(); + if (CultureName.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(CultureName)], + new[] { nameof(CultureName) } + ); + } + + if (UiCultureName.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(UiCultureName)], + new[] { nameof(UiCultureName) } + ); + } + + if (DisplayName.IsNullOrWhiteSpace()) + { + yield return new ValidationResult( + localization[AbpProLocalizationErrorCodes.ErrorCode100003, nameof(DisplayName)], + new[] { nameof(DisplayName) } + ); + } + } } \ No newline at end of file diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Localization/AbpPro/en.json b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Localization/AbpPro/en.json index c9f09cf0..a6302f74 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Localization/AbpPro/en.json +++ b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Localization/AbpPro/en.json @@ -24,19 +24,6 @@ "Description:Setting.Group.Other.Github": "Github", "Enum:TestType:Created:1":"Created", "Enum:TestType:Cancel:1":"Cancel", - "Enum:TestType:Delete:1":"Delete", - - "Lion.AbpPro:100001": "OrganizationUnit Not Exist", - "Lion.AbpPro:100002": "UserLockedOut", - "Lion.AbpPro:100003": "UserOrPasswordMismatch", - "Lion.AbpPro:100004": "ApiResource Not Exist", - "Lion.AbpPro:100005": "ApiResource Exist", - "Lion.AbpPro:100006": "ApiScope Not Exist", - "Lion.AbpPro:100007": "ApiScope Exist", - "Lion.AbpPro:100008": "ApiClient Not Exist", - "Lion.AbpPro:100009": "ApiClient Exist", - "Lion.AbpPro:100010": "IdentityResource Not Exist", - "Lion.AbpPro:100011": "IdentityResource Exist" - + "Enum:TestType:Delete:1":"Delete" } } diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Localization/AbpPro/zh-Hans.json b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Localization/AbpPro/zh-Hans.json index 978f8ee5..b8e4daa8 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Localization/AbpPro/zh-Hans.json +++ b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Localization/AbpPro/zh-Hans.json @@ -25,18 +25,6 @@ "Description:Setting.Group.Other.Github": "Github", "Enum:TestType:Created:1":"创建", "Enum:TestType:Cancel:1":"取消", - "Enum:TestType:Delete:1":"删除", - - "Lion.AbpPro:100001": "组织机构不存在", - "Lion.AbpPro:100002": "用户被锁定", - "Lion.AbpPro:100003": "用户名或者密码错误", - "Lion.AbpPro:100004": "ApiResource不存在", - "Lion.AbpPro:100005": "ApiResource 已存在", - "Lion.AbpPro:100006": "ApiScope 不存在", - "Lion.AbpPro:100007": "ApiScope 已存在", - "Lion.AbpPro:100008": "ApiClient 不存在", - "Lion.AbpPro:100009": "ApiClient 已存在", - "Lion.AbpPro:100010": "IdentityResource 不存在", - "Lion.AbpPro:100011": "IdentityResource 已存在" + "Enum:TestType:Delete:1":"删除" } } \ No newline at end of file