From 0811eceb8a9fea4aff304aff2a6098a522f45d27 Mon Sep 17 00:00:00 2001 From: colin Date: Tue, 30 May 2023 17:15:06 +0800 Subject: [PATCH 1/2] upgrade abp framework to 7.2.2 --- .../PackageName.CompanyName.ProjectName.sln | 141 ++++++++++++++++++ 1 file changed, 141 insertions(+) create mode 100644 aspnet-core/templates/content/PackageName.CompanyName.ProjectName.sln diff --git a/aspnet-core/templates/content/PackageName.CompanyName.ProjectName.sln b/aspnet-core/templates/content/PackageName.CompanyName.ProjectName.sln new file mode 100644 index 000000000..0ea10a454 --- /dev/null +++ b/aspnet-core/templates/content/PackageName.CompanyName.ProjectName.sln @@ -0,0 +1,141 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4B0AD527-99B3-49A9-8A45-FD8671F8BE4D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.Domain.Shared", "src\PackageName.CompanyName.ProjectName.Domain.Shared\PackageName.CompanyName.ProjectName.Domain.Shared.csproj", "{FF067843-45C5-4C5E-89E2-EA6DFCCBE1B7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.Domain", "src\PackageName.CompanyName.ProjectName.Domain\PackageName.CompanyName.ProjectName.Domain.csproj", "{9C2828F2-1377-4597-B2B5-A34F1A012D54}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.Application.Contracts", "src\PackageName.CompanyName.ProjectName.Application.Contracts\PackageName.CompanyName.ProjectName.Application.Contracts.csproj", "{4A43EC9C-0CF2-484C-A228-E546C8D6A2A7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.Application", "src\PackageName.CompanyName.ProjectName.Application\PackageName.CompanyName.ProjectName.Application.csproj", "{92140C62-7366-4EBB-986C-97148A529689}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.EntityFrameworkCore", "src\PackageName.CompanyName.ProjectName.EntityFrameworkCore\PackageName.CompanyName.ProjectName.EntityFrameworkCore.csproj", "{164A4539-C9D1-4F2D-9892-9AFA4A124DEE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.Dapr.Client", "src\PackageName.CompanyName.ProjectName.Dapr.Client\PackageName.CompanyName.ProjectName.Dapr.Client.csproj", "{613503F5-87BE-4D56-8C3E-6CBD30C121ED}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.HttpApi", "src\PackageName.CompanyName.ProjectName.HttpApi\PackageName.CompanyName.ProjectName.HttpApi.csproj", "{DF766347-1C80-4025-8E45-3CDFC95C7CCA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.HttpApi.Host", "host\PackageName.CompanyName.ProjectName.HttpApi.Host\PackageName.CompanyName.ProjectName.HttpApi.Host.csproj", "{31E33CE2-71D3-43FF-9A30-2DCC82C607AE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.HttpApi.Client", "src\PackageName.CompanyName.ProjectName.HttpApi.Client\PackageName.CompanyName.ProjectName.HttpApi.Client.csproj", "{6365D1AE-5877-41CD-BF64-F1A3CEDDCEFB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.SettingManagement", "src\PackageName.CompanyName.ProjectName.SettingManagement\PackageName.CompanyName.ProjectName.SettingManagement.csproj", "{42C88D57-66A1-4B02-AFEA-17421C5EEC97}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Solution Items", ".Solution Items", "{C9675742-7986-4BC1-9781-FD1C3C5B6287}" + ProjectSection(SolutionItems) = preProject + common.props = common.props + configureawait.props = configureawait.props + Directory.Build.props = Directory.Build.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "host", "host", "{4786387C-C1C5-46F8-806F-EBC54DB0A4FA}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A9CB1547-1C2C-4A23-82EC-C834C1626E0A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.Application.Tests", "tests\PackageName.CompanyName.ProjectName.Application.Tests\PackageName.CompanyName.ProjectName.Application.Tests.csproj", "{9262FE7A-76B2-424F-8C34-AFA1D95D7E5A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.Domain.Tests", "tests\PackageName.CompanyName.ProjectName.Domain.Tests\PackageName.CompanyName.ProjectName.Domain.Tests.csproj", "{A0D1F8A4-3494-4E26-9E2D-DB874B93DBCE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.EntityFrameworkCore.Tests", "tests\PackageName.CompanyName.ProjectName.EntityFrameworkCore.Tests\PackageName.CompanyName.ProjectName.EntityFrameworkCore.Tests.csproj", "{0B2E1C9E-092D-4E5F-BE9F-5506E689FC85}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.TestBase", "tests\PackageName.CompanyName.ProjectName.TestBase\PackageName.CompanyName.ProjectName.TestBase.csproj", "{4A9D43A2-D08B-40E8-9C74-F2B95BF81AED}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageName.CompanyName.ProjectName.DbMigrator", "host\PackageName.CompanyName.ProjectName.DbMigrator\PackageName.CompanyName.ProjectName.DbMigrator.csproj", "{F6EE5BCD-69C7-4C8A-8B45-251AFE2BB01E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "migrations", "migrations", "{2BF87FAA-69E7-486E-9123-1F407A2BB633}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FF067843-45C5-4C5E-89E2-EA6DFCCBE1B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FF067843-45C5-4C5E-89E2-EA6DFCCBE1B7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FF067843-45C5-4C5E-89E2-EA6DFCCBE1B7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FF067843-45C5-4C5E-89E2-EA6DFCCBE1B7}.Release|Any CPU.Build.0 = Release|Any CPU + {9C2828F2-1377-4597-B2B5-A34F1A012D54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9C2828F2-1377-4597-B2B5-A34F1A012D54}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9C2828F2-1377-4597-B2B5-A34F1A012D54}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9C2828F2-1377-4597-B2B5-A34F1A012D54}.Release|Any CPU.Build.0 = Release|Any CPU + {4A43EC9C-0CF2-484C-A228-E546C8D6A2A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4A43EC9C-0CF2-484C-A228-E546C8D6A2A7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4A43EC9C-0CF2-484C-A228-E546C8D6A2A7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4A43EC9C-0CF2-484C-A228-E546C8D6A2A7}.Release|Any CPU.Build.0 = Release|Any CPU + {92140C62-7366-4EBB-986C-97148A529689}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {92140C62-7366-4EBB-986C-97148A529689}.Debug|Any CPU.Build.0 = Debug|Any CPU + {92140C62-7366-4EBB-986C-97148A529689}.Release|Any CPU.ActiveCfg = Release|Any CPU + {92140C62-7366-4EBB-986C-97148A529689}.Release|Any CPU.Build.0 = Release|Any CPU + {164A4539-C9D1-4F2D-9892-9AFA4A124DEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {164A4539-C9D1-4F2D-9892-9AFA4A124DEE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {164A4539-C9D1-4F2D-9892-9AFA4A124DEE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {164A4539-C9D1-4F2D-9892-9AFA4A124DEE}.Release|Any CPU.Build.0 = Release|Any CPU + {613503F5-87BE-4D56-8C3E-6CBD30C121ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {613503F5-87BE-4D56-8C3E-6CBD30C121ED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {613503F5-87BE-4D56-8C3E-6CBD30C121ED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {613503F5-87BE-4D56-8C3E-6CBD30C121ED}.Release|Any CPU.Build.0 = Release|Any CPU + {DF766347-1C80-4025-8E45-3CDFC95C7CCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DF766347-1C80-4025-8E45-3CDFC95C7CCA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DF766347-1C80-4025-8E45-3CDFC95C7CCA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DF766347-1C80-4025-8E45-3CDFC95C7CCA}.Release|Any CPU.Build.0 = Release|Any CPU + {31E33CE2-71D3-43FF-9A30-2DCC82C607AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {31E33CE2-71D3-43FF-9A30-2DCC82C607AE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {31E33CE2-71D3-43FF-9A30-2DCC82C607AE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {31E33CE2-71D3-43FF-9A30-2DCC82C607AE}.Release|Any CPU.Build.0 = Release|Any CPU + {6365D1AE-5877-41CD-BF64-F1A3CEDDCEFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6365D1AE-5877-41CD-BF64-F1A3CEDDCEFB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6365D1AE-5877-41CD-BF64-F1A3CEDDCEFB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6365D1AE-5877-41CD-BF64-F1A3CEDDCEFB}.Release|Any CPU.Build.0 = Release|Any CPU + {42C88D57-66A1-4B02-AFEA-17421C5EEC97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42C88D57-66A1-4B02-AFEA-17421C5EEC97}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42C88D57-66A1-4B02-AFEA-17421C5EEC97}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42C88D57-66A1-4B02-AFEA-17421C5EEC97}.Release|Any CPU.Build.0 = Release|Any CPU + {9262FE7A-76B2-424F-8C34-AFA1D95D7E5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9262FE7A-76B2-424F-8C34-AFA1D95D7E5A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9262FE7A-76B2-424F-8C34-AFA1D95D7E5A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9262FE7A-76B2-424F-8C34-AFA1D95D7E5A}.Release|Any CPU.Build.0 = Release|Any CPU + {A0D1F8A4-3494-4E26-9E2D-DB874B93DBCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A0D1F8A4-3494-4E26-9E2D-DB874B93DBCE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A0D1F8A4-3494-4E26-9E2D-DB874B93DBCE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A0D1F8A4-3494-4E26-9E2D-DB874B93DBCE}.Release|Any CPU.Build.0 = Release|Any CPU + {0B2E1C9E-092D-4E5F-BE9F-5506E689FC85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0B2E1C9E-092D-4E5F-BE9F-5506E689FC85}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0B2E1C9E-092D-4E5F-BE9F-5506E689FC85}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0B2E1C9E-092D-4E5F-BE9F-5506E689FC85}.Release|Any CPU.Build.0 = Release|Any CPU + {4A9D43A2-D08B-40E8-9C74-F2B95BF81AED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4A9D43A2-D08B-40E8-9C74-F2B95BF81AED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4A9D43A2-D08B-40E8-9C74-F2B95BF81AED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4A9D43A2-D08B-40E8-9C74-F2B95BF81AED}.Release|Any CPU.Build.0 = Release|Any CPU + {F6EE5BCD-69C7-4C8A-8B45-251AFE2BB01E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F6EE5BCD-69C7-4C8A-8B45-251AFE2BB01E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F6EE5BCD-69C7-4C8A-8B45-251AFE2BB01E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F6EE5BCD-69C7-4C8A-8B45-251AFE2BB01E}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {FF067843-45C5-4C5E-89E2-EA6DFCCBE1B7} = {4B0AD527-99B3-49A9-8A45-FD8671F8BE4D} + {9C2828F2-1377-4597-B2B5-A34F1A012D54} = {4B0AD527-99B3-49A9-8A45-FD8671F8BE4D} + {4A43EC9C-0CF2-484C-A228-E546C8D6A2A7} = {4B0AD527-99B3-49A9-8A45-FD8671F8BE4D} + {92140C62-7366-4EBB-986C-97148A529689} = {4B0AD527-99B3-49A9-8A45-FD8671F8BE4D} + {164A4539-C9D1-4F2D-9892-9AFA4A124DEE} = {4B0AD527-99B3-49A9-8A45-FD8671F8BE4D} + {613503F5-87BE-4D56-8C3E-6CBD30C121ED} = {4B0AD527-99B3-49A9-8A45-FD8671F8BE4D} + {DF766347-1C80-4025-8E45-3CDFC95C7CCA} = {4B0AD527-99B3-49A9-8A45-FD8671F8BE4D} + {31E33CE2-71D3-43FF-9A30-2DCC82C607AE} = {4786387C-C1C5-46F8-806F-EBC54DB0A4FA} + {6365D1AE-5877-41CD-BF64-F1A3CEDDCEFB} = {4B0AD527-99B3-49A9-8A45-FD8671F8BE4D} + {42C88D57-66A1-4B02-AFEA-17421C5EEC97} = {4B0AD527-99B3-49A9-8A45-FD8671F8BE4D} + {9262FE7A-76B2-424F-8C34-AFA1D95D7E5A} = {A9CB1547-1C2C-4A23-82EC-C834C1626E0A} + {A0D1F8A4-3494-4E26-9E2D-DB874B93DBCE} = {A9CB1547-1C2C-4A23-82EC-C834C1626E0A} + {0B2E1C9E-092D-4E5F-BE9F-5506E689FC85} = {A9CB1547-1C2C-4A23-82EC-C834C1626E0A} + {4A9D43A2-D08B-40E8-9C74-F2B95BF81AED} = {A9CB1547-1C2C-4A23-82EC-C834C1626E0A} + {F6EE5BCD-69C7-4C8A-8B45-251AFE2BB01E} = {2BF87FAA-69E7-486E-9123-1F407A2BB633} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {62C0F185-E2C2-46A2-B4B2-5E703E25849E} + EndGlobalSection +EndGlobal From 909c24e26df8e1ef422f06e6c0e2a92ed51ae3c9 Mon Sep 17 00:00:00 2001 From: colin Date: Tue, 30 May 2023 17:15:20 +0800 Subject: [PATCH 2/2] upgrade abp framework to 7.2.2 --- .github/workflows/release.yml | 4 +-- aspnet-core/Directory.Build.props | 4 +-- aspnet-core/common.props | 2 +- .../LINGYUN/Abp/Account/AccountUrlNames.cs | 1 + .../EmailingNotificationPublishProvider.cs | 24 +++++++++++++++-- .../SerilogElasticsearchLoggingManager.cs | 26 +++++++++---------- .../RulesEngineManagement/WorkflowStore.cs | 6 ++--- ...ervice.RealtimeMessage.HttpApi.Host.csproj | 1 + .../RealtimeMessageHttpApiHostModule.cs | 2 +- .../IdentityServerModule.Configure.cs | 5 ++-- .../Pages/Account/EmailConfirm.cshtml | 8 +++--- .../Pages/Account/EmailConfirm.cshtml.cs | 2 +- .../EmailConfirmConfirmation.cshtml.cs | 8 +----- .../templates/content/Directory.Build.props | 4 +-- aspnet-core/templates/content/common.props | 2 +- common.props | 2 +- gateways/Directory.Build.props | 4 +-- gateways/common.props | 2 +- 18 files changed, 62 insertions(+), 45 deletions(-) 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