upgrade abp framework to 7.2.2

.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"

aspnet-core/Directory.Build.props

@@ -1,8 +1,8 @@
 <Project>
 	<PropertyGroup>
-		<VoloAbpPackageVersion>7.2.1</VoloAbpPackageVersion>
+		<VoloAbpPackageVersion>7.2.2</VoloAbpPackageVersion>
 		<VoloAbpLeptonXThemePackageVersion>2.0.1</VoloAbpLeptonXThemePackageVersion>
-		<LINGYUNAbpPackageVersion>7.2.1</LINGYUNAbpPackageVersion>
+		<LINGYUNAbpPackageVersion>7.2.2</LINGYUNAbpPackageVersion>
 		<DaprPackageVersion>1.10.0</DaprPackageVersion>
 		<DistributedLockRedisPackageVersion>1.0.2</DistributedLockRedisPackageVersion>
 		<DotNetCoreCAPPackageVersion>7.1.0</DotNetCoreCAPPackageVersion>

aspnet-core/common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>7.2.1</Version>
+    <Version>7.2.2</Version>
     <Authors>colin</Authors>
     <NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn>
     <PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>

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";
 }

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<LocalizableStringInfo>();
             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<LocalizableStringInfo>();
             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);
         }

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<string, string> _fieldMaps = new Dictionary<string, string>(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}" },

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<Workflow> ConvertToWorkflow(WorkflowRecord workflowRecord)
+    protected async virtual Task<Workflow> MapToWorkflow(WorkflowRecord workflowRecord)
     {
         var workflow = new Workflow
         {

aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj

@@ -79,6 +79,7 @@
 		<ProjectReference Include="..\..\modules\saas\LINGYUN.Abp.Saas.EntityFrameworkCore\LINGYUN.Abp.Saas.EntityFrameworkCore.csproj" />
 		<ProjectReference Include="..\..\modules\tenants\LINGYUN.Abp.MultiTenancy\LINGYUN.Abp.MultiTenancy.csproj" />
 		<ProjectReference Include="..\..\modules\text-templating\LINGYUN.Abp.TextTemplating.EntityFrameworkCore\LINGYUN.Abp.TextTemplating.EntityFrameworkCore.csproj" />
+		<ProjectReference Include="..\..\modules\text-templating\LINGYUN.Abp.TextTemplating.Scriban\LINGYUN.Abp.TextTemplating.Scriban.csproj" />
 		<ProjectReference Include="..\..\modules\wechat\LINGYUN.Abp.Identity.WeChat\LINGYUN.Abp.Identity.WeChat.csproj" />
 		<ProjectReference Include="..\..\modules\wechat\LINGYUN.Abp.Notifications.WeChat.MiniProgram\LINGYUN.Abp.Notifications.WeChat.MiniProgram.csproj" />
 		<ProjectReference Include="..\..\modules\wx-pusher\LINGYUN.Abp.Notifications.WxPusher\LINGYUN.Abp.Notifications.WxPusher.csproj" />

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;
 

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)

aspnet-core/services/LY.MicroService.identityServer/Pages/Account/EmailConfirm.cshtml

@@ -10,8 +10,8 @@
         <form method="post">
             <abp-input asp-for="UserId" />
             <abp-input asp-for="ConfirmToken" />
-            <a abp-button="Secondary" asp-page="./Login">@L["Cancel"]</a>
-            <abp-button type="submit" button-type="Primary" text="@L["Submit"].Value"/>
+            <a abp-button="Secondary" asp-page="./">@L["Cancel"]</a>
+            <abp-button type="submit" button-type="Primary">@L["Submit"]</abp-button>
         </form>
     </div>
 </div>

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

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<IActionResult> OnGetAsync()
-    {
-        ReturnUrl = GetRedirectUrl(ReturnUrl, ReturnUrlHash);
-
-        return Task.FromResult<IActionResult>(Page());
-    }
 }

aspnet-core/templates/content/Directory.Build.props

@@ -1,8 +1,8 @@
 <Project>
 	<PropertyGroup>
 		<AgileConfigClientPackageVersion>1.6.9</AgileConfigClientPackageVersion>
-		<VoloAbpPackageVersion>7.2.1</VoloAbpPackageVersion>
-		<LINGYUNAbpPackageVersion>7.2.1</LINGYUNAbpPackageVersion>
+		<VoloAbpPackageVersion>7.2.2</VoloAbpPackageVersion>
+		<LINGYUNAbpPackageVersion>7.2.2</LINGYUNAbpPackageVersion>
 		<DotNetCoreCAPPackageVersion>7.1.0</DotNetCoreCAPPackageVersion>
 		<DaprPackageVersion>1.10.0</DaprPackageVersion>
 		<DistributedLockRedisPackageVersion>1.0.2</DistributedLockRedisPackageVersion>

aspnet-core/templates/content/common.props

@@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
 		<LangVersion>latest</LangVersion>
-		<Version>7.2.1</Version>
+		<Version>7.2.2</Version>
 		<Authors>colin</Authors>
 		<NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
 		<PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>7.2.1</Version>
+    <Version>7.2.2</Version>
     <Authors>colin</Authors>
     <NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn>
     <PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>

gateways/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
-		<VoloAbpPackageVersion>7.2.1</VoloAbpPackageVersion>
-		<LINGYUNAbpPackageVersion>7.2.1</LINGYUNAbpPackageVersion>
+		<VoloAbpPackageVersion>7.2.2</VoloAbpPackageVersion>
+		<LINGYUNAbpPackageVersion>7.2.2</LINGYUNAbpPackageVersion>
 		<DaprPackageVersion>1.10.0</DaprPackageVersion>
 		<DotNetCoreCAPPackageVersion>7.1.0</DotNetCoreCAPPackageVersion>
 		<AliyunSDKPackageVersion>1.5.10</AliyunSDKPackageVersion>

gateways/common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>7.2.1</Version>
+    <Version>7.2.2</Version>
     <Authors>colin</Authors>
     <NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn>
     <PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>