diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cbddf3269..c8ca56284 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: "Tagged Release" on: push: - branches: [ rel-7.2.1 ] + branches: [ rel-7.2.2 ] jobs: tagged-release: @@ -14,4 +14,4 @@ jobs: with: repo_token: "${{ secrets.GITHUB_TOKEN }}" prerelease: false - automatic_release_tag: "7.2.1" + automatic_release_tag: "7.2.2" diff --git a/aspnet-core/Directory.Build.props b/aspnet-core/Directory.Build.props index f607b9b3c..91e4288ca 100644 --- a/aspnet-core/Directory.Build.props +++ b/aspnet-core/Directory.Build.props @@ -1,8 +1,8 @@  - 7.2.1 + 7.2.2 2.0.1 - 7.2.1 + 7.2.2 1.10.0 1.0.2 7.1.0 diff --git a/aspnet-core/common.props b/aspnet-core/common.props index b3c1c77f3..4b18bfb25 100644 --- a/aspnet-core/common.props +++ b/aspnet-core/common.props @@ -1,7 +1,7 @@ latest - 7.2.1 + 7.2.2 colin $(NoWarn);CS1591;CS0436;CS8618;NU1803 https://github.com/colinin/abp-next-admin diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/AccountUrlNames.cs b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/AccountUrlNames.cs index b096a0ba8..e09c4c583 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/AccountUrlNames.cs +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN/Abp/Account/AccountUrlNames.cs @@ -3,4 +3,5 @@ public static class AccountUrlNames { public const string EmailConfirm = "Abp.Account.EmailConfirm"; + public const string EmailVerifyLogin = "Abp.Account.EmailVerifyLogin"; } diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Emailing/LINGYUN/Abp/Notifications/Emailing/EmailingNotificationPublishProvider.cs b/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Emailing/LINGYUN/Abp/Notifications/Emailing/EmailingNotificationPublishProvider.cs index 05968a009..9374df730 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Emailing/LINGYUN/Abp/Notifications/Emailing/EmailingNotificationPublishProvider.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Emailing/LINGYUN/Abp/Notifications/Emailing/EmailingNotificationPublishProvider.cs @@ -66,11 +66,31 @@ public class EmailingNotificationPublishProvider : NotificationPublishProvider { var titleInfo = notification.Data.TryGetData("title").As(); var titleLocalizer = await LocalizerFactory.CreateByResourceNameAsync(titleInfo.ResourceName); - var title = titleLocalizer[titleInfo.Name, titleInfo.Values].Value; + var title = titleLocalizer[titleInfo.Name].Value; + if (titleInfo.Values != null) + { + foreach (var formatTitle in titleInfo.Values) + { + if (formatTitle.Key != null && formatTitle.Value != null) + { + title = title.Replace($"{{{formatTitle.Key}}}", formatTitle.Value.ToString()); + } + } + } var messageInfo = notification.Data.TryGetData("message").As(); var messageLocalizer = await LocalizerFactory.CreateByResourceNameAsync(messageInfo.ResourceName); - var message = messageLocalizer[messageInfo.Name, messageInfo.Values].Value; + var message = messageLocalizer[messageInfo.Name].Value; + if (messageInfo.Values != null) + { + foreach (var formatMessage in messageInfo.Values) + { + if (formatMessage.Key != null && formatMessage.Value != null) + { + message = message.Replace($"{{{formatMessage.Key}}}", formatMessage.Value.ToString()); + } + } + } await EmailSender.SendAsync(emailAddress, title, message); } diff --git a/aspnet-core/modules/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN/Abp/AuditLogging/Serilog/Elasticsearch/SerilogElasticsearchLoggingManager.cs b/aspnet-core/modules/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN/Abp/AuditLogging/Serilog/Elasticsearch/SerilogElasticsearchLoggingManager.cs index f9e744c5c..5bb151cf2 100644 --- a/aspnet-core/modules/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN/Abp/AuditLogging/Serilog/Elasticsearch/SerilogElasticsearchLoggingManager.cs +++ b/aspnet-core/modules/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN/Abp/AuditLogging/Serilog/Elasticsearch/SerilogElasticsearchLoggingManager.cs @@ -379,19 +379,19 @@ namespace LINGYUN.Abp.Logging.Serilog.Elasticsearch private readonly static IDictionary _fieldMaps = new Dictionary(StringComparer.InvariantCultureIgnoreCase) { { "timestamp", "@timestamp" }, - { "level", "level.keyword" }, - { "machinename", $"fields.{AbpLoggingEnricherPropertyNames.MachineName}.keyword" }, - { "environment", $"fields.{AbpLoggingEnricherPropertyNames.EnvironmentName}.keyword" }, - { "application", $"fields.{AbpSerilogEnrichersConsts.ApplicationNamePropertyName}.keyword" }, - { "context", "fields.Context.keyword" }, - { "actionid", "fields.ActionId.keyword" }, - { "actionname", "fields.ActionName.keyword" }, - { "requestid", "fields.RequestId.keyword" }, - { "requestpath", "fields.RequestPath.keyword" }, - { "connectionid", "fields.ConnectionId.keyword" }, - { "correlationid", "fields.CorrelationId.keyword" }, - { "clientid", "fields.ClientId.keyword" }, - { "userid", "fields.UserId.keyword" }, + { "level", "level.raw" }, + { "machinename", $"fields.{AbpLoggingEnricherPropertyNames.MachineName}.raw" }, + { "environment", $"fields.{AbpLoggingEnricherPropertyNames.EnvironmentName}.raw" }, + { "application", $"fields.{AbpSerilogEnrichersConsts.ApplicationNamePropertyName}.raw" }, + { "context", "fields.SourceContext.raw" }, + { "actionid", "fields.ActionId.raw" }, + { "actionname", "fields.ActionName.raw" }, + { "requestid", "fields.RequestId.raw" }, + { "requestpath", "fields.RequestPath" }, + { "connectionid", "fields.ConnectionId" }, + { "correlationid", "fields.CorrelationId.raw" }, + { "clientid", "fields.ClientId.raw" }, + { "userid", "fields.UserId.raw" }, { "processid", "fields.ProcessId" }, { "threadid", "fields.ThreadId" }, { "id", $"fields.{AbpSerilogUniqueIdConsts.UniqueIdPropertyName}" }, diff --git a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/WorkflowStore.cs b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/WorkflowStore.cs index 91d7cfd3c..9477275ba 100644 --- a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/WorkflowStore.cs +++ b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN/Abp/RulesEngineManagement/WorkflowStore.cs @@ -31,7 +31,7 @@ public class WorkflowStore : IWorkflowStore, ITransientDependency { var workflowRecord = await WorkflowRepository.FindByNameAsync(workflowName, cancellationToken); - var workflow = await ConvertToWorkflow(workflowRecord); + var workflow = await MapToWorkflow(workflowRecord); return workflow; } @@ -48,7 +48,7 @@ public class WorkflowStore : IWorkflowStore, ITransientDependency foreach (var workflowRecord in workflowRecords) { - var workflow = await ConvertToWorkflow(workflowRecord); + var workflow = await MapToWorkflow(workflowRecord); workflows.Add(workflow); } @@ -60,7 +60,7 @@ public class WorkflowStore : IWorkflowStore, ITransientDependency return workflows; } - protected async virtual Task ConvertToWorkflow(WorkflowRecord workflowRecord) + protected async virtual Task MapToWorkflow(WorkflowRecord workflowRecord) { var workflow = new Workflow { diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj index 78d25ee57..1e89b09da 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj @@ -79,6 +79,7 @@ + diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs index 34a2eef24..a91d60b04 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/RealtimeMessageHttpApiHostModule.cs @@ -32,6 +32,7 @@ using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; using LINGYUN.Abp.TaskManagement.EntityFrameworkCore; using LINGYUN.Abp.TextTemplating.EntityFrameworkCore; +using LINGYUN.Abp.TextTemplating.Scriban; using LY.MicroService.RealtimeMessage.EntityFrameworkCore; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; @@ -48,7 +49,6 @@ using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.SettingManagement.EntityFrameworkCore; -using Volo.Abp.TextTemplating.Scriban; namespace LY.MicroService.RealtimeMessage; diff --git a/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.Configure.cs b/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.Configure.cs index fa892797b..3d1e45c38 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.identityServer/IdentityServerModule.Configure.cs @@ -1,4 +1,5 @@ using DotNetCore.CAP; +using LINGYUN.Abp.Account; using LINGYUN.Abp.IdentityServer.IdentityResources; using LINGYUN.Abp.Localization.CultureMap; using LINGYUN.Abp.Serilog.Enrichers.Application; @@ -249,8 +250,8 @@ public partial class IdentityServerModule options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"]; options.Applications["STS"].RootUrl = configuration["App:StsUrl"]; - options.Applications["MVC"].Urls["EmailVerifyLogin"] = "Account/VerifyCode"; - options.Applications["MVC"].Urls["EmailConfirm"] = "Account/EmailConfirm"; + options.Applications["MVC"].Urls[AccountUrlNames.EmailVerifyLogin] = "Account/VerifyCode"; + options.Applications["MVC"].Urls[AccountUrlNames.EmailConfirm] = "Account/EmailConfirm"; }); } private void ConfigureSecurity(IServiceCollection services, IConfiguration configuration, bool isDevelopment = false) diff --git a/aspnet-core/services/LY.MicroService.identityServer/Pages/Account/EmailConfirm.cshtml b/aspnet-core/services/LY.MicroService.identityServer/Pages/Account/EmailConfirm.cshtml index eb9fcd2e6..783ab7bb1 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/Pages/Account/EmailConfirm.cshtml +++ b/aspnet-core/services/LY.MicroService.identityServer/Pages/Account/EmailConfirm.cshtml @@ -8,10 +8,10 @@

@L["EmailConfirm"]

- - - @L["Cancel"] - + + + @L["Cancel"] + @L["Submit"]
diff --git a/aspnet-core/services/LY.MicroService.identityServer/Pages/Account/EmailConfirm.cshtml.cs b/aspnet-core/services/LY.MicroService.identityServer/Pages/Account/EmailConfirm.cshtml.cs index 44a4ea6ce..379cd5441 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/Pages/Account/EmailConfirm.cshtml.cs +++ b/aspnet-core/services/LY.MicroService.identityServer/Pages/Account/EmailConfirm.cshtml.cs @@ -65,7 +65,7 @@ namespace LY.MicroService.IdentityServer.Pages.Account return Page(); } - return RedirectToPage("./ConfirmEmailConfirmation", new + return RedirectToPage("EmailConfirmConfirmation", new { returnUrl = ReturnUrl, returnUrlHash = ReturnUrlHash diff --git a/aspnet-core/services/LY.MicroService.identityServer/Pages/Account/EmailConfirmConfirmation.cshtml.cs b/aspnet-core/services/LY.MicroService.identityServer/Pages/Account/EmailConfirmConfirmation.cshtml.cs index 592ac73be..810f54fc5 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/Pages/Account/EmailConfirmConfirmation.cshtml.cs +++ b/aspnet-core/services/LY.MicroService.identityServer/Pages/Account/EmailConfirmConfirmation.cshtml.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using System; using System.Threading.Tasks; using Volo.Abp.Account.Web.Pages.Account; @@ -13,11 +14,4 @@ public class EmailConfirmConfirmationModel : AccountPageModel [BindProperty(SupportsGet = true)] public string ReturnUrlHash { get; set; } - - public virtual Task OnGetAsync() - { - ReturnUrl = GetRedirectUrl(ReturnUrl, ReturnUrlHash); - - return Task.FromResult(Page()); - } } diff --git a/aspnet-core/templates/content/Directory.Build.props b/aspnet-core/templates/content/Directory.Build.props index 7c8ba79f9..5d1e2d2f9 100644 --- a/aspnet-core/templates/content/Directory.Build.props +++ b/aspnet-core/templates/content/Directory.Build.props @@ -1,8 +1,8 @@ 1.6.9 - 7.2.1 - 7.2.1 + 7.2.2 + 7.2.2 7.1.0 1.10.0 1.0.2 diff --git a/aspnet-core/templates/content/common.props b/aspnet-core/templates/content/common.props index a5a100546..fbb2c5106 100644 --- a/aspnet-core/templates/content/common.props +++ b/aspnet-core/templates/content/common.props @@ -1,7 +1,7 @@ latest - 7.2.1 + 7.2.2 colin $(NoWarn);CS1591;CS0436 https://github.com/colinin/abp-next-admin diff --git a/common.props b/common.props index 2898cef7f..71d73e502 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 7.2.1 + 7.2.2 colin $(NoWarn);CS1591;CS0436;CS8618;NU1803 https://github.com/colinin/abp-next-admin diff --git a/gateways/Directory.Build.props b/gateways/Directory.Build.props index 0c7591186..dfd33c7b3 100644 --- a/gateways/Directory.Build.props +++ b/gateways/Directory.Build.props @@ -1,7 +1,7 @@  - 7.2.1 - 7.2.1 + 7.2.2 + 7.2.2 1.10.0 7.1.0 1.5.10 diff --git a/gateways/common.props b/gateways/common.props index 5b7a1c8ab..8dfc4cef2 100644 --- a/gateways/common.props +++ b/gateways/common.props @@ -1,7 +1,7 @@ latest - 7.2.1 + 7.2.2 colin $(NoWarn);CS1591;CS0436;CS8618;NU1803 https://github.com/colinin/abp-next-admin