Browse Source

✨ 添加枚举本地化功能

✨ 升级Abp5.0之后AbpUser.IsActive默认设置为True
pull/27/head 5.0.0.3
王军 5 years ago
parent
commit
15db06116f
  1. 2
      aspnet-core/Directory.Build.props
  2. 2
      aspnet-core/services/src/Lion.AbpPro.Application/Users/UserAppService.cs
  3. 11
      aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Lion.AbpPro.Domain.Shared.csproj
  4. 5
      aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Localization/AbpPro/en.json
  5. 5
      aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Localization/AbpPro/zh-Hans.json
  6. 5
      aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Localization/LocalizationHelper.cs
  7. 18
      aspnet-core/services/test/Lion.AbpPro.Domain.Tests/Localizations/LocalizationHelper_Tests.cs
  8. 9
      aspnet-core/services/test/Lion.AbpPro.Domain.Tests/Localizations/TestType.cs

2
aspnet-core/Directory.Build.props

@ -10,7 +10,7 @@
<MicrosoftNETTestSdkVersion>17.0.0</MicrosoftNETTestSdkVersion>
<FreeSqlVersion>2.5.200</FreeSqlVersion>
<MiniProfilerVersion>4.2.22</MiniProfilerVersion>
<MicrosoftAspNetCoreHttpAbstractionsVersion>2.2.0</MicrosoftAspNetCoreHttpAbstractionsVersion>
<SerilogVersion>2.10.0</SerilogVersion>
<SerilogExtensionsLoggingVersion>3.0.1</SerilogExtensionsLoggingVersion>
<SerilogSinksAsyncVersion>1.4.0</SerilogSinksAsyncVersion>

2
aspnet-core/services/src/Lion.AbpPro.Application/Users/UserAppService.cs

@ -66,6 +66,8 @@ namespace Lion.AbpPro.Users
[Authorize(IdentityPermissions.Users.Create)]
public async Task<IdentityUserDto> CreateAsync(IdentityUserCreateDto input)
{
// abp 5.0 之后新增字段,是否运行用户登录,默认设置为true
input.IsActive = true;
return await _identityUserAppService.CreateAsync(input);
}

11
aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Lion.AbpPro.Domain.Shared.csproj

@ -9,6 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(MicrosoftAspNetCoreHttpAbstractionsVersion)" />
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="$(AbpPackageVersion)" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="$(AbpPackageVersion)" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="$(AbpPackageVersion)" />
@ -31,14 +32,4 @@
<ProjectReference Include="..\..\..\frameworks\Extensions\src\Lion.AbpPro.Extension\Lion.AbpPro.Extension.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Http.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
<HintPath>C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App\6.0.0\Microsoft.AspNetCore.Http.Abstractions.dll</HintPath>
</Reference>
</ItemGroup>
</Project>

5
aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Localization/AbpPro/en.json

@ -24,6 +24,9 @@
"Setting.Group.System": "System",
"Setting.Group.Other": "Other",
"DisplayName:Setting.Group.Other.Github": "Github",
"Description:Setting.Group.Other.Github": "Github"
"Description:Setting.Group.Other.Github": "Github",
"Enum:TestType:Created:1":"Created",
"Enum:TestType:Cancel:1":"Cancel",
"Enum:TestType:Delete:1":"Delete"
}
}

5
aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Localization/AbpPro/zh-Hans.json

@ -24,6 +24,9 @@
"Setting.Group.System": "系统",
"Setting.Group.Other": "其它",
"DisplayName:Setting.Group.Other.Github": "Github",
"Description:Setting.Group.Other.Github": "Github"
"Description:Setting.Group.Other.Github": "Github",
"Enum:TestType:Created:1":"创建",
"Enum:TestType:Cancel:1":"取消",
"Enum:TestType:Delete:1":"删除"
}
}

5
aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Localization/LocalizationHelper.cs

@ -1,9 +1,10 @@
using System;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Localization;
using Volo.Abp;
using Volo.Abp.DependencyInjection;
using Microsoft.AspNetCore.Builder;
namespace Lion.AbpPro.Localization
{
@ -46,7 +47,7 @@ namespace Lion.AbpPro.Localization
}
return StringLocalizerFactory.CreateDefaultOrNull() ??
throw new AbpException(message: L["YH.Bee.Abp:0010"]);
throw new AbpException(message: "Localizer is null");
}

18
aspnet-core/services/test/Lion.AbpPro.Domain.Tests/Localizations/LocalizationHelper_Tests.cs

@ -24,5 +24,23 @@ namespace Lion.AbpPro.Localizations
enValue.Value.ShouldBe("欢迎");
}
}
[Fact]
public void Test_ToLocalicationDescription_L_OK()
{
var test = new {TestType=TestType.Cancel};
using (CultureHelper.Use("en"))
{
var enValue = test.TestType.ToLocalicationDescription();
enValue.ShouldBe("Cancel");
}
using (CultureHelper.Use("zh-Hans"))
{
var enValue = test.TestType.ToLocalicationDescription();
enValue.ShouldBe("取消");
}
}
}
}

9
aspnet-core/services/test/Lion.AbpPro.Domain.Tests/Localizations/TestType.cs

@ -0,0 +1,9 @@
namespace Lion.AbpPro.Localizations
{
public enum TestType
{
Created,
Cancel,
Delete
}
}
Loading…
Cancel
Save