diff --git a/aspnet-core/Directory.Build.props b/aspnet-core/Directory.Build.props index 5c5288a1..cafa1cc8 100644 --- a/aspnet-core/Directory.Build.props +++ b/aspnet-core/Directory.Build.props @@ -1,7 +1,7 @@  - 5.1.3 + 5.1.4 6.0.0 6.0.0 6.0.0-preview.4.21253.7 diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Dockerfile b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Dockerfile index 073f07bd..ab4ea1c7 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Dockerfile +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Dockerfile @@ -5,9 +5,19 @@ RUN mkdir /app COPY publish /app -# 这里速度会有点慢，可以打包自己的下边镜像底包 -RUN apt-get update -y && apt-get install -y libgdiplus && apt-get clean && ln -s /usr/lib/libgdiplus.so /usr/lib/gdiplus.dll - +RUN echo "deb http://mirrors.aliyun.com/debian/ bullseye main non-free contrib" > /etc/apt/sources.list && \ + echo "deb-src http://mirrors.aliyun.com/debian/ bullseye main non-free contrib" >> /etc/apt/sources.list && \ + echo "deb http://mirrors.aliyun.com/debian-security/ bullseye-security main" >> /etc/apt/sources.list && \ + echo "deb-src http://mirrors.aliyun.com/debian-security/ bullseye-security main" >> /etc/apt/sources.list && \ + echo "deb http://mirrors.aliyun.com/debian/ bullseye-updates main non-free contrib" >> /etc/apt/sources.list && \ + echo "deb-src http://mirrors.aliyun.com/debian/ bullseye-updates main non-free contrib" >> /etc/apt/sources.list && \ + echo "deb http://mirrors.aliyun.com/debian/ bullseye-backports main non-free contrib" >> /etc/apt/sources.list && \ + echo "deb-src http://mirrors.aliyun.com/debian/ bullseye-backports main non-free contrib" >> /etc/apt/sources.list && \ + apt-get update && \ + apt-get install libgdiplus libc6-dev -y && \ + ln -s /usr/lib/libgdiplus.so /usr/lib/gdiplus.dll && \ + ln -s /usr/lib/x86_64-linux-gnu/libdl.so /usr/lib/libdl.dll && apt-get clean + # 设置工作目录 WORKDIR /app diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/Settings/SettingAppService.cs b/aspnet-core/services/src/Lion.AbpPro.Application/Settings/SettingAppService.cs index 5bfdacdf..e9fe92ab 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/Settings/SettingAppService.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/Settings/SettingAppService.cs @@ -51,12 +51,11 @@ namespace Lion.AbpPro.Settings var currentSettings = settings.Where(e => e.Properties.ContainsValue(item.Group)); foreach (var itemDefinition in currentSettings) { - var value = await SettingProvider.GetOrNullAsync(itemDefinition.Name); var type = itemDefinition.Properties .FirstOrDefault(f => f.Key == AbpProSettings.ControlType.Default).Value .ToString(); - + item.SettingItemOutput.Add(new SettingItemOutput( itemDefinition.Name, itemDefinition.DisplayName.Localize(_factory), @@ -98,13 +97,13 @@ namespace Lion.AbpPro.Settings return _settingManager.SetForCurrentUserAsync(setting.Name, value); } - if (setting.Providers.Any(p => p == GlobalSettingValueProvider.ProviderName)) + if (setting.Providers.Any(p => p == TenantSettingValueProvider.ProviderName)) { - return _settingManager.SetGlobalAsync(setting.Name, value); + return _settingManager.SetForCurrentTenantAsync(setting.Name, value); } - //Default - return _settingManager.SetForCurrentTenantAsync(setting.Name, value); + + return _settingManager.SetGlobalAsync(setting.Name, value); } } } \ No newline at end of file diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/Users/UserAppService.cs b/aspnet-core/services/src/Lion.AbpPro.Application/Users/UserAppService.cs index bbd29432..3125eb4f 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/Users/UserAppService.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/Users/UserAppService.cs @@ -10,6 +10,7 @@ using Magicodes.ExporterAndImporter.Excel.AspNetCore; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Options; using Volo.Abp; using Volo.Abp.Account; using Volo.Abp.Application.Dtos; @@ -25,16 +26,20 @@ namespace Lion.AbpPro.Users private readonly IdentityUserManager _userManager; private readonly IIdentityUserRepository _identityUserRepository; private readonly IExcelExporter _excelExporter; + private readonly IOptions _options; + public UserAppService( IIdentityUserAppService identityUserAppService, IdentityUserManager userManager, IIdentityUserRepository userRepository, - IExcelExporter excelExporter) + IExcelExporter excelExporter, + IOptions options) { _identityUserAppService = identityUserAppService; _userManager = userManager; _identityUserRepository = userRepository; _excelExporter = excelExporter; + _options = options; } /// @@ -131,6 +136,7 @@ namespace Lion.AbpPro.Users /// public async Task ChangePasswordAsync(ChangePasswordInput input) { + await _options.SetAsync(); var identityUser = await _userManager.GetByIdAsync(base.CurrentUser.GetId()); IdentityResult result; if (identityUser.PasswordHash == null) diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/AbpProDomainSharedModule.cs b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/AbpProDomainSharedModule.cs index f52d49ef..42ae4d33 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/AbpProDomainSharedModule.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/AbpProDomainSharedModule.cs @@ -17,6 +17,7 @@ using Volo.Abp.Localization.Resources.AbpLocalization; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement; using Volo.Abp.SettingManagement; +using Volo.Abp.SettingManagement.Localization; using Volo.Abp.TenantManagement; using Volo.Abp.Threading; using Volo.Abp.Timing.Localization.Resources.AbpTiming; @@ -57,11 +58,12 @@ namespace Lion.AbpPro { options.Resources .Add("zh-Hans") + .AddVirtualJson("/Localization/AbpPro") + .AddBaseTypes(typeof(IdentityResource)) .AddBaseTypes(typeof(AbpValidationResource)) .AddBaseTypes(typeof(AbpLocalizationResource)) - .AddBaseTypes(typeof(IdentityResource)) .AddBaseTypes(typeof(AbpTimingResource)) - .AddVirtualJson("/Localization/AbpPro"); + .AddBaseTypes(typeof(AbpSettingManagementResource)); options.DefaultResourceType = typeof(AbpProResource); }); @@ -70,8 +72,6 @@ namespace Lion.AbpPro { options.MapCodeNamespace("AbpPro", typeof(AbpProResource)); }); - - }