diff --git a/aspnet-core/Lion.AbpPro.All.sln b/aspnet-core/Lion.AbpPro.All.sln index a0851906..912c8da3 100644 --- a/aspnet-core/Lion.AbpPro.All.sln +++ b/aspnet-core/Lion.AbpPro.All.sln @@ -249,6 +249,14 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{E57C6A28-1879-4E83-9B0D-E665824A1F4B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "module", "module", "{9FC0330B-FD17-49B8-AC45-C2D10D2BDC16}" + ProjectSection(SolutionItems) = preProject + ..\templates\abp-vnext-pro-nuget-module\Directory.Build.Lion.targets = ..\templates\abp-vnext-pro-nuget-module\Directory.Build.Lion.targets + ..\templates\abp-vnext-pro-nuget-module\Directory.Build.Microsoft.targets = ..\templates\abp-vnext-pro-nuget-module\Directory.Build.Microsoft.targets + ..\templates\abp-vnext-pro-nuget-module\Directory.Build.targets = ..\templates\abp-vnext-pro-nuget-module\Directory.Build.targets + ..\templates\abp-vnext-pro-nuget-module\Directory.Build.Volo.targets = ..\templates\abp-vnext-pro-nuget-module\Directory.Build.Volo.targets + ..\templates\abp-vnext-pro-nuget-module\global.json = ..\templates\abp-vnext-pro-nuget-module\global.json + ..\templates\abp-vnext-pro-nuget-module\NuGet.Config = ..\templates\abp-vnext-pro-nuget-module\NuGet.Config + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{94048D54-F513-4557-A8DF-F00F6A60FF5B}" EndProject @@ -285,6 +293,14 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "all", "all", "{6A40770E-9DE1-4F15-80E8-8FCA090A749C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "aspnet-core", "aspnet-core", "{7B757E2D-B5A1-4BFE-9BB2-93CD04E4B28B}" + ProjectSection(SolutionItems) = preProject + ..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\Directory.Build.Lion.targets = ..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\Directory.Build.Lion.targets + ..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\Directory.Build.Microsoft.targets = ..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\Directory.Build.Microsoft.targets + ..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\Directory.Build.targets = ..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\Directory.Build.targets + ..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\Directory.Build.Volo.targets = ..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\Directory.Build.Volo.targets + ..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\global.json = ..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\global.json + ..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\NuGet.Config = ..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\NuGet.Config + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C7AEB4C8-BAE7-4A19-B96E-011FA56ED6A5}" EndProject @@ -293,6 +309,14 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "host", "host", "{09CFDF18-4924-44D4-A987-EB9713787FF8}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "aspnet-core", "aspnet-core", "{11801334-CC4A-45F3-BD38-793D4F9D4D4F}" + ProjectSection(SolutionItems) = preProject + ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.Lion.targets = ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.Lion.targets + ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.Microsoft.targets = ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.Microsoft.targets + ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.targets = ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.targets + ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.Volo.targets = ..\templates\abp-vnext-pro-nuget-all\aspnet-core\Directory.Build.Volo.targets + ..\templates\abp-vnext-pro-nuget-all\aspnet-core\global.json = ..\templates\abp-vnext-pro-nuget-all\aspnet-core\global.json + ..\templates\abp-vnext-pro-nuget-all\aspnet-core\NuGet.Config = ..\templates\abp-vnext-pro-nuget-all\aspnet-core\NuGet.Config + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AF8A0F3B-B346-466C-87F7-F2405E6158FE}" EndProject @@ -330,40 +354,40 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.HttpApi.Host", "..\templates\abp-vnext-pro-nuget-all\aspnet-core\host\MyCompanyName.MyProjectName.HttpApi.Host\MyCompanyName.MyProjectName.HttpApi.Host.csproj", "{67B45B2E-9682-417D-964B-30DBCE4321CE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Domain.Shared", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\services\src\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj", "{F4F5C1F7-28F3-4297-ACD7-DBB6E6F89E68}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Domain.Shared", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\src\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj", "{F4F5C1F7-28F3-4297-ACD7-DBB6E6F89E68}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Domain", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\services\src\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj", "{504A06C9-2A3D-4456-8F61-DCB35C6F93F3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Domain", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\src\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj", "{504A06C9-2A3D-4456-8F61-DCB35C6F93F3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.EntityFrameworkCore", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\services\src\MyCompanyName.MyProjectName.EntityFrameworkCore\MyCompanyName.MyProjectName.EntityFrameworkCore.csproj", "{07982F9D-F65B-4FDA-8CF6-1D0A9EAA32B8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.EntityFrameworkCore", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\src\MyCompanyName.MyProjectName.EntityFrameworkCore\MyCompanyName.MyProjectName.EntityFrameworkCore.csproj", "{07982F9D-F65B-4FDA-8CF6-1D0A9EAA32B8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.DbMigrator", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\services\src\MyCompanyName.MyProjectName.DbMigrator\MyCompanyName.MyProjectName.DbMigrator.csproj", "{9749B052-5F3D-4442-9B2E-9EC798457DB5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.DbMigrator", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\src\MyCompanyName.MyProjectName.DbMigrator\MyCompanyName.MyProjectName.DbMigrator.csproj", "{9749B052-5F3D-4442-9B2E-9EC798457DB5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Application", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\services\src\MyCompanyName.MyProjectName.Application\MyCompanyName.MyProjectName.Application.csproj", "{2161EFEA-7654-4810-85A0-18293825FFBC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Application", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\src\MyCompanyName.MyProjectName.Application\MyCompanyName.MyProjectName.Application.csproj", "{2161EFEA-7654-4810-85A0-18293825FFBC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Application.Contracts", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\services\src\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj", "{4E4856BA-A71F-4753-A497-6F3D197BB455}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Application.Contracts", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\src\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj", "{4E4856BA-A71F-4753-A497-6F3D197BB455}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.FreeSqlRepository", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\services\src\MyCompanyName.MyProjectName.FreeSqlRepository\MyCompanyName.MyProjectName.FreeSqlRepository.csproj", "{ABA5A546-28DB-4E54-987D-D828B2F79B9D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.FreeSqlRepository", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\src\MyCompanyName.MyProjectName.FreeSqlRepository\MyCompanyName.MyProjectName.FreeSqlRepository.csproj", "{ABA5A546-28DB-4E54-987D-D828B2F79B9D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.HttpApi", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\services\src\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj", "{50E73D29-F11D-4CBD-8A85-CC34F4DE8C31}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.HttpApi", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\src\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj", "{50E73D29-F11D-4CBD-8A85-CC34F4DE8C31}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.HttpApi.Client", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\services\src\MyCompanyName.MyProjectName.HttpApi.Client\MyCompanyName.MyProjectName.HttpApi.Client.csproj", "{B66BDD25-49B8-4823-A678-93BC081D65ED}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.HttpApi.Client", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\src\MyCompanyName.MyProjectName.HttpApi.Client\MyCompanyName.MyProjectName.HttpApi.Client.csproj", "{B66BDD25-49B8-4823-A678-93BC081D65ED}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.WebGateway", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\gateways\MyCompanyName.MyProjectName.WebGateway\MyCompanyName.MyProjectName.WebGateway.csproj", "{5B9EC1B8-DA44-4747-9806-A0F34CDE388B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.HttpApi.Host", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\host\MyCompanyName.MyProjectName.HttpApi.Host\MyCompanyName.MyProjectName.HttpApi.Host.csproj", "{04635BE3-67F0-4AB6-BB68-607E73040F07}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.HttpApi.Host", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\services\host\MyCompanyName.MyProjectName.HttpApi.Host\MyCompanyName.MyProjectName.HttpApi.Host.csproj", "{04635BE3-67F0-4AB6-BB68-607E73040F07}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.TestBase", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\test\MyCompanyName.MyProjectName.TestBase\MyCompanyName.MyProjectName.TestBase.csproj", "{75DE5DA1-8EDA-42EE-8570-169713ECB9CD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.TestBase", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\services\test\MyCompanyName.MyProjectName.TestBase\MyCompanyName.MyProjectName.TestBase.csproj", "{75DE5DA1-8EDA-42EE-8570-169713ECB9CD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\test\MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp\MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj", "{AF943646-1D48-492D-8C7A-48606F7B36B0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\services\test\MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp\MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj", "{AF943646-1D48-492D-8C7A-48606F7B36B0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.EntityFrameworkCore.Tests", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\test\MyCompanyName.MyProjectName.EntityFrameworkCore.Tests\MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj", "{80125670-3650-4E72-A172-CA852FE5C98D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.EntityFrameworkCore.Tests", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\services\test\MyCompanyName.MyProjectName.EntityFrameworkCore.Tests\MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj", "{80125670-3650-4E72-A172-CA852FE5C98D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Domain.Tests", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\test\MyCompanyName.MyProjectName.Domain.Tests\MyCompanyName.MyProjectName.Domain.Tests.csproj", "{4C8B284F-A216-4812-912F-7CC6F428CDF6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Domain.Tests", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\services\test\MyCompanyName.MyProjectName.Domain.Tests\MyCompanyName.MyProjectName.Domain.Tests.csproj", "{4C8B284F-A216-4812-912F-7CC6F428CDF6}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Application.Tests", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\services\test\MyCompanyName.MyProjectName.Application.Tests\MyCompanyName.MyProjectName.Application.Tests.csproj", "{2DDC4639-710D-4B9C-98E0-03288184B37C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Application.Tests", "..\templates\abp-vnext-pro-nuget-simplify\aspnet-core\test\MyCompanyName.MyProjectName.Application.Tests\MyCompanyName.MyProjectName.Application.Tests.csproj", "{2DDC4639-710D-4B9C-98E0-03288184B37C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lion.AbpPro.Core.Cli.Tests", "frameworks\test\Lion.AbpPro.Core.Cli.Tests\Lion.AbpPro.Core.Cli.Tests.csproj", "{9B65C2C8-E94E-46FD-9841-70DFAE5C85E9}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.WebGateway", "..\templates\abp-vnext-pro-nuget-all\aspnet-core\host\MyCompanyName.MyProjectName.WebGateway\MyCompanyName.MyProjectName.WebGateway.csproj", "{4C57F50E-50BE-4C1A-BBA3-9D0DA5BF4D6F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -862,10 +886,6 @@ Global {B66BDD25-49B8-4823-A678-93BC081D65ED}.Debug|Any CPU.Build.0 = Debug|Any CPU {B66BDD25-49B8-4823-A678-93BC081D65ED}.Release|Any CPU.ActiveCfg = Release|Any CPU {B66BDD25-49B8-4823-A678-93BC081D65ED}.Release|Any CPU.Build.0 = Release|Any CPU - {5B9EC1B8-DA44-4747-9806-A0F34CDE388B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B9EC1B8-DA44-4747-9806-A0F34CDE388B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B9EC1B8-DA44-4747-9806-A0F34CDE388B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B9EC1B8-DA44-4747-9806-A0F34CDE388B}.Release|Any CPU.Build.0 = Release|Any CPU {04635BE3-67F0-4AB6-BB68-607E73040F07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {04635BE3-67F0-4AB6-BB68-607E73040F07}.Debug|Any CPU.Build.0 = Debug|Any CPU {04635BE3-67F0-4AB6-BB68-607E73040F07}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -894,6 +914,10 @@ Global {9B65C2C8-E94E-46FD-9841-70DFAE5C85E9}.Debug|Any CPU.Build.0 = Debug|Any CPU {9B65C2C8-E94E-46FD-9841-70DFAE5C85E9}.Release|Any CPU.ActiveCfg = Release|Any CPU {9B65C2C8-E94E-46FD-9841-70DFAE5C85E9}.Release|Any CPU.Build.0 = Release|Any CPU + {4C57F50E-50BE-4C1A-BBA3-9D0DA5BF4D6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4C57F50E-50BE-4C1A-BBA3-9D0DA5BF4D6F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4C57F50E-50BE-4C1A-BBA3-9D0DA5BF4D6F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4C57F50E-50BE-4C1A-BBA3-9D0DA5BF4D6F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1061,7 +1085,6 @@ Global {ABA5A546-28DB-4E54-987D-D828B2F79B9D} = {C7AEB4C8-BAE7-4A19-B96E-011FA56ED6A5} {50E73D29-F11D-4CBD-8A85-CC34F4DE8C31} = {C7AEB4C8-BAE7-4A19-B96E-011FA56ED6A5} {B66BDD25-49B8-4823-A678-93BC081D65ED} = {C7AEB4C8-BAE7-4A19-B96E-011FA56ED6A5} - {5B9EC1B8-DA44-4747-9806-A0F34CDE388B} = {09CFDF18-4924-44D4-A987-EB9713787FF8} {04635BE3-67F0-4AB6-BB68-607E73040F07} = {09CFDF18-4924-44D4-A987-EB9713787FF8} {75DE5DA1-8EDA-42EE-8570-169713ECB9CD} = {18E9B97A-3897-4DA8-810E-4435A777ABA7} {AF943646-1D48-492D-8C7A-48606F7B36B0} = {18E9B97A-3897-4DA8-810E-4435A777ABA7} @@ -1069,6 +1092,7 @@ Global {4C8B284F-A216-4812-912F-7CC6F428CDF6} = {18E9B97A-3897-4DA8-810E-4435A777ABA7} {2DDC4639-710D-4B9C-98E0-03288184B37C} = {18E9B97A-3897-4DA8-810E-4435A777ABA7} {9B65C2C8-E94E-46FD-9841-70DFAE5C85E9} = {EFC415F8-872F-4C7E-8645-31A51481BCFC} + {4C57F50E-50BE-4C1A-BBA3-9D0DA5BF4D6F} = {EA151482-0987-49E0-96A8-2CD876BC8B6E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/GlobalUsings.cs b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/GlobalUsings.cs index 1fc4fe11..c7cf04de 100644 --- a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/GlobalUsings.cs +++ b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/GlobalUsings.cs @@ -8,9 +8,7 @@ global using ICSharpCode.SharpZipLib.Zip; global using Lion.AbpPro.Cli.Args; global using Lion.AbpPro.Cli.Github; global using Lion.AbpPro.Cli.Options; -global using Lion.AbpPro.Cli.Replace; global using Lion.AbpPro.Cli.Utils; -global using Lion.AbpPro.Cli.Zip; global using Microsoft.Extensions.DependencyInjection; global using Microsoft.Extensions.Logging; global using Microsoft.Extensions.Options; diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/CliService.cs b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/CliService.cs index 982188d9..76d949d7 100644 --- a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/CliService.cs +++ b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/CliService.cs @@ -1,5 +1,4 @@ using Lion.AbpPro.Cli.Commands; -using Lion.AbpPro.Cli.Cryptography; using Volo.Abp.Domain.Services; namespace Lion.AbpPro.Cli; diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Options/LionAbpProOptions.cs b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Options/LionAbpProOptions.cs index 40fd5334..8113a4ea 100644 --- a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Options/LionAbpProOptions.cs +++ b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Options/LionAbpProOptions.cs @@ -20,7 +20,7 @@ public class LionAbpProOptions /// /// 解密 Github Token /// - public string DecryptToken => Cryptography.TokenHelper.Decrypt(Token); + public string DecryptToken => TokenHelper.Decrypt(Token); /// /// 模板信息 diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Utils/DirectoryAndFileHelper.cs b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Utils/DirectoryAndFileHelper.cs index 2b74f6a4..b0fd7e5c 100644 --- a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Utils/DirectoryAndFileHelper.cs +++ b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Utils/DirectoryAndFileHelper.cs @@ -1,6 +1,4 @@ -using Volo.Abp.Domain.Services; - -namespace Lion.AbpPro.Cli.Zip; +namespace Lion.AbpPro.Cli.Utils; public static class DirectoryAndFileHelper { diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Utils/ReplaceHelper.cs b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Utils/ReplaceHelper.cs index e59fb61a..2221ee74 100644 --- a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Utils/ReplaceHelper.cs +++ b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Utils/ReplaceHelper.cs @@ -1,6 +1,4 @@ -using Volo.Abp.Domain.Services; - -namespace Lion.AbpPro.Cli.Replace; +namespace Lion.AbpPro.Cli.Utils; public static class ReplaceHelper { @@ -16,7 +14,8 @@ public static class ReplaceHelper } } - private static void ReplaceTemplates(string sourcePath, string oldCompanyName, string oldProjectName, string oldModuleName, string companyName, string projectName, string moduleName, string replaceSuffix) + private static void ReplaceTemplates(string sourcePath, string oldCompanyName, string oldProjectName, string oldModuleName, string companyName, string projectName, string moduleName, + string replaceSuffix) { try { @@ -31,10 +30,12 @@ public static class ReplaceHelper private static void RenameTemplate(string sourcePath, string oldCompanyName, string oldProjectName, string companyName, string projectName, string replaceSuffix) { RenameAllDirectories(sourcePath, oldCompanyName, oldProjectName, companyName, projectName); + RenameAllFileNameAndContent(sourcePath, oldCompanyName, oldProjectName, companyName, projectName, replaceSuffix); } - private static void RenameTemplate(string sourcePath, string oldCompanyName, string oldProjectName, string oldModuleName, string companyName, string projectName, string moduleName, string replaceSuffix) + private static void RenameTemplate(string sourcePath, string oldCompanyName, string oldProjectName, string oldModuleName, string companyName, string projectName, string moduleName, + string replaceSuffix) { RenameAllDirectories(sourcePath, oldCompanyName, oldProjectName, oldModuleName, companyName, projectName, moduleName); RenameAllFileNameAndContent(sourcePath, oldCompanyName, oldProjectName, oldModuleName, companyName, projectName, moduleName, replaceSuffix); @@ -170,24 +171,173 @@ public static class ReplaceHelper RenameAllFileNameAndContent(subDirectory, oldCompanyName, oldProjectName, oldModuleName, companyName, projectName, moduleName, replaceSuffix); } } - private static string CustomReplace(this string content,string oldCompanyName, string oldProjectName, string companyName,string projectName) + + private static string CustomReplace(this string content, string oldCompanyName, string oldProjectName, string companyName, string projectName) { - var result = content + var result = content.ReplacePackageReferenceBasicManagement(); + content.ReplacePackageReferenceLanguageManagement(); + content.ReplacePackageReferenceFileManagement(); + content.ReplacePackageReferenceDataDictionaryManagement(); + content.ReplacePackageReferenceNotificationManagement(); + content.ReplacePackageReferenceCore(); + + result = result .Replace(oldCompanyName, companyName) .Replace(oldProjectName, projectName) ; return result; } - - private static string CustomReplace(this string content,string oldCompanyName, string oldProjectName,string oldModuleName, string companyName,string projectName,string moduleName) + + private static string CustomReplace(this string content, string oldCompanyName, string oldProjectName, string oldModuleName, string companyName, string projectName, string moduleName) { - var result = content + var result = content.ReplacePackageReferenceBasicManagement(); + content.ReplacePackageReferenceLanguageManagement(); + content.ReplacePackageReferenceFileManagement(); + content.ReplacePackageReferenceDataDictionaryManagement(); + content.ReplacePackageReferenceNotificationManagement(); + content.ReplacePackageReferenceCore(); + + result = result .Replace(oldCompanyName, companyName) .Replace(oldProjectName, projectName) - .Replace(oldModuleName,moduleName) + .Replace(oldModuleName, moduleName) ; return result; } + + public static string ReplacePackageReferenceCore(this string content) + { + return content.Replace("..\\..\\..\\..\\..\\aspnet-core\\frameworks\\src\\Lion.AbpPro.Core\\Lion.AbpPro.Core.csproj", "Lion.AbpPro.Core") + .Replace("..\\..\\..\\..\\aspnet-core\\frameworks\\src\\Lion.AbpPro.Core\\Lion.AbpPro.Core.csproj", "Lion.AbpPro.Core") + .Replace("..\\..\\..\\..\\..\\..\\aspnet-core\\shared\\Lion.AbpPro.Shared.Hosting.Microservices\\Lion.AbpPro.Shared.Hosting.Microservices.csproj", + "Lion.AbpPro.Shared.Hosting.Microservices") + .Replace("..\\..\\..\\..\\..\\aspnet-core\\shared\\Lion.AbpPro.Shared.Hosting.Microservices\\Lion.AbpPro.Shared.Hosting.Microservices.csproj", "Lion.AbpPro.Shared.Hosting.Microservices") + .Replace("..\\..\\..\\..\\..\\aspnet-core\\shared\\Lion.AbpPro.Shared.Hosting.Gateways\\Lion.AbpPro.Shared.Hosting.Gateways.csproj", "Lion.AbpPro.Shared.Hosting.Gateways"); + } + + public static string ReplacePackageReferenceBasicManagement(this string content) + { + return content.Replace("..\\..\\..\\..\\..\\aspnet-core\\modules\\BasicManagement\\src\\Lion.AbpPro.BasicManagement.Application\\Lion.AbpPro.BasicManagement.Application.csproj", + "Lion.AbpPro.BasicManagement.Application") + .Replace("..\\..\\..\\..\\..\\aspnet-core\\modules\\BasicManagement\\src\\Lion.AbpPro.BasicManagement.Application.Contracts\\Lion.AbpPro.BasicManagement.Application.Contracts.csproj", + "Lion.AbpPro.BasicManagement.Application.Contracts") + .Replace("..\\..\\..\\..\\..\\aspnet-core\\modules\\BasicManagement\\src\\Lion.AbpPro.BasicManagement.Domain\\Lion.AbpPro.BasicManagement.Domain.csproj", + "Lion.AbpPro.BasicManagement.Domain") + .Replace("..\\..\\..\\..\\..\\aspnet-core\\modules\\BasicManagement\\src\\Lion.AbpPro.BasicManagement.Domain.Shared\\Lion.AbpPro.BasicManagement.Domain.Shared.csproj", + "Lion.AbpPro.BasicManagement.Domain.Shared") + .Replace("..\\..\\..\\..\\..\\aspnet-core\\modules\\BasicManagement\\src\\Lion.AbpPro.BasicManagement.EntityFrameworkCore\\Lion.AbpPro.BasicManagement.EntityFrameworkCore.csproj", + "Lion.AbpPro.BasicManagement.EntityFrameworkCore") + .Replace("..\\..\\..\\..\\..\\aspnet-core\\modules\\BasicManagement\\src\\Lion.AbpPro.BasicManagement.FreeSqlRepository\\Lion.AbpPro.BasicManagement.FreeSqlRepository.csproj", + "Lion.AbpPro.BasicManagement.FreeSqlRepository") + .Replace("..\\..\\..\\..\\..\\aspnet-core\\modules\\BasicManagement\\src\\Lion.AbpPro.BasicManagement.HttpApi\\Lion.AbpPro.BasicManagement.HttpApi.csproj", + "Lion.AbpPro.BasicManagement.HttpApi") + .Replace("..\\..\\..\\..\\..\\aspnet-core\\modules\\BasicManagement\\src\\Lion.AbpPro.BasicManagement.HttpApi.Client\\Lion.AbpPro.BasicManagement.HttpApi.Client.csproj", + "Lion.AbpPro.BasicManagement.HttpApi.Client"); + } + + public static string ReplacePackageReferenceDataDictionaryManagement(this string content) + { + return content.Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\DataDictionaryManagement\\src\\Lion.AbpPro.DataDictionaryManagement.Application\\Lion.AbpPro.DataDictionaryManagement.Application.csproj", + "Lion.AbpPro.DataDictionaryManagement.Application") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\DataDictionaryManagement\\src\\Lion.AbpPro.DataDictionaryManagement.Application.Contracts\\Lion.AbpPro.DataDictionaryManagement.Application.Contracts.csproj", + "Lion.AbpPro.DataDictionaryManagement.Application.Contracts") + .Replace("..\\..\\..\\..\\..\\aspnet-core\\modules\\DataDictionaryManagement\\src\\Lion.AbpPro.DataDictionaryManagement.Domain\\Lion.AbpPro.DataDictionaryManagement.Domain.csproj", + "Lion.AbpPro.DataDictionaryManagement.Domain") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\DataDictionaryManagement\\src\\Lion.AbpPro.DataDictionaryManagement.Domain.Shared\\Lion.AbpPro.DataDictionaryManagement.Domain.Shared.csproj", + "Lion.AbpPro.DataDictionaryManagement.Domain.Shared") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\DataDictionaryManagement\\src\\Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore\\Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.csproj", + "Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\DataDictionaryManagement\\src\\Lion.AbpPro.DataDictionaryManagement.FreeSqlRepository\\Lion.AbpPro.DataDictionaryManagement.FreeSqlRepository.csproj", + "Lion.AbpPro.DataDictionaryManagement.FreeSqlRepository") + .Replace("..\\..\\..\\..\\..\\aspnet-core\\modules\\DataDictionaryManagement\\src\\Lion.AbpPro.DataDictionaryManagement.HttpApi\\Lion.AbpPro.DataDictionaryManagement.HttpApi.csproj", + "Lion.AbpPro.DataDictionaryManagement.HttpApi") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\DataDictionaryManagement\\src\\Lion.AbpPro.DataDictionaryManagement.HttpApi.Client\\Lion.AbpPro.DataDictionaryManagement.HttpApi.Client.csproj", + "Lion.AbpPro.DataDictionaryManagement.HttpApi.Client"); + } + + public static string ReplacePackageReferenceFileManagement(this string content) + { + return content.Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\FileManagement\\src\\Lion.AbpPro.FileManagement.Application\\Lion.AbpPro.FileManagement.Application.csproj", + "Lion.AbpPro.FileManagement.Application") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\FileManagement\\src\\Lion.AbpPro.FileManagement.Application.Contracts\\Lion.AbpPro.FileManagement.Application.Contracts.csproj", + "Lion.AbpPro.FileManagement.Application.Contracts") + .Replace("..\\..\\..\\..\\..\\aspnet-core\\modules\\FileManagement\\src\\Lion.AbpPro.FileManagement.Domain\\Lion.AbpPro.FileManagement.Domain.csproj", + "Lion.AbpPro.FileManagement.Domain") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\FileManagement\\src\\Lion.AbpPro.FileManagement.Domain.Shared\\Lion.AbpPro.FileManagement.Domain.Shared.csproj", + "Lion.AbpPro.FileManagement.Domain.Shared") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\FileManagement\\src\\Lion.AbpPro.FileManagement.EntityFrameworkCore\\Lion.AbpPro.FileManagement.EntityFrameworkCore.csproj", + "Lion.AbpPro.FileManagement.EntityFrameworkCore") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\FileManagement\\src\\Lion.AbpPro.FileManagement.FreeSqlRepository\\Lion.AbpPro.FileManagement.FreeSqlRepository.csproj", + "Lion.AbpPro.FileManagement.FreeSqlRepository") + .Replace("..\\..\\..\\..\\..\\aspnet-core\\modules\\FileManagement\\src\\Lion.AbpPro.FileManagement.HttpApi\\Lion.AbpPro.FileManagement.HttpApi.csproj", + "Lion.AbpPro.FileManagement.HttpApi") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\FileManagement\\src\\Lion.AbpPro.FileManagement.HttpApi.Client\\Lion.AbpPro.FileManagement.HttpApi.Client.csproj", + "Lion.AbpPro.FileManagement.HttpApi.Client"); + } + + public static string ReplacePackageReferenceLanguageManagement(this string content) + { + return content.Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\LanguageManagement\\src\\Lion.AbpPro.LanguageManagement.Application\\Lion.AbpPro.LanguageManagement.Application.csproj", + "Lion.AbpPro.LanguageManagement.Application") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\LanguageManagement\\src\\Lion.AbpPro.LanguageManagement.Application.Contracts\\Lion.AbpPro.LanguageManagement.Application.Contracts.csproj", + "Lion.AbpPro.LanguageManagement.Application.Contracts") + .Replace("..\\..\\..\\..\\..\\aspnet-core\\modules\\LanguageManagement\\src\\Lion.AbpPro.LanguageManagement.Domain\\Lion.AbpPro.LanguageManagement.Domain.csproj", + "Lion.AbpPro.LanguageManagement.Domain") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\LanguageManagement\\src\\Lion.AbpPro.LanguageManagement.Domain.Shared\\Lion.AbpPro.LanguageManagement.Domain.Shared.csproj", + "Lion.AbpPro.LanguageManagement.Domain.Shared") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\LanguageManagement\\src\\Lion.AbpPro.LanguageManagement.EntityFrameworkCore\\Lion.AbpPro.LanguageManagement.EntityFrameworkCore.csproj", + "Lion.AbpPro.LanguageManagement.EntityFrameworkCore") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\LanguageManagement\\src\\Lion.AbpPro.LanguageManagement.FreeSqlRepository\\Lion.AbpPro.LanguageManagement.FreeSqlRepository.csproj", + "Lion.AbpPro.LanguageManagement.FreeSqlRepository") + .Replace("..\\..\\..\\..\\..\\aspnet-core\\modules\\LanguageManagement\\src\\Lion.AbpPro.LanguageManagement.HttpApi\\Lion.AbpPro.LanguageManagement.HttpApi.csproj", + "Lion.AbpPro.LanguageManagement.HttpApi") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\LanguageManagement\\src\\Lion.AbpPro.LanguageManagement.HttpApi.Client\\Lion.AbpPro.LanguageManagement.HttpApi.Client.csproj", + "Lion.AbpPro.LanguageManagement.HttpApi.Client"); + } + + public static string ReplacePackageReferenceNotificationManagement(this string content) + { + return content.Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\NotificationManagement\\src\\Lion.AbpPro.NotificationManagement.Application\\Lion.AbpPro.NotificationManagement.Application.csproj", + "Lion.AbpPro.NotificationManagement.Application") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\NotificationManagement\\src\\Lion.AbpPro.NotificationManagement.Application.Contracts\\Lion.AbpPro.NotificationManagement.Application.Contracts.csproj", + "Lion.AbpPro.NotificationManagement.Application.Contracts") + .Replace("..\\..\\..\\..\\..\\aspnet-core\\modules\\NotificationManagement\\src\\Lion.AbpPro.NotificationManagement.Domain\\Lion.AbpPro.NotificationManagement.Domain.csproj", + "Lion.AbpPro.NotificationManagement.Domain") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\NotificationManagement\\src\\Lion.AbpPro.NotificationManagement.Domain.Shared\\Lion.AbpPro.NotificationManagement.Domain.Shared.csproj", + "Lion.AbpPro.NotificationManagement.Domain.Shared") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\NotificationManagement\\src\\Lion.AbpPro.NotificationManagement.EntityFrameworkCore\\Lion.AbpPro.NotificationManagement.EntityFrameworkCore.csproj", + "Lion.AbpPro.NotificationManagement.EntityFrameworkCore") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\NotificationManagement\\src\\Lion.AbpPro.NotificationManagement.FreeSqlRepository\\Lion.AbpPro.NotificationManagement.FreeSqlRepository.csproj", + "Lion.AbpPro.NotificationManagement.FreeSqlRepository") + .Replace("..\\..\\..\\..\\..\\aspnet-core\\modules\\NotificationManagement\\src\\Lion.AbpPro.NotificationManagement.HttpApi\\Lion.AbpPro.NotificationManagement.HttpApi.csproj", + "Lion.AbpPro.NotificationManagement.HttpApi") + .Replace( + "..\\..\\..\\..\\..\\aspnet-core\\modules\\NotificationManagement\\src\\Lion.AbpPro.NotificationManagement.HttpApi.Client\\Lion.AbpPro.NotificationManagement.HttpApi.Client.csproj", + "Lion.AbpPro.NotificationManagement.HttpApi.Client"); + } } \ No newline at end of file diff --git a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Utils/TokenHelper.cs b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Utils/TokenHelper.cs index 3158ed7b..45e8e62b 100644 --- a/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Utils/TokenHelper.cs +++ b/aspnet-core/frameworks/src/Lion.AbpPro.Cli.Core/Lion/AbpPro/Cli/Utils/TokenHelper.cs @@ -1,4 +1,4 @@ -namespace Lion.AbpPro.Cli.Cryptography; +namespace Lion.AbpPro.Cli.Utils; public static class TokenHelper { diff --git a/aspnet-core/frameworks/test/Lion.AbpPro.Core.Cli.Tests/Lion/AbpPro/Core/Cli/LionAbpProManagerTests.cs b/aspnet-core/frameworks/test/Lion.AbpPro.Core.Cli.Tests/Lion/AbpPro/Core/Cli/LionAbpProManagerTests.cs index 342b942b..32533e6b 100644 --- a/aspnet-core/frameworks/test/Lion.AbpPro.Core.Cli.Tests/Lion/AbpPro/Core/Cli/LionAbpProManagerTests.cs +++ b/aspnet-core/frameworks/test/Lion.AbpPro.Core.Cli.Tests/Lion/AbpPro/Core/Cli/LionAbpProManagerTests.cs @@ -29,11 +29,4 @@ public sealed class LionAbpProManagerTests : LionAbpProCoreCliTestBase var result1= await _lionAbpProManager.CheckSourceCodeVersionAsync("1.2.2.3"); result1.ShouldBe(false); } - - [Fact] - public async Task DownloadAsync() - { - //await _lionAbpProManager.DownloadAsync("7.2.2.3"); - - } } \ No newline at end of file diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/Directory.Build.targets b/templates/abp-vnext-pro-nuget-all/aspnet-core/Directory.Build.targets index 8e0f5c57..4577e281 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/Directory.Build.targets +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/Directory.Build.targets @@ -10,7 +10,10 @@ $(NoWarn);CS1591;CS0436;NU1504 app true + WangJunZzz true + https://github.com/WangJunZzz/abp-vnext-pro + https://blog-resouce.oss-cn-shenzhen.aliyuncs.com/images/abp/06.jpg diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/MyCompanyName.MyProjectName.sln b/templates/abp-vnext-pro-nuget-all/aspnet-core/MyCompanyName.MyProjectName.sln index e94186d8..6d677a0e 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/MyCompanyName.MyProjectName.sln +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/MyCompanyName.MyProjectName.sln @@ -2,50 +2,57 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31410.414 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Domain", "src\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj", "{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Domain", "services\src\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj", "{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Application", "src\MyCompanyName.MyProjectName.Application\MyCompanyName.MyProjectName.Application.csproj", "{1A94A50E-06DC-43C1-80B5-B662820EC3EB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Application", "services\src\MyCompanyName.MyProjectName.Application\MyCompanyName.MyProjectName.Application.csproj", "{1A94A50E-06DC-43C1-80B5-B662820EC3EB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.EntityFrameworkCore", "src\MyCompanyName.MyProjectName.EntityFrameworkCore\MyCompanyName.MyProjectName.EntityFrameworkCore.csproj", "{C956DD76-69C8-4A9C-83EA-D17DF83340FD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.EntityFrameworkCore", "services\src\MyCompanyName.MyProjectName.EntityFrameworkCore\MyCompanyName.MyProjectName.EntityFrameworkCore.csproj", "{C956DD76-69C8-4A9C-83EA-D17DF83340FD}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CA9AC87F-097E-4F15-8393-4BC07735A5B0}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{04DBDB01-70F4-4E06-B468-8F87850B22BE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Application.Tests", "test\MyCompanyName.MyProjectName.Application.Tests\MyCompanyName.MyProjectName.Application.Tests.csproj", "{50B2631D-129C-47B3-A587-029CCD6099BC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Application.Tests", "services\test\MyCompanyName.MyProjectName.Application.Tests\MyCompanyName.MyProjectName.Application.Tests.csproj", "{50B2631D-129C-47B3-A587-029CCD6099BC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Domain.Shared", "src\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Domain.Shared", "services\src\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Application.Contracts", "src\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Application.Contracts", "services\src\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi", "src\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj", "{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi", "services\src\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj", "{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.Client", "src\MyCompanyName.MyProjectName.HttpApi.Client\MyCompanyName.MyProjectName.HttpApi.Client.csproj", "{3B5A0094-670D-4BB1-BFDD-61B88A8773DC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.Client", "services\src\MyCompanyName.MyProjectName.HttpApi.Client\MyCompanyName.MyProjectName.HttpApi.Client.csproj", "{3B5A0094-670D-4BB1-BFDD-61B88A8773DC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.EntityFrameworkCore.Tests", "test\MyCompanyName.MyProjectName.EntityFrameworkCore.Tests\MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj", "{1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.EntityFrameworkCore.Tests", "services\test\MyCompanyName.MyProjectName.EntityFrameworkCore.Tests\MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj", "{1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.TestBase", "test\MyCompanyName.MyProjectName.TestBase\MyCompanyName.MyProjectName.TestBase.csproj", "{91853F21-9CD9-4132-BC29-A7D5D84FFFE7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.TestBase", "services\test\MyCompanyName.MyProjectName.TestBase\MyCompanyName.MyProjectName.TestBase.csproj", "{91853F21-9CD9-4132-BC29-A7D5D84FFFE7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Domain.Tests", "test\MyCompanyName.MyProjectName.Domain.Tests\MyCompanyName.MyProjectName.Domain.Tests.csproj", "{E512F4D9-9375-480F-A2F6-A46509F9D824}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Domain.Tests", "services\test\MyCompanyName.MyProjectName.Domain.Tests\MyCompanyName.MyProjectName.Domain.Tests.csproj", "{E512F4D9-9375-480F-A2F6-A46509F9D824}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.DbMigrator", "src\MyCompanyName.MyProjectName.DbMigrator\MyCompanyName.MyProjectName.DbMigrator.csproj", "{AA94D832-1CCC-4715-95A9-A483F23A1A5D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp", "services\test\MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp\MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj", "{EF480016-9127-4916-8735-D2466BDBC582}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.DbMigrator", "services\src\MyCompanyName.MyProjectName.DbMigrator\MyCompanyName.MyProjectName.DbMigrator.csproj", "{AA94D832-1CCC-4715-95A9-A483F23A1A5D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "services", "services", "{2C861ADD-76E9-4B3B-8A3C-638EBB67D683}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.Solution Items", "0.Solution Items", "{2C4A6DB8-8D9E-42E6-B7C3-1EDB7B3DE22E}" ProjectSection(SolutionItems) = preProject - Directory.Build.Lion.targets = Directory.Build.Lion.targets + global.json = global.json + NuGet.Config = NuGet.Config Directory.Build.Microsoft.targets = Directory.Build.Microsoft.targets Directory.Build.targets = Directory.Build.targets Directory.Build.Volo.targets = Directory.Build.Volo.targets - global.json = global.json + Directory.Build.Lion.targets = Directory.Build.Lion.targets EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "host", "host", "{8C1B8C6C-C518-4290-B070-622CCA6004DA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.Host", "host\MyCompanyName.MyProjectName.HttpApi.Host\MyCompanyName.MyProjectName.HttpApi.Host.csproj", "{FB20372D-6C96-4733-9AAC-12522F15CAA6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.Host", "services\host\MyCompanyName.MyProjectName.HttpApi.Host\MyCompanyName.MyProjectName.HttpApi.Host.csproj", "{FB20372D-6C96-4733-9AAC-12522F15CAA6}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gateways", "gateways", "{5C304CBC-F30D-413C-A0AF-8B6814A2D4A3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.FreeSqlRepository", "src\MyCompanyName.MyProjectName.FreeSqlRepository\MyCompanyName.MyProjectName.FreeSqlRepository.csproj", "{27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.WebGateway", "gateways\MyCompanyName.MyProjectName.WebGateway\MyCompanyName.MyProjectName.WebGateway.csproj", "{D9108313-8D05-4F5F-9AA0-B443EC3374B6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp", "test\MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp\MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj", "{A5E9AAA7-B3A2-44CC-83B8-7260057185E6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.FreeSqlRepository", "services\src\MyCompanyName.MyProjectName.FreeSqlRepository\MyCompanyName.MyProjectName.FreeSqlRepository.csproj", "{27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -97,6 +104,10 @@ Global {E512F4D9-9375-480F-A2F6-A46509F9D824}.Debug|Any CPU.Build.0 = Debug|Any CPU {E512F4D9-9375-480F-A2F6-A46509F9D824}.Release|Any CPU.ActiveCfg = Release|Any CPU {E512F4D9-9375-480F-A2F6-A46509F9D824}.Release|Any CPU.Build.0 = Release|Any CPU + {EF480016-9127-4916-8735-D2466BDBC582}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EF480016-9127-4916-8735-D2466BDBC582}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EF480016-9127-4916-8735-D2466BDBC582}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EF480016-9127-4916-8735-D2466BDBC582}.Release|Any CPU.Build.0 = Release|Any CPU {AA94D832-1CCC-4715-95A9-A483F23A1A5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AA94D832-1CCC-4715-95A9-A483F23A1A5D}.Debug|Any CPU.Build.0 = Debug|Any CPU {AA94D832-1CCC-4715-95A9-A483F23A1A5D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -105,14 +116,14 @@ Global {FB20372D-6C96-4733-9AAC-12522F15CAA6}.Debug|Any CPU.Build.0 = Debug|Any CPU {FB20372D-6C96-4733-9AAC-12522F15CAA6}.Release|Any CPU.ActiveCfg = Release|Any CPU {FB20372D-6C96-4733-9AAC-12522F15CAA6}.Release|Any CPU.Build.0 = Release|Any CPU + {D9108313-8D05-4F5F-9AA0-B443EC3374B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D9108313-8D05-4F5F-9AA0-B443EC3374B6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D9108313-8D05-4F5F-9AA0-B443EC3374B6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D9108313-8D05-4F5F-9AA0-B443EC3374B6}.Release|Any CPU.Build.0 = Release|Any CPU {27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}.Debug|Any CPU.Build.0 = Debug|Any CPU {27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}.Release|Any CPU.ActiveCfg = Release|Any CPU {27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}.Release|Any CPU.Build.0 = Release|Any CPU - {A5E9AAA7-B3A2-44CC-83B8-7260057185E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A5E9AAA7-B3A2-44CC-83B8-7260057185E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A5E9AAA7-B3A2-44CC-83B8-7260057185E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A5E9AAA7-B3A2-44CC-83B8-7260057185E6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -121,6 +132,8 @@ Global {554AD327-6DBA-4F8F-96F8-81CE7A0C863F} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {1A94A50E-06DC-43C1-80B5-B662820EC3EB} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {C956DD76-69C8-4A9C-83EA-D17DF83340FD} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {CA9AC87F-097E-4F15-8393-4BC07735A5B0} = {2C861ADD-76E9-4B3B-8A3C-638EBB67D683} + {04DBDB01-70F4-4E06-B468-8F87850B22BE} = {2C861ADD-76E9-4B3B-8A3C-638EBB67D683} {50B2631D-129C-47B3-A587-029CCD6099BC} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} {42F719ED-8413-4895-B5B4-5AB56079BC66} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {520659C8-C734-4298-A3DA-B539DB9DFC0B} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} @@ -129,10 +142,12 @@ Global {1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} {91853F21-9CD9-4132-BC29-A7D5D84FFFE7} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} {E512F4D9-9375-480F-A2F6-A46509F9D824} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} + {EF480016-9127-4916-8735-D2466BDBC582} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} {AA94D832-1CCC-4715-95A9-A483F23A1A5D} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {8C1B8C6C-C518-4290-B070-622CCA6004DA} = {2C861ADD-76E9-4B3B-8A3C-638EBB67D683} {FB20372D-6C96-4733-9AAC-12522F15CAA6} = {8C1B8C6C-C518-4290-B070-622CCA6004DA} + {D9108313-8D05-4F5F-9AA0-B443EC3374B6} = {5C304CBC-F30D-413C-A0AF-8B6814A2D4A3} {27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} - {A5E9AAA7-B3A2-44CC-83B8-7260057185E6} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs index 7680d5c7..33760843 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs @@ -12,7 +12,6 @@ global using Hangfire.Common; global using Hangfire.Dashboard; global using Hangfire.States; global using Hangfire.Storage; -global using Lion.AbpPro; global using MyCompanyName.MyProjectName.EntityFrameworkCore; global using MyCompanyName.MyProjectName.Extensions; global using MyCompanyName.MyProjectName.Extensions.Hangfire; @@ -38,7 +37,6 @@ global using Microsoft.IdentityModel.Tokens; global using Microsoft.OpenApi.Models; global using Serilog; global using StackExchange.Redis; -global using Swagger; global using Swashbuckle.AspNetCore.SwaggerUI; global using Volo.Abp; global using Volo.Abp.Account.Web; diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj index 01714830..9bd99d1a 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj @@ -1,5 +1,5 @@ - + net7.0 @@ -9,7 +9,6 @@ - @@ -40,7 +39,6 @@ - @@ -48,7 +46,11 @@ - + + + + + diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index 59d7c8be..f2f1c6a5 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -1,3 +1,6 @@ +using Lion.AbpPro; +using Swagger; + namespace MyCompanyName.MyProjectName { [DependsOn( @@ -14,7 +17,6 @@ namespace MyCompanyName.MyProjectName )] public class MyProjectNameHttpApiHostModule : AbpModule { - public override void ConfigureServices(ServiceConfigurationContext context) { var configuration = context.Services.GetConfiguration(); @@ -30,6 +32,8 @@ namespace MyCompanyName.MyProjectName public override void OnApplicationInitialization(ApplicationInitializationContext context) { var app = context.GetApplicationBuilder(); + var configuration = context.GetConfiguration(); + app.UseAbpRequestLocalization(); app.UseCorrelationId(); app.UseStaticFiles(); @@ -57,8 +61,14 @@ namespace MyCompanyName.MyProjectName app.UseUnitOfWork(); app.UseConfiguredEndpoints(endpoints => { endpoints.MapHealthChecks("/health"); }); - + + + if (configuration.GetValue("Consul:Enabled", false)) + { + app.UseConsul(); + } } + private void ConfigurationSignalR(ServiceConfigurationContext context) { var redisConnection = context.Services.GetConfiguration()["Redis:Configuration"]; @@ -70,6 +80,7 @@ namespace MyCompanyName.MyProjectName context.Services.AddSignalR().AddStackExchangeRedis(redisConnection, options => { options.Configuration.ChannelPrefix = "Lion.AbpPro"; }); } + /// /// 配置MiniProfiler /// @@ -81,7 +92,8 @@ namespace MyCompanyName.MyProjectName /// /// 配置JWT /// - private void ConfigureJwtAuthentication(ServiceConfigurationContext context, IConfiguration configuration) + private void ConfigureJwtAuthentication(ServiceConfigurationContext context, + IConfiguration configuration) { context.Services.AddAuthentication(options => { @@ -146,7 +158,6 @@ namespace MyCompanyName.MyProjectName }); } - /// /// Redis缓存 @@ -163,7 +174,6 @@ namespace MyCompanyName.MyProjectName } - /// /// 配置Identity /// @@ -240,7 +250,6 @@ namespace MyCompanyName.MyProjectName } - /// /// 审计日志 /// diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Monitor.cshtml b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Monitor.cshtml index ebf35a54..6d5decea 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Monitor.cshtml +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Monitor.cshtml @@ -38,18 +38,18 @@ - @*
*@ - @*
*@ - @* *@ - @* *@ - @* *@ - @*
*@ - @*

*@ - @* Hangfire面板 *@ - @*

*@ - @*
*@ - @*
*@ - @*
*@ +
+
+ + + +
+

+ Hangfire面板 +

+
+
+
diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs index 1cf9c196..0b4fd9f2 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs @@ -10,6 +10,7 @@ namespace MyCompanyName.MyProjectName public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); + } } } diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.Production.json b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.Production.json index cc715dc6..dad4b227 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.Production.json +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.Production.json @@ -5,7 +5,7 @@ "Serilog.Sinks.File" ], "MinimumLevel": { - "Default": "Debug", + "Default": "Information", "Override": { "Microsoft": "Information", "Volo.Abp": "Information", @@ -34,10 +34,10 @@ "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200,http://localhost:3100,http://localhost:80,http://localhost" }, "ConnectionStrings": { - "Default": "Data Source=localhost;Port=3306;Database=MyCompanyNameMyProjectNameDB;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true" + "Default": "Data Source=mysql;Port=3306;Database=MyCompanyNameMyProjectNameDB;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true" }, "Redis": { - "Configuration": "localhost,password=1q2w3E*,defaultdatabase=1" + "Configuration": "redis,password=1q2w3E*,defaultdatabase=1" }, "Jwt": { "Audience": "MyCompanyName.MyProjectName", diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json index 832d3ab8..ade24ccc 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json @@ -34,8 +34,7 @@ "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200,http://localhost:3100" }, "ConnectionStrings": { - "Default": "Data Source=localhost;Port=3306;Database=MyCompanyNameMyProjectNameDB;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true", - "Hangfire": "localhost,password=mypassword,defaultdatabase=2" + "Default": "Data Source=localhost;Port=3306;Database=MyCompanyNameMyProjectNameDB;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true" }, "Redis": { "Configuration": "localhost,password=1q2w3E*,defaultdatabase=1" @@ -53,5 +52,10 @@ "UserName": "elastic", "Password": "aVVhjQ95RP7nbwNy", "SearchIndexFormat": "MyCompanyName.MyProjectName.development*" + }, + "Consul": { + "Enabled": false, + "Host": "http://localhost:8500", + "Service": "Project-Service" } } \ No newline at end of file diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/Dockerfile b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/Dockerfile similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/Dockerfile rename to templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/Dockerfile diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/GlobalUsings.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/GlobalUsings.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/GlobalUsings.cs rename to templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/GlobalUsings.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/MyCompanyName.MyProjectName.WebGateway.csproj b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/MyCompanyName.MyProjectName.WebGateway.csproj similarity index 53% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/MyCompanyName.MyProjectName.WebGateway.csproj rename to templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/MyCompanyName.MyProjectName.WebGateway.csproj index a8c33bb1..729d6a97 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/MyCompanyName.MyProjectName.WebGateway.csproj +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/MyCompanyName.MyProjectName.WebGateway.csproj @@ -5,6 +5,6 @@ - + diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/Program.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/Program.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/Program.cs rename to templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/Program.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/Properties/launchSettings.json b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/Properties/launchSettings.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/Properties/launchSettings.json rename to templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/Properties/launchSettings.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/Startup.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/Startup.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/Startup.cs rename to templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/Startup.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/WebGatewayModule.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/WebGatewayModule.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/WebGatewayModule.cs rename to templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/WebGatewayModule.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/appsettings.Consul.json b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/appsettings.Consul.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/appsettings.Consul.json rename to templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/appsettings.Consul.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/appsettings.Production.json b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/appsettings.Production.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/appsettings.Production.json rename to templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/appsettings.Production.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/appsettings.json b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/appsettings.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/gateways/MyCompanyName.MyProjectName.WebGateway/appsettings.json rename to templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.WebGateway/appsettings.json diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj index 951db97f..adb1ec4d 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj @@ -1,8 +1,7 @@ - - - + + - net7.0 + net7.0 MyCompanyName.MyProjectName @@ -11,11 +10,13 @@ - - - - + + + + + + diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj index e7c6970c..9724fe67 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj @@ -11,13 +11,15 @@ - + + + + + + + - - - - diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/DbMigratorHostedService.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/DbMigratorHostedService.cs index 71387df0..03a9f6ad 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/DbMigratorHostedService.cs +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/DbMigratorHostedService.cs @@ -4,13 +4,11 @@ namespace MyCompanyName.MyProjectName.DbMigrator { private readonly IHostApplicationLifetime _hostApplicationLifetime; private readonly IConfiguration _configuration; - private readonly IHostEnvironment _hostEnvironment; public DbMigratorHostedService(IHostApplicationLifetime hostApplicationLifetime, - IConfiguration configuration, IHostEnvironment hostEnvironment) + IConfiguration configuration) { _hostApplicationLifetime = hostApplicationLifetime; _configuration = configuration; - _hostEnvironment = hostEnvironment; } public async Task StartAsync(CancellationToken cancellationToken) @@ -23,15 +21,12 @@ namespace MyCompanyName.MyProjectName.DbMigrator })) { await application.InitializeAsync(); - var conn = _configuration.GetValue("ConnectionStrings:Default"); - Console.WriteLine("ConnectionStrings:" + conn); - var s = _hostEnvironment.EnvironmentName; - Console.WriteLine("EnvironmentName:" + s); + await application .ServiceProvider .GetRequiredService() .MigrateAsync(); - + await application.ShutdownAsync(); _hostApplicationLifetime.StopApplication(); diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj index 20e551aa..da26129b 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj @@ -1,7 +1,5 @@ - - Exe net7.0 diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs index 38c83716..7f3c4cc7 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs @@ -36,7 +36,7 @@ namespace MyCompanyName.MyProjectName.DbMigrator otpions.AddJsonFile(appSettingFileName, optional: true); } - ) + ) .ConfigureServices((hostContext, services) => { services.AddHostedService(); diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj index 6b73ef9a..fc7adf32 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj @@ -10,15 +10,14 @@ - - + - - - - + + + + - + diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs index 6d9f8c26..89fa000e 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs @@ -3,6 +3,7 @@ namespace MyCompanyName.MyProjectName.Data public class MyProjectNameDbMigrationService : ITransientDependency { public ILogger Logger { get; set; } + private readonly IDataSeeder _dataSeeder; private readonly IEnumerable _dbSchemaMigrators; private readonly ITenantRepository _tenantRepository; diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj index 27cac0f2..035f11ba 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj @@ -1,5 +1,7 @@ + + net7.0 MyCompanyName.MyProjectName @@ -12,5 +14,10 @@ + + + + + diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs index 88e0f1ad..5bb350fd 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs @@ -50,9 +50,9 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore protected override void OnModelCreating(ModelBuilder builder) { - - base.OnModelCreating(builder); + base.OnModelCreating(builder); + builder.ConfigureMyProjectName(); // 基础模块 @@ -64,5 +64,6 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore //数据字典 builder.ConfigureDataDictionaryManagement(); } + } } \ No newline at end of file diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs index 17202aac..800af748 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs @@ -27,6 +27,10 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore * default repositories only for aggregate roots */ options.AddDefaultRepositories(includeAllEntities: true); }); + Configure(options => + { + options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsString; + }); Configure(options => { /* The main point to change your DBMS. diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20230517131456_Init.Designer.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20230517131456_Init.Designer.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20230517131456_Init.Designer.cs rename to templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20230517131456_Init.Designer.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20230517131456_Init.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20230517131456_Init.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20230517131456_Init.cs rename to templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20230517131456_Init.cs diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj index 03b00e9c..0265faa7 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj @@ -9,10 +9,14 @@ - - - + + + + + + + runtime; build; native; contentfiles; analyzers diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj index 837df4aa..0ab70fa9 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj @@ -12,10 +12,9 @@ - - - - + + + - + diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj index 9546f6c4..e39f0780 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj @@ -13,9 +13,12 @@ - - - + + + + + + diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj b/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj index 9746e8f2..38e867ac 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj @@ -1,6 +1,4 @@ - - net7.0 MyCompanyName.MyProjectName diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj b/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj index 5650b251..14ed0130 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj @@ -1,7 +1,4 @@ - - - net7.0 MyCompanyName.MyProjectName diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs index 5f19aa3f..48ec9830 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs @@ -20,10 +20,6 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore services.Configure(options => { - options.PreConfigure(options => - { - options.DbContextOptions.UseBatchEF_Sqlite(); - }); options.Configure(context => { context.DbContextOptions.UseSqlite(_sqliteConnection); diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj b/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj index 0e1f9847..ca2cc057 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj @@ -1,7 +1,4 @@ - - - net7.0 MyCompanyName.MyProjectName @@ -12,7 +9,6 @@ - diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests.csproj b/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests.csproj similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests.csproj rename to templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests.csproj diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests/MyProjectNameFreeSqlRepositoryTestBase.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests/MyProjectNameFreeSqlRepositoryTestBase.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests/MyProjectNameFreeSqlRepositoryTestBase.cs rename to templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests/MyProjectNameFreeSqlRepositoryTestBase.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests/MyProjectNameFreeSqlRepositoryTestModule.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests/MyProjectNameFreeSqlRepositoryTestModule.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests/MyProjectNameFreeSqlRepositoryTestModule.cs rename to templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests/MyProjectNameFreeSqlRepositoryTestModule.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests/Users/UserFreeSqlBasicRepository_Tests.cs b/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests/Users/UserFreeSqlBasicRepository_Tests.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests/Users/UserFreeSqlBasicRepository_Tests.cs rename to templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.FreeSqlReppsitory.Tests/Users/UserFreeSqlBasicRepository_Tests.cs diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj b/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj index 428343dd..a218c4e7 100644 --- a/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj +++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj @@ -1,7 +1,4 @@ - - - net7.0 MyCompanyName.MyProjectName diff --git a/templates/abp-vnext-pro-nuget-all/deploy.bat b/templates/abp-vnext-pro-nuget-all/deploy.bat index fd9da9b4..16c1a0b7 100644 --- a/templates/abp-vnext-pro-nuget-all/deploy.bat +++ b/templates/abp-vnext-pro-nuget-all/deploy.bat @@ -6,6 +6,8 @@ cd ./aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator && dotnet publish -o cd %~dp0 cd ./aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host && dotnet publish -o publish cd %~dp0 +cd %~dp0 +cd ./aspnet-core/gateways/\MyCompanyName.MyProjectName.WebGateway && dotnet publish -o publish diff --git a/templates/abp-vnext-pro-nuget-all/vben28/.env.development b/templates/abp-vnext-pro-nuget-all/vben28/.env.development index 11ec094b..850d5ee4 100644 --- a/templates/abp-vnext-pro-nuget-all/vben28/.env.development +++ b/templates/abp-vnext-pro-nuget-all/vben28/.env.development @@ -21,9 +21,8 @@ VITE_GLOB_UPLOAD_URL=/upload # Interface prefix VITE_GLOB_API_URL_PREFIX= - # 接口地址 -VITE_API_URL= http://localhost:44315 +VITE_API_URL= http://localhost:44314/gateway # WEBSOCKE 地址 -VITE_WEBSOCKE_URL= http://localhost:44315 +VITE_WEBSOCKE_URL= http://localhost:44314/ws diff --git a/templates/abp-vnext-pro-nuget-all/vben28/.env.production b/templates/abp-vnext-pro-nuget-all/vben28/.env.production index 00a7fb2f..edd941cb 100644 --- a/templates/abp-vnext-pro-nuget-all/vben28/.env.production +++ b/templates/abp-vnext-pro-nuget-all/vben28/.env.production @@ -34,9 +34,8 @@ VITE_USE_PWA = false # Is it compatible with older browsers VITE_LEGACY = false - # 接口地址 -VITE_API_URL= http://localhost:8080 +VITE_API_URL= http://localhost:8081/gateway # WEBSOCKE 地址 -VITE_WEBSOCKE_URL= http://localhost:8080 +VITE_WEBSOCKE_URL= http://localhost:8081/ws diff --git a/templates/abp-vnext-pro-nuget-all/vben28/package.json b/templates/abp-vnext-pro-nuget-all/vben28/package.json index 4b24af76..cb6c684d 100644 --- a/templates/abp-vnext-pro-nuget-all/vben28/package.json +++ b/templates/abp-vnext-pro-nuget-all/vben28/package.json @@ -37,7 +37,7 @@ "@iconify/iconify": "^2.2.1", "@logicflow/core": "^1.1.13", "@logicflow/extension": "^1.1.13", - "@microsoft/signalr": "^7.0.2", + "@microsoft/signalr": "^6.0.6", "@vue/runtime-core": "^3.2.33", "@vue/shared": "^3.2.33", "@vueuse/core": "^8.3.0", @@ -112,6 +112,7 @@ "eslint-plugin-vue": "^8.6.0", "esno": "^0.14.1", "fs-extra": "^10.1.0", + "inquirer": "^8.2.2", "less": "^4.1.2", "lint-staged": "12.3.7", diff --git a/templates/abp-vnext-pro-nuget-all/vben28/src/locales/lang/en/routes/admin.ts b/templates/abp-vnext-pro-nuget-all/vben28/src/locales/lang/en/routes/admin.ts index fbd9e42e..3ae3d5a5 100644 --- a/templates/abp-vnext-pro-nuget-all/vben28/src/locales/lang/en/routes/admin.ts +++ b/templates/abp-vnext-pro-nuget-all/vben28/src/locales/lang/en/routes/admin.ts @@ -35,7 +35,6 @@ export default { audit_url: 'URL', audit_entityInfo: 'EntityInformation', audit_message: 'Message', - audit_hasException: 'HasException', audit_hasException_all: 'All', audit_hasException_yes: 'Yes', audit_hasException_no: 'No', diff --git a/templates/abp-vnext-pro-nuget-all/vben28/src/services/ServiceProxies.ts b/templates/abp-vnext-pro-nuget-all/vben28/src/services/ServiceProxies.ts index 494922d8..e425176e 100644 --- a/templates/abp-vnext-pro-nuget-all/vben28/src/services/ServiceProxies.ts +++ b/templates/abp-vnext-pro-nuget-all/vben28/src/services/ServiceProxies.ts @@ -136,10 +136,15 @@ export class AbpApplicationConfigurationServiceProxy extends ServiceProxyBase { } /** + * @param includeLocalizationResources (optional) * @return Success */ - applicationConfiguration( cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/api/abp/application-configuration"; + applicationConfiguration(includeLocalizationResources: boolean | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/api/abp/application-configuration?"; + if (includeLocalizationResources === null) + throw new Error("The parameter 'includeLocalizationResources' cannot be null."); + else if (includeLocalizationResources !== undefined) + url_ += "IncludeLocalizationResources=" + encodeURIComponent("" + includeLocalizationResources) + "&"; url_ = url_.replace(/[?&]$/, ""); let options_ = { @@ -231,6 +236,122 @@ export class AbpApplicationConfigurationServiceProxy extends ServiceProxyBase { } } +export class AbpApplicationLocalizationServiceProxy extends ServiceProxyBase { + private instance: AxiosInstance; + private baseUrl: string; + protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; + + constructor(baseUrl?: string, instance?: AxiosInstance) { + super(); + this.instance = instance ? instance : axios.create(); + this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; + } + + /** + * @param onlyDynamics (optional) + * @return Success + */ + applicationLocalization(cultureName: string, onlyDynamics: boolean | undefined , cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/api/abp/application-localization?"; + if (cultureName === undefined || cultureName === null) + throw new Error("The parameter 'cultureName' must be defined and cannot be null."); + else + url_ += "CultureName=" + encodeURIComponent("" + cultureName) + "&"; + if (onlyDynamics === null) + throw new Error("The parameter 'onlyDynamics' cannot be null."); + else if (onlyDynamics !== undefined) + url_ += "OnlyDynamics=" + encodeURIComponent("" + onlyDynamics) + "&"; + url_ = url_.replace(/[?&]$/, ""); + + let options_ = { + method: "GET", + url: url_, + headers: { + "Accept": "text/plain" + }, + cancelToken + }; + + return this.transformOptions(options_).then(transformedOptions_ => { + return this.instance.request(transformedOptions_); + }).catch((_error: any) => { + if (isAxiosError(_error) && _error.response) { + return _error.response; + } else { + throw _error; + } + }).then((_response: AxiosResponse) => { + return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processApplicationLocalization(_response)); + }); + } + + protected processApplicationLocalization(response: AxiosResponse): Promise { + const status = response.status; + let _headers: any = {}; + if (response.headers && typeof response.headers === "object") { + for (let k in response.headers) { + if (response.headers.hasOwnProperty(k)) { + _headers[k] = response.headers[k]; + } + } + } + if (status === 200) { + const _responseText = response.data; + let result200: any = null; + let resultData200 = _responseText; + result200 = ApplicationLocalizationDto.fromJS(resultData200); + return Promise.resolve(result200); + + } else if (status === 403) { + const _responseText = response.data; + let result403: any = null; + let resultData403 = _responseText; + result403 = RemoteServiceErrorResponse.fromJS(resultData403); + return throwException("Forbidden", status, _responseText, _headers, result403); + + } else if (status === 401) { + const _responseText = response.data; + let result401: any = null; + let resultData401 = _responseText; + result401 = RemoteServiceErrorResponse.fromJS(resultData401); + return throwException("Unauthorized", status, _responseText, _headers, result401); + + } else if (status === 400) { + const _responseText = response.data; + let result400: any = null; + let resultData400 = _responseText; + result400 = RemoteServiceErrorResponse.fromJS(resultData400); + return throwException("Bad Request", status, _responseText, _headers, result400); + + } else if (status === 404) { + const _responseText = response.data; + let result404: any = null; + let resultData404 = _responseText; + result404 = RemoteServiceErrorResponse.fromJS(resultData404); + return throwException("Not Found", status, _responseText, _headers, result404); + + } else if (status === 501) { + const _responseText = response.data; + let result501: any = null; + let resultData501 = _responseText; + result501 = RemoteServiceErrorResponse.fromJS(resultData501); + return throwException("Server Error", status, _responseText, _headers, result501); + + } else if (status === 500) { + const _responseText = response.data; + let result500: any = null; + let resultData500 = _responseText; + result500 = RemoteServiceErrorResponse.fromJS(resultData500); + return throwException("Server Error", status, _responseText, _headers, result500); + + } else if (status !== 200 && status !== 204) { + const _responseText = response.data; + return throwException("An unexpected server error occurred.", status, _responseText, _headers); + } + return Promise.resolve(null as any); + } +} + export class AccountServiceProxy extends ServiceProxyBase { private instance: AxiosInstance; private baseUrl: string; @@ -6333,7 +6454,6 @@ export interface IApplicationApiDescriptionModel { } export class ApplicationAuthConfigurationDto implements IApplicationAuthConfigurationDto { - policies!: { [key: string]: boolean; } | undefined; grantedPolicies!: { [key: string]: boolean; } | undefined; constructor(data?: IApplicationAuthConfigurationDto) { @@ -6347,13 +6467,6 @@ export class ApplicationAuthConfigurationDto implements IApplicationAuthConfigur init(_data?: any) { if (_data) { - if (_data["policies"]) { - this.policies = {} as any; - for (let key in _data["policies"]) { - if (_data["policies"].hasOwnProperty(key)) - (this.policies)![key] = _data["policies"][key]; - } - } if (_data["grantedPolicies"]) { this.grantedPolicies = {} as any; for (let key in _data["grantedPolicies"]) { @@ -6373,13 +6486,6 @@ export class ApplicationAuthConfigurationDto implements IApplicationAuthConfigur toJSON(data?: any) { data = typeof data === 'object' ? data : {}; - if (this.policies) { - data["policies"] = {}; - for (let key in this.policies) { - if (this.policies.hasOwnProperty(key)) - (data["policies"])[key] = (this.policies)[key]; - } - } if (this.grantedPolicies) { data["grantedPolicies"] = {}; for (let key in this.grantedPolicies) { @@ -6392,7 +6498,6 @@ export class ApplicationAuthConfigurationDto implements IApplicationAuthConfigur } export interface IApplicationAuthConfigurationDto { - policies: { [key: string]: boolean; } | undefined; grantedPolicies: { [key: string]: boolean; } | undefined; } @@ -6582,6 +6687,7 @@ export interface IApplicationGlobalFeatureConfigurationDto { export class ApplicationLocalizationConfigurationDto implements IApplicationLocalizationConfigurationDto { values!: { [key: string]: { [key: string]: string; }; } | undefined; + resources!: { [key: string]: ApplicationLocalizationResourceDto; } | undefined; languages!: LanguageInfo[] | undefined; currentCulture!: CurrentCultureDto; defaultResourceName!: string | undefined; @@ -6606,6 +6712,13 @@ export class ApplicationLocalizationConfigurationDto implements IApplicationLoca (this.values)![key] = _data["values"][key]; } } + if (_data["resources"]) { + this.resources = {} as any; + for (let key in _data["resources"]) { + if (_data["resources"].hasOwnProperty(key)) + (this.resources)![key] = _data["resources"][key] ? ApplicationLocalizationResourceDto.fromJS(_data["resources"][key]) : new ApplicationLocalizationResourceDto(); + } + } if (Array.isArray(_data["languages"])) { this.languages = [] as any; for (let item of _data["languages"]) @@ -6646,6 +6759,13 @@ export class ApplicationLocalizationConfigurationDto implements IApplicationLoca (data["values"])[key] = (this.values)[key]; } } + if (this.resources) { + data["resources"] = {}; + for (let key in this.resources) { + if (this.resources.hasOwnProperty(key)) + (data["resources"])[key] = this.resources[key] ? this.resources[key].toJSON() : undefined; + } + } if (Array.isArray(this.languages)) { data["languages"] = []; for (let item of this.languages) @@ -6673,6 +6793,7 @@ export class ApplicationLocalizationConfigurationDto implements IApplicationLoca export interface IApplicationLocalizationConfigurationDto { values: { [key: string]: { [key: string]: string; }; } | undefined; + resources: { [key: string]: ApplicationLocalizationResourceDto; } | undefined; languages: LanguageInfo[] | undefined; currentCulture: CurrentCultureDto; defaultResourceName: string | undefined; @@ -6680,6 +6801,114 @@ export interface IApplicationLocalizationConfigurationDto { languageFilesMap: { [key: string]: NameValue[]; } | undefined; } +export class ApplicationLocalizationDto implements IApplicationLocalizationDto { + resources!: { [key: string]: ApplicationLocalizationResourceDto; } | undefined; + + constructor(data?: IApplicationLocalizationDto) { + if (data) { + for (var property in data) { + if (data.hasOwnProperty(property)) + (this)[property] = (data)[property]; + } + } + } + + init(_data?: any) { + if (_data) { + if (_data["resources"]) { + this.resources = {} as any; + for (let key in _data["resources"]) { + if (_data["resources"].hasOwnProperty(key)) + (this.resources)![key] = _data["resources"][key] ? ApplicationLocalizationResourceDto.fromJS(_data["resources"][key]) : new ApplicationLocalizationResourceDto(); + } + } + } + } + + static fromJS(data: any): ApplicationLocalizationDto { + data = typeof data === 'object' ? data : {}; + let result = new ApplicationLocalizationDto(); + result.init(data); + return result; + } + + toJSON(data?: any) { + data = typeof data === 'object' ? data : {}; + if (this.resources) { + data["resources"] = {}; + for (let key in this.resources) { + if (this.resources.hasOwnProperty(key)) + (data["resources"])[key] = this.resources[key] ? this.resources[key].toJSON() : undefined; + } + } + return data; + } +} + +export interface IApplicationLocalizationDto { + resources: { [key: string]: ApplicationLocalizationResourceDto; } | undefined; +} + +export class ApplicationLocalizationResourceDto implements IApplicationLocalizationResourceDto { + texts!: { [key: string]: string; } | undefined; + baseResources!: string[] | undefined; + + constructor(data?: IApplicationLocalizationResourceDto) { + if (data) { + for (var property in data) { + if (data.hasOwnProperty(property)) + (this)[property] = (data)[property]; + } + } + } + + init(_data?: any) { + if (_data) { + if (_data["texts"]) { + this.texts = {} as any; + for (let key in _data["texts"]) { + if (_data["texts"].hasOwnProperty(key)) + (this.texts)![key] = _data["texts"][key]; + } + } + if (Array.isArray(_data["baseResources"])) { + this.baseResources = [] as any; + for (let item of _data["baseResources"]) + this.baseResources!.push(item); + } + } + } + + static fromJS(data: any): ApplicationLocalizationResourceDto { + data = typeof data === 'object' ? data : {}; + let result = new ApplicationLocalizationResourceDto(); + result.init(data); + return result; + } + + toJSON(data?: any) { + data = typeof data === 'object' ? data : {}; + if (this.texts) { + data["texts"] = {}; + for (let key in this.texts) { + if (this.texts.hasOwnProperty(key)) + (data["texts"])[key] = (this.texts)[key]; + } + } + if (Array.isArray(this.baseResources)) { + data["baseResources"] = []; + for (let item of this.baseResources) + data["baseResources"].push(item); + } + return data; + } +} + +export interface IApplicationLocalizationResourceDto { + texts: { [key: string]: string; } | undefined; + baseResources: string[] | undefined; +} + export class ApplicationSettingConfigurationDto implements IApplicationSettingConfigurationDto { values!: { [key: string]: string; } | undefined; @@ -6808,6 +7037,7 @@ export class ControllerApiDescriptionModel implements IControllerApiDescriptionM controllerName!: string | undefined; controllerGroupName!: string | undefined; isRemoteService!: boolean; + isIntegrationService!: boolean; apiVersion!: string | undefined; type!: string | undefined; interfaces!: ControllerInterfaceApiDescriptionModel[] | undefined; @@ -6827,6 +7057,7 @@ export class ControllerApiDescriptionModel implements IControllerApiDescriptionM this.controllerName = _data["controllerName"]; this.controllerGroupName = _data["controllerGroupName"]; this.isRemoteService = _data["isRemoteService"]; + this.isIntegrationService = _data["isIntegrationService"]; this.apiVersion = _data["apiVersion"]; this.type = _data["type"]; if (Array.isArray(_data["interfaces"])) { @@ -6856,6 +7087,7 @@ export class ControllerApiDescriptionModel implements IControllerApiDescriptionM data["controllerName"] = this.controllerName; data["controllerGroupName"] = this.controllerGroupName; data["isRemoteService"] = this.isRemoteService; + data["isIntegrationService"] = this.isIntegrationService; data["apiVersion"] = this.apiVersion; data["type"] = this.type; if (Array.isArray(this.interfaces)) { @@ -6878,6 +7110,7 @@ export interface IControllerApiDescriptionModel { controllerName: string | undefined; controllerGroupName: string | undefined; isRemoteService: boolean; + isIntegrationService: boolean; apiVersion: string | undefined; type: string | undefined; interfaces: ControllerInterfaceApiDescriptionModel[] | undefined; @@ -6886,6 +7119,8 @@ export interface IControllerApiDescriptionModel { export class ControllerInterfaceApiDescriptionModel implements IControllerInterfaceApiDescriptionModel { type!: string | undefined; + name!: string | undefined; + methods!: InterfaceMethodApiDescriptionModel[] | undefined; constructor(data?: IControllerInterfaceApiDescriptionModel) { if (data) { @@ -6899,6 +7134,12 @@ export class ControllerInterfaceApiDescriptionModel implements IControllerInterf init(_data?: any) { if (_data) { this.type = _data["type"]; + this.name = _data["name"]; + if (Array.isArray(_data["methods"])) { + this.methods = [] as any; + for (let item of _data["methods"]) + this.methods!.push(InterfaceMethodApiDescriptionModel.fromJS(item)); + } } } @@ -6912,12 +7153,20 @@ export class ControllerInterfaceApiDescriptionModel implements IControllerInterf toJSON(data?: any) { data = typeof data === 'object' ? data : {}; data["type"] = this.type; + data["name"] = this.name; + if (Array.isArray(this.methods)) { + data["methods"] = []; + for (let item of this.methods) + data["methods"].push(item.toJSON()); + } return data; } } export interface IControllerInterfaceApiDescriptionModel { type: string | undefined; + name: string | undefined; + methods: InterfaceMethodApiDescriptionModel[] | undefined; } export class CreateDataDictinaryDetailInput implements ICreateDataDictinaryDetailInput { @@ -10648,6 +10897,58 @@ export interface IIdentityUserUpdateDto { concurrencyStamp: string | undefined; } +export class InterfaceMethodApiDescriptionModel implements IInterfaceMethodApiDescriptionModel { + name!: string | undefined; + parametersOnMethod!: MethodParameterApiDescriptionModel[] | undefined; + returnValue!: ReturnValueApiDescriptionModel; + + constructor(data?: IInterfaceMethodApiDescriptionModel) { + if (data) { + for (var property in data) { + if (data.hasOwnProperty(property)) + (this)[property] = (data)[property]; + } + } + } + + init(_data?: any) { + if (_data) { + this.name = _data["name"]; + if (Array.isArray(_data["parametersOnMethod"])) { + this.parametersOnMethod = [] as any; + for (let item of _data["parametersOnMethod"]) + this.parametersOnMethod!.push(MethodParameterApiDescriptionModel.fromJS(item)); + } + this.returnValue = _data["returnValue"] ? ReturnValueApiDescriptionModel.fromJS(_data["returnValue"]) : undefined; + } + } + + static fromJS(data: any): InterfaceMethodApiDescriptionModel { + data = typeof data === 'object' ? data : {}; + let result = new InterfaceMethodApiDescriptionModel(); + result.init(data); + return result; + } + + toJSON(data?: any) { + data = typeof data === 'object' ? data : {}; + data["name"] = this.name; + if (Array.isArray(this.parametersOnMethod)) { + data["parametersOnMethod"] = []; + for (let item of this.parametersOnMethod) + data["parametersOnMethod"].push(item.toJSON()); + } + data["returnValue"] = this.returnValue ? this.returnValue.toJSON() : undefined; + return data; + } +} + +export interface IInterfaceMethodApiDescriptionModel { + name: string | undefined; + parametersOnMethod: MethodParameterApiDescriptionModel[] | undefined; + returnValue: ReturnValueApiDescriptionModel; +} + export class LanguageInfo implements ILanguageInfo { cultureName!: string | undefined; uiCultureName!: string | undefined; diff --git a/templates/abp-vnext-pro-nuget-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain.Shared/MyCompanyName.MyProjectName.MyModuleName.Domain.Shared.csproj b/templates/abp-vnext-pro-nuget-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain.Shared/MyCompanyName.MyProjectName.MyModuleName.Domain.Shared.csproj index 9295e570..b6194bdd 100644 --- a/templates/abp-vnext-pro-nuget-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain.Shared/MyCompanyName.MyProjectName.MyModuleName.Domain.Shared.csproj +++ b/templates/abp-vnext-pro-nuget-module/src/MyCompanyName.MyProjectName.MyModuleName.Domain.Shared/MyCompanyName.MyProjectName.MyModuleName.Domain.Shared.csproj @@ -8,9 +8,12 @@ - + + + + diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/Delete-BIN-OBJ-Folders.bat b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/Delete-BIN-OBJ-Folders.bat similarity index 100% rename from templates/abp-vnext-pro-nuget-all/aspnet-core/Delete-BIN-OBJ-Folders.bat rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/Delete-BIN-OBJ-Folders.bat diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/Directory.Build.targets b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/Directory.Build.targets index 4577e281..8e0f5c57 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/Directory.Build.targets +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/Directory.Build.targets @@ -10,10 +10,7 @@ $(NoWarn);CS1591;CS0436;NU1504 app true - WangJunZzz true - https://github.com/WangJunZzz/abp-vnext-pro - https://blog-resouce.oss-cn-shenzhen.aliyuncs.com/images/abp/06.jpg diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/MyCompanyName.MyProjectName.sln b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/MyCompanyName.MyProjectName.sln index 6d677a0e..e94186d8 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/MyCompanyName.MyProjectName.sln +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/MyCompanyName.MyProjectName.sln @@ -2,57 +2,50 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31410.414 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Domain", "services\src\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj", "{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Domain", "src\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj", "{554AD327-6DBA-4F8F-96F8-81CE7A0C863F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Application", "services\src\MyCompanyName.MyProjectName.Application\MyCompanyName.MyProjectName.Application.csproj", "{1A94A50E-06DC-43C1-80B5-B662820EC3EB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Application", "src\MyCompanyName.MyProjectName.Application\MyCompanyName.MyProjectName.Application.csproj", "{1A94A50E-06DC-43C1-80B5-B662820EC3EB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.EntityFrameworkCore", "services\src\MyCompanyName.MyProjectName.EntityFrameworkCore\MyCompanyName.MyProjectName.EntityFrameworkCore.csproj", "{C956DD76-69C8-4A9C-83EA-D17DF83340FD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.EntityFrameworkCore", "src\MyCompanyName.MyProjectName.EntityFrameworkCore\MyCompanyName.MyProjectName.EntityFrameworkCore.csproj", "{C956DD76-69C8-4A9C-83EA-D17DF83340FD}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CA9AC87F-097E-4F15-8393-4BC07735A5B0}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{04DBDB01-70F4-4E06-B468-8F87850B22BE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Application.Tests", "services\test\MyCompanyName.MyProjectName.Application.Tests\MyCompanyName.MyProjectName.Application.Tests.csproj", "{50B2631D-129C-47B3-A587-029CCD6099BC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Application.Tests", "test\MyCompanyName.MyProjectName.Application.Tests\MyCompanyName.MyProjectName.Application.Tests.csproj", "{50B2631D-129C-47B3-A587-029CCD6099BC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Domain.Shared", "services\src\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Domain.Shared", "src\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Application.Contracts", "services\src\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Application.Contracts", "src\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi", "services\src\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj", "{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi", "src\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj", "{4164BDF7-F527-4E85-9CE6-E3C2D7426A27}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.Client", "services\src\MyCompanyName.MyProjectName.HttpApi.Client\MyCompanyName.MyProjectName.HttpApi.Client.csproj", "{3B5A0094-670D-4BB1-BFDD-61B88A8773DC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.Client", "src\MyCompanyName.MyProjectName.HttpApi.Client\MyCompanyName.MyProjectName.HttpApi.Client.csproj", "{3B5A0094-670D-4BB1-BFDD-61B88A8773DC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.EntityFrameworkCore.Tests", "services\test\MyCompanyName.MyProjectName.EntityFrameworkCore.Tests\MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj", "{1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.EntityFrameworkCore.Tests", "test\MyCompanyName.MyProjectName.EntityFrameworkCore.Tests\MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj", "{1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.TestBase", "services\test\MyCompanyName.MyProjectName.TestBase\MyCompanyName.MyProjectName.TestBase.csproj", "{91853F21-9CD9-4132-BC29-A7D5D84FFFE7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.TestBase", "test\MyCompanyName.MyProjectName.TestBase\MyCompanyName.MyProjectName.TestBase.csproj", "{91853F21-9CD9-4132-BC29-A7D5D84FFFE7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Domain.Tests", "services\test\MyCompanyName.MyProjectName.Domain.Tests\MyCompanyName.MyProjectName.Domain.Tests.csproj", "{E512F4D9-9375-480F-A2F6-A46509F9D824}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.Domain.Tests", "test\MyCompanyName.MyProjectName.Domain.Tests\MyCompanyName.MyProjectName.Domain.Tests.csproj", "{E512F4D9-9375-480F-A2F6-A46509F9D824}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp", "services\test\MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp\MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj", "{EF480016-9127-4916-8735-D2466BDBC582}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.DbMigrator", "services\src\MyCompanyName.MyProjectName.DbMigrator\MyCompanyName.MyProjectName.DbMigrator.csproj", "{AA94D832-1CCC-4715-95A9-A483F23A1A5D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "services", "services", "{2C861ADD-76E9-4B3B-8A3C-638EBB67D683}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.DbMigrator", "src\MyCompanyName.MyProjectName.DbMigrator\MyCompanyName.MyProjectName.DbMigrator.csproj", "{AA94D832-1CCC-4715-95A9-A483F23A1A5D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.Solution Items", "0.Solution Items", "{2C4A6DB8-8D9E-42E6-B7C3-1EDB7B3DE22E}" ProjectSection(SolutionItems) = preProject - global.json = global.json - NuGet.Config = NuGet.Config + Directory.Build.Lion.targets = Directory.Build.Lion.targets Directory.Build.Microsoft.targets = Directory.Build.Microsoft.targets Directory.Build.targets = Directory.Build.targets Directory.Build.Volo.targets = Directory.Build.Volo.targets - Directory.Build.Lion.targets = Directory.Build.Lion.targets + global.json = global.json EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "host", "host", "{8C1B8C6C-C518-4290-B070-622CCA6004DA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.Host", "services\host\MyCompanyName.MyProjectName.HttpApi.Host\MyCompanyName.MyProjectName.HttpApi.Host.csproj", "{FB20372D-6C96-4733-9AAC-12522F15CAA6}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gateways", "gateways", "{5C304CBC-F30D-413C-A0AF-8B6814A2D4A3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.HttpApi.Host", "host\MyCompanyName.MyProjectName.HttpApi.Host\MyCompanyName.MyProjectName.HttpApi.Host.csproj", "{FB20372D-6C96-4733-9AAC-12522F15CAA6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.WebGateway", "gateways\MyCompanyName.MyProjectName.WebGateway\MyCompanyName.MyProjectName.WebGateway.csproj", "{D9108313-8D05-4F5F-9AA0-B443EC3374B6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.FreeSqlRepository", "src\MyCompanyName.MyProjectName.FreeSqlRepository\MyCompanyName.MyProjectName.FreeSqlRepository.csproj", "{27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.FreeSqlRepository", "services\src\MyCompanyName.MyProjectName.FreeSqlRepository\MyCompanyName.MyProjectName.FreeSqlRepository.csproj", "{27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp", "test\MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp\MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj", "{A5E9AAA7-B3A2-44CC-83B8-7260057185E6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -104,10 +97,6 @@ Global {E512F4D9-9375-480F-A2F6-A46509F9D824}.Debug|Any CPU.Build.0 = Debug|Any CPU {E512F4D9-9375-480F-A2F6-A46509F9D824}.Release|Any CPU.ActiveCfg = Release|Any CPU {E512F4D9-9375-480F-A2F6-A46509F9D824}.Release|Any CPU.Build.0 = Release|Any CPU - {EF480016-9127-4916-8735-D2466BDBC582}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF480016-9127-4916-8735-D2466BDBC582}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF480016-9127-4916-8735-D2466BDBC582}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF480016-9127-4916-8735-D2466BDBC582}.Release|Any CPU.Build.0 = Release|Any CPU {AA94D832-1CCC-4715-95A9-A483F23A1A5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AA94D832-1CCC-4715-95A9-A483F23A1A5D}.Debug|Any CPU.Build.0 = Debug|Any CPU {AA94D832-1CCC-4715-95A9-A483F23A1A5D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -116,14 +105,14 @@ Global {FB20372D-6C96-4733-9AAC-12522F15CAA6}.Debug|Any CPU.Build.0 = Debug|Any CPU {FB20372D-6C96-4733-9AAC-12522F15CAA6}.Release|Any CPU.ActiveCfg = Release|Any CPU {FB20372D-6C96-4733-9AAC-12522F15CAA6}.Release|Any CPU.Build.0 = Release|Any CPU - {D9108313-8D05-4F5F-9AA0-B443EC3374B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9108313-8D05-4F5F-9AA0-B443EC3374B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9108313-8D05-4F5F-9AA0-B443EC3374B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9108313-8D05-4F5F-9AA0-B443EC3374B6}.Release|Any CPU.Build.0 = Release|Any CPU {27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}.Debug|Any CPU.Build.0 = Debug|Any CPU {27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}.Release|Any CPU.ActiveCfg = Release|Any CPU {27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}.Release|Any CPU.Build.0 = Release|Any CPU + {A5E9AAA7-B3A2-44CC-83B8-7260057185E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A5E9AAA7-B3A2-44CC-83B8-7260057185E6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A5E9AAA7-B3A2-44CC-83B8-7260057185E6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A5E9AAA7-B3A2-44CC-83B8-7260057185E6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -132,8 +121,6 @@ Global {554AD327-6DBA-4F8F-96F8-81CE7A0C863F} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {1A94A50E-06DC-43C1-80B5-B662820EC3EB} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {C956DD76-69C8-4A9C-83EA-D17DF83340FD} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} - {CA9AC87F-097E-4F15-8393-4BC07735A5B0} = {2C861ADD-76E9-4B3B-8A3C-638EBB67D683} - {04DBDB01-70F4-4E06-B468-8F87850B22BE} = {2C861ADD-76E9-4B3B-8A3C-638EBB67D683} {50B2631D-129C-47B3-A587-029CCD6099BC} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} {42F719ED-8413-4895-B5B4-5AB56079BC66} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {520659C8-C734-4298-A3DA-B539DB9DFC0B} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} @@ -142,12 +129,10 @@ Global {1FE30EB9-74A9-47F5-A9F6-7B1FAB672D81} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} {91853F21-9CD9-4132-BC29-A7D5D84FFFE7} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} {E512F4D9-9375-480F-A2F6-A46509F9D824} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} - {EF480016-9127-4916-8735-D2466BDBC582} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} {AA94D832-1CCC-4715-95A9-A483F23A1A5D} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} - {8C1B8C6C-C518-4290-B070-622CCA6004DA} = {2C861ADD-76E9-4B3B-8A3C-638EBB67D683} {FB20372D-6C96-4733-9AAC-12522F15CAA6} = {8C1B8C6C-C518-4290-B070-622CCA6004DA} - {D9108313-8D05-4F5F-9AA0-B443EC3374B6} = {5C304CBC-F30D-413C-A0AF-8B6814A2D4A3} {27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {A5E9AAA7-B3A2-44CC-83B8-7260057185E6} = {04DBDB01-70F4-4E06-B468-8F87850B22BE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Dockerfile b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Dockerfile similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Dockerfile rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Dockerfile diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/AutoDeleteAfterSuccessAttributer.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/AutoDeleteAfterSuccessAttributer.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/AutoDeleteAfterSuccessAttributer.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/AutoDeleteAfterSuccessAttributer.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/CronType.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/CronType.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/CronType.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/CronType.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/CustomHangfireAuthorizeFilter.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/CustomHangfireAuthorizeFilter.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/CustomHangfireAuthorizeFilter.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/CustomHangfireAuthorizeFilter.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/JobRetryLastFilter.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/JobRetryLastFilter.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/JobRetryLastFilter.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/JobRetryLastFilter.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/RecurringJobsExtensions.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/RecurringJobsExtensions.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/RecurringJobsExtensions.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Hangfire/RecurringJobsExtensions.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Middlewares/MyProjectNameApplicationBuilderExtensionsExtensions.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Middlewares/MyProjectNameApplicationBuilderExtensionsExtensions.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Middlewares/MyProjectNameApplicationBuilderExtensionsExtensions.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Middlewares/MyProjectNameApplicationBuilderExtensionsExtensions.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Middlewares/RequestLogMiddleware.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Middlewares/RequestLogMiddleware.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Middlewares/RequestLogMiddleware.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Extensions/Middlewares/RequestLogMiddleware.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs similarity index 96% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs index 33760843..7680d5c7 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs @@ -12,6 +12,7 @@ global using Hangfire.Common; global using Hangfire.Dashboard; global using Hangfire.States; global using Hangfire.Storage; +global using Lion.AbpPro; global using MyCompanyName.MyProjectName.EntityFrameworkCore; global using MyCompanyName.MyProjectName.Extensions; global using MyCompanyName.MyProjectName.Extensions.Hangfire; @@ -37,6 +38,7 @@ global using Microsoft.IdentityModel.Tokens; global using Microsoft.OpenApi.Models; global using Serilog; global using StackExchange.Redis; +global using Swagger; global using Swashbuckle.AspNetCore.SwaggerUI; global using Volo.Abp; global using Volo.Abp.Account.Web; diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj new file mode 100644 index 00000000..208ff35e --- /dev/null +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj @@ -0,0 +1,62 @@ + + + + + net7.0 + MyCompanyName.MyProjectName + true + MyCompanyName.MyProjectName-4681b4fd-151f-4221-84a4-929d86723e4c + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostConst.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostConst.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostConst.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostConst.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs similarity index 97% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index f2f1c6a5..59d7c8be 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -1,6 +1,3 @@ -using Lion.AbpPro; -using Swagger; - namespace MyCompanyName.MyProjectName { [DependsOn( @@ -17,6 +14,7 @@ namespace MyCompanyName.MyProjectName )] public class MyProjectNameHttpApiHostModule : AbpModule { + public override void ConfigureServices(ServiceConfigurationContext context) { var configuration = context.Services.GetConfiguration(); @@ -32,8 +30,6 @@ namespace MyCompanyName.MyProjectName public override void OnApplicationInitialization(ApplicationInitializationContext context) { var app = context.GetApplicationBuilder(); - var configuration = context.GetConfiguration(); - app.UseAbpRequestLocalization(); app.UseCorrelationId(); app.UseStaticFiles(); @@ -61,14 +57,8 @@ namespace MyCompanyName.MyProjectName app.UseUnitOfWork(); app.UseConfiguredEndpoints(endpoints => { endpoints.MapHealthChecks("/health"); }); - - - if (configuration.GetValue("Consul:Enabled", false)) - { - app.UseConsul(); - } + } - private void ConfigurationSignalR(ServiceConfigurationContext context) { var redisConnection = context.Services.GetConfiguration()["Redis:Configuration"]; @@ -80,7 +70,6 @@ namespace MyCompanyName.MyProjectName context.Services.AddSignalR().AddStackExchangeRedis(redisConnection, options => { options.Configuration.ChannelPrefix = "Lion.AbpPro"; }); } - /// /// 配置MiniProfiler /// @@ -92,8 +81,7 @@ namespace MyCompanyName.MyProjectName /// /// 配置JWT /// - private void ConfigureJwtAuthentication(ServiceConfigurationContext context, - IConfiguration configuration) + private void ConfigureJwtAuthentication(ServiceConfigurationContext context, IConfiguration configuration) { context.Services.AddAuthentication(options => { @@ -158,6 +146,7 @@ namespace MyCompanyName.MyProjectName }); } + /// /// Redis缓存 @@ -174,6 +163,7 @@ namespace MyCompanyName.MyProjectName } + /// /// 配置Identity /// @@ -250,6 +240,7 @@ namespace MyCompanyName.MyProjectName } + /// /// 审计日志 /// diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Login.cshtml b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Login.cshtml similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Login.cshtml rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Login.cshtml diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Login.cshtml.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Login.cshtml.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Login.cshtml.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Login.cshtml.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Monitor.cshtml b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Monitor.cshtml similarity index 86% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Monitor.cshtml rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Monitor.cshtml index 6d5decea..ebf35a54 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Monitor.cshtml +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Monitor.cshtml @@ -38,18 +38,18 @@
-
-
- - - -
-

- Hangfire面板 -

-
-
-
+ @*
*@ + @*
*@ + @* *@ + @* *@ + @* *@ + @*
*@ + @*

*@ + @* Hangfire面板 *@ + @*

*@ + @*
*@ + @*
*@ + @*
*@
diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Monitor.cshtml.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Monitor.cshtml.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Monitor.cshtml.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Monitor.cshtml.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Program.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Properties/launchSettings.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Properties/launchSettings.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Properties/launchSettings.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Properties/launchSettings.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs similarity index 97% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs index 0b4fd9f2..1cf9c196 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs @@ -10,7 +10,6 @@ namespace MyCompanyName.MyProjectName public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); - } } } diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.Production.json similarity index 91% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.Production.json index ade24ccc..cc715dc6 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.Production.json @@ -31,7 +31,7 @@ }, "App": { "SelfUrl": "http://localhost:44315", - "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200,http://localhost:3100" + "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200,http://localhost:3100,http://localhost:80,http://localhost" }, "ConnectionStrings": { "Default": "Data Source=localhost;Port=3306;Database=MyCompanyNameMyProjectNameDB;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true" @@ -52,10 +52,5 @@ "UserName": "elastic", "Password": "aVVhjQ95RP7nbwNy", "SearchIndexFormat": "MyCompanyName.MyProjectName.development*" - }, - "Consul": { - "Enabled": false, - "Host": "http://localhost:8500", - "Service": "Project-Service" } } \ No newline at end of file diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.Production.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json similarity index 78% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.Production.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json index dad4b227..832d3ab8 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.Production.json +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json @@ -5,7 +5,7 @@ "Serilog.Sinks.File" ], "MinimumLevel": { - "Default": "Information", + "Default": "Debug", "Override": { "Microsoft": "Information", "Volo.Abp": "Information", @@ -31,13 +31,14 @@ }, "App": { "SelfUrl": "http://localhost:44315", - "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200,http://localhost:3100,http://localhost:80,http://localhost" + "CorsOrigins": "https://*.MyProjectName.com,http://localhost:4200,http://localhost:3100" }, "ConnectionStrings": { - "Default": "Data Source=mysql;Port=3306;Database=MyCompanyNameMyProjectNameDB;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true" + "Default": "Data Source=localhost;Port=3306;Database=MyCompanyNameMyProjectNameDB;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true", + "Hangfire": "localhost,password=mypassword,defaultdatabase=2" }, "Redis": { - "Configuration": "redis,password=1q2w3E*,defaultdatabase=1" + "Configuration": "localhost,password=1q2w3E*,defaultdatabase=1" }, "Jwt": { "Audience": "MyCompanyName.MyProjectName", diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/tempkey.jwk b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/tempkey.jwk similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/tempkey.jwk rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/tempkey.jwk diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/tempkey.rsa b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/tempkey.rsa similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/tempkey.rsa rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/tempkey.rsa diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/cap.png b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/cap.png similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/cap.png rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/cap.png diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/hangfire.png b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/hangfire.png similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/hangfire.png rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/hangfire.png diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/miniprofiler.png b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/miniprofiler.png similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/miniprofiler.png rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/miniprofiler.png diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/more.png b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/more.png similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/more.png rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/more.png diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/swagger.png b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/swagger.png similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/swagger.png rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/swagger.png diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/xxx-job.png b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/xxx-job.png similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/xxx-job.png rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/wwwroot/images/xxx-job.png diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj deleted file mode 100644 index 446e7055..00000000 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj +++ /dev/null @@ -1,58 +0,0 @@ - - - - - net7.0 - MyCompanyName.MyProjectName - true - MyCompanyName.MyProjectName-4681b4fd-151f-4221-84a4-929d86723e4c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj deleted file mode 100644 index 6494f971..00000000 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - net7.0 - MyCompanyName.MyProjectName - - - - - - - - - - - - - - - diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj deleted file mode 100644 index 6b73ef9a..00000000 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - - net7.0 - MyCompanyName.MyProjectName - true - - - - - - - - - - - - - - - - - diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj deleted file mode 100644 index 6c730b7a..00000000 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - net7.0 - MyCompanyName.MyProjectName - - - - - - - - - - - diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj deleted file mode 100644 index 03b00e9c..00000000 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - - net7.0 - MyCompanyName.MyProjectName - - - - - - - - - - - - runtime; build; native; contentfiles; analyzers - compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native - - - diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj deleted file mode 100644 index 837df4aa..00000000 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - net7.0 - MyCompanyName.MyProjectName - - - - - - - - - - - - - - diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj deleted file mode 100644 index 9546f6c4..00000000 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - net7.0 - MyCompanyName.MyProjectName - - - - - - - - - - - - - - diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application.Contracts/GlobalUsings.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/GlobalUsings.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application.Contracts/GlobalUsings.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/GlobalUsings.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application.Contracts/Jobs/IRecurringJob.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Jobs/IRecurringJob.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application.Contracts/Jobs/IRecurringJob.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Jobs/IRecurringJob.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj new file mode 100644 index 00000000..04eedd44 --- /dev/null +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj @@ -0,0 +1,19 @@ + + + + + net7.0 + MyCompanyName.MyProjectName + + + + + + + + + + + + + diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameDtoExtensions.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameDtoExtensions.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameDtoExtensions.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameDtoExtensions.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissionDefinitionProvider.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissionDefinitionProvider.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissionDefinitionProvider.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissionDefinitionProvider.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissions.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissions.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissions.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissions.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application/GlobalUsings.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application/GlobalUsings.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application/GlobalUsings.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application/GlobalUsings.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application/Jobs/TestJob.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application/Jobs/TestJob.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application/Jobs/TestJob.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application/Jobs/TestJob.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj similarity index 54% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj index e7c6970c..07ce9e93 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj @@ -7,17 +7,20 @@ + - - - - + + + + + + diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application/MyProjectNameAppService.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyProjectNameAppService.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application/MyProjectNameAppService.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyProjectNameAppService.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application/Properties/AssemblyInfo.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application/Properties/AssemblyInfo.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Application/Properties/AssemblyInfo.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Application/Properties/AssemblyInfo.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.DbMigrator/DbMigratorHostedService.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/DbMigratorHostedService.cs similarity index 74% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.DbMigrator/DbMigratorHostedService.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/DbMigratorHostedService.cs index 03a9f6ad..71387df0 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.DbMigrator/DbMigratorHostedService.cs +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/DbMigratorHostedService.cs @@ -4,11 +4,13 @@ namespace MyCompanyName.MyProjectName.DbMigrator { private readonly IHostApplicationLifetime _hostApplicationLifetime; private readonly IConfiguration _configuration; + private readonly IHostEnvironment _hostEnvironment; public DbMigratorHostedService(IHostApplicationLifetime hostApplicationLifetime, - IConfiguration configuration) + IConfiguration configuration, IHostEnvironment hostEnvironment) { _hostApplicationLifetime = hostApplicationLifetime; _configuration = configuration; + _hostEnvironment = hostEnvironment; } public async Task StartAsync(CancellationToken cancellationToken) @@ -21,12 +23,15 @@ namespace MyCompanyName.MyProjectName.DbMigrator })) { await application.InitializeAsync(); - + var conn = _configuration.GetValue("ConnectionStrings:Default"); + Console.WriteLine("ConnectionStrings:" + conn); + var s = _hostEnvironment.EnvironmentName; + Console.WriteLine("EnvironmentName:" + s); await application .ServiceProvider .GetRequiredService() .MigrateAsync(); - + await application.ShutdownAsync(); _hostApplicationLifetime.StopApplication(); diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.DbMigrator/Dockerfile b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Dockerfile similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.DbMigrator/Dockerfile rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Dockerfile diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.DbMigrator/GlobalUsings.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/GlobalUsings.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.DbMigrator/GlobalUsings.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/GlobalUsings.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj similarity index 99% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj index da26129b..20e551aa 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj @@ -1,5 +1,7 @@ + + Exe net7.0 diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.DbMigrator/MyProjectNameDbMigratorModule.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyProjectNameDbMigratorModule.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.DbMigrator/MyProjectNameDbMigratorModule.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyProjectNameDbMigratorModule.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs similarity index 98% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs index 7f3c4cc7..38c83716 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs @@ -36,7 +36,7 @@ namespace MyCompanyName.MyProjectName.DbMigrator otpions.AddJsonFile(appSettingFileName, optional: true); } - ) + ) .ConfigureServices((hostContext, services) => { services.AddHostedService(); diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.DbMigrator/tempkey.rsa b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/tempkey.rsa similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.DbMigrator/tempkey.rsa rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/tempkey.rsa diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/GlobalUsings.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/GlobalUsings.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/GlobalUsings.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/GlobalUsings.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/Extensions/EnumLocalicationExtension.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/Extensions/EnumLocalicationExtension.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/Extensions/EnumLocalicationExtension.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/Extensions/EnumLocalicationExtension.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/ar.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/ar.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/ar.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/ar.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/cs.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/cs.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/cs.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/cs.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/de-DE.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/de-DE.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/de-DE.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/de-DE.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/en-GB.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/en-GB.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/en-GB.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/en-GB.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/en.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/en.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/en.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/en.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/es.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/es.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/es.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/es.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/fr.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/fr.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/fr.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/fr.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/hu.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/hu.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/hu.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/hu.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/nl.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/nl.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/nl.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/nl.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/pl-PL.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/pl-PL.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/pl-PL.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/pl-PL.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/pt-BR.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/pt-BR.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/pt-BR.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/pt-BR.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/ru.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/ru.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/ru.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/ru.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/sl.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/sl.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/sl.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/sl.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/tr.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/tr.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/tr.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/tr.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/vi.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/vi.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/vi.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/vi.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/zh-Hans.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/zh-Hans.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/zh-Hans.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/zh-Hans.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/zh-Hant.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/zh-Hant.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/zh-Hant.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectName/zh-Hant.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectNameResource.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectNameResource.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectNameResource.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Localization/MyProjectNameResource.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MultiTenancy/MultiTenancyConsts.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj new file mode 100644 index 00000000..0a07d266 --- /dev/null +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj @@ -0,0 +1,21 @@ + + + net7.0 + MyCompanyName.MyProjectName + true + + + + + + + + + + + + + + + + diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainErrorCodes.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainErrorCodes.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainErrorCodes.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainErrorCodes.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedConsts.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedConsts.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedConsts.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedConsts.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameGlobalFeatureConfigurator.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameGlobalFeatureConfigurator.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameGlobalFeatureConfigurator.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameGlobalFeatureConfigurator.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameModuleExtensionConfigurator.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameModuleExtensionConfigurator.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameModuleExtensionConfigurator.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameModuleExtensionConfigurator.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Users/Dto/UserOutput.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Users/Dto/UserOutput.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain.Shared/Users/Dto/UserOutput.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/Users/Dto/UserOutput.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/Data/IMyProjectNameDbSchemaMigrator.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/IMyProjectNameDbSchemaMigrator.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/Data/IMyProjectNameDbSchemaMigrator.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/IMyProjectNameDbSchemaMigrator.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs similarity index 99% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs index 89fa000e..6d9f8c26 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/MyProjectNameDbMigrationService.cs @@ -3,7 +3,6 @@ namespace MyCompanyName.MyProjectName.Data public class MyProjectNameDbMigrationService : ITransientDependency { public ILogger Logger { get; set; } - private readonly IDataSeeder _dataSeeder; private readonly IEnumerable _dbSchemaMigrators; private readonly ITenantRepository _tenantRepository; diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/Data/NullMyProjectNameDbSchemaMigrator.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/NullMyProjectNameDbSchemaMigrator.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/Data/NullMyProjectNameDbSchemaMigrator.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Data/NullMyProjectNameDbSchemaMigrator.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/GlobalUsings.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/GlobalUsings.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/GlobalUsings.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/GlobalUsings.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj new file mode 100644 index 00000000..297d7541 --- /dev/null +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj @@ -0,0 +1,18 @@ + + + + net7.0 + MyCompanyName.MyProjectName + + + + + + + + + + + + + diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/MyProjectNameConsts.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameConsts.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/MyProjectNameConsts.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameConsts.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainService.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainService.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainService.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainService.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/Properties/AssemblyInfo.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Properties/AssemblyInfo.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/Properties/AssemblyInfo.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Properties/AssemblyInfo.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/Settings/MyProjectNameSettingDefinitionProvider.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Settings/MyProjectNameSettingDefinitionProvider.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/Settings/MyProjectNameSettingDefinitionProvider.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Settings/MyProjectNameSettingDefinitionProvider.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/Settings/MyProjectNameSettings.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Settings/MyProjectNameSettings.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.Domain/Settings/MyProjectNameSettings.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.Domain/Settings/MyProjectNameSettings.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreMyProjectNameDbSchemaMigrator.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreMyProjectNameDbSchemaMigrator.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreMyProjectNameDbSchemaMigrator.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreMyProjectNameDbSchemaMigrator.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/IMyProjectNameDbContext.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/IMyProjectNameDbContext.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/IMyProjectNameDbContext.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/IMyProjectNameDbContext.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs similarity index 99% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs index 5bb350fd..88e0f1ad 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs @@ -50,9 +50,9 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore protected override void OnModelCreating(ModelBuilder builder) { - - base.OnModelCreating(builder); + base.OnModelCreating(builder); + builder.ConfigureMyProjectName(); // 基础模块 @@ -64,6 +64,5 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore //数据字典 builder.ConfigureDataDictionaryManagement(); } - } } \ No newline at end of file diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEfCoreEntityExtensionMappings.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEfCoreEntityExtensionMappings.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEfCoreEntityExtensionMappings.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEfCoreEntityExtensionMappings.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs similarity index 88% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs index 800af748..17202aac 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs @@ -27,10 +27,6 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore * default repositories only for aggregate roots */ options.AddDefaultRepositories(includeAllEntities: true); }); - Configure(options => - { - options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsString; - }); Configure(options => { /* The main point to change your DBMS. diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameMigrationsDbContextFactory.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameMigrationsDbContextFactory.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameMigrationsDbContextFactory.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameMigrationsDbContextFactory.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/GlobalUsings.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/GlobalUsings.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/GlobalUsings.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/GlobalUsings.cs diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20230517130954_Init.Designer.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20230517130954_Init.Designer.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20230517130954_Init.Designer.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20230517130954_Init.Designer.cs diff --git a/templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20230517130954_Init.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20230517130954_Init.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-all/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20230517130954_Init.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/20230517130954_Init.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/MyProjectNameDbContextModelSnapshot.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/MyProjectNameDbContextModelSnapshot.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/MyProjectNameDbContextModelSnapshot.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Migrations/MyProjectNameDbContextModelSnapshot.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj new file mode 100644 index 00000000..d84e900c --- /dev/null +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/MyCompanyName.MyProjectName.EntityFrameworkCore.csproj @@ -0,0 +1,26 @@ + + + + + net7.0 + MyCompanyName.MyProjectName + + + + + + + + + + + + + + + + runtime; build; native; contentfiles; analyzers + compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native + + + diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Properties/AssemblyInfo.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Properties/AssemblyInfo.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Properties/AssemblyInfo.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/Properties/AssemblyInfo.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.FreeSqlRepository/FreeSqlBasicRepository.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.FreeSqlRepository/FreeSqlBasicRepository.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.FreeSqlRepository/FreeSqlBasicRepository.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.FreeSqlRepository/FreeSqlBasicRepository.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.FreeSqlRepository/GlobalUsings.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.FreeSqlRepository/GlobalUsings.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.FreeSqlRepository/GlobalUsings.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.FreeSqlRepository/GlobalUsings.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.FreeSqlRepository/MyCompanyName.MyProjectName.FreeSqlRepository.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.FreeSqlRepository/MyCompanyName.MyProjectName.FreeSqlRepository.csproj similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.FreeSqlRepository/MyCompanyName.MyProjectName.FreeSqlRepository.csproj rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.FreeSqlRepository/MyCompanyName.MyProjectName.FreeSqlRepository.csproj diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.FreeSqlRepository/MyProjectNameFreeSqlModule.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.FreeSqlRepository/MyProjectNameFreeSqlModule.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.FreeSqlRepository/MyProjectNameFreeSqlModule.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.FreeSqlRepository/MyProjectNameFreeSqlModule.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.HttpApi.Client/GlobalUsings.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/GlobalUsings.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.HttpApi.Client/GlobalUsings.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/GlobalUsings.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj new file mode 100644 index 00000000..28f045f8 --- /dev/null +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/MyCompanyName.MyProjectName.HttpApi.Client.csproj @@ -0,0 +1,16 @@ + + + net7.0 + MyCompanyName.MyProjectName + + + + + + + + + + + + diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.HttpApi.Client/MyProjectNameHttpApiClientModule.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/MyProjectNameHttpApiClientModule.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.HttpApi.Client/MyProjectNameHttpApiClientModule.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Client/MyProjectNameHttpApiClientModule.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.HttpApi/Controllers/MyProjectNameController.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/Controllers/MyProjectNameController.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.HttpApi/Controllers/MyProjectNameController.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/Controllers/MyProjectNameController.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.HttpApi/GlobalUsings.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/GlobalUsings.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.HttpApi/GlobalUsings.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/GlobalUsings.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj new file mode 100644 index 00000000..db8b9657 --- /dev/null +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyCompanyName.MyProjectName.HttpApi.csproj @@ -0,0 +1,23 @@ + + + + + + net7.0 + MyCompanyName.MyProjectName + + + + + + + + + + + + + + + + diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameHttpApiModule.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameHttpApiModule.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameHttpApiModule.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi/MyProjectNameHttpApiModule.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Application.Tests/GlobalUsings.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/GlobalUsings.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Application.Tests/GlobalUsings.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/GlobalUsings.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj similarity index 99% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj index 38e867ac..9746e8f2 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj @@ -1,4 +1,6 @@ + + net7.0 MyCompanyName.MyProjectName diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameApplicationTestBase.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameApplicationTestBase.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameApplicationTestBase.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameApplicationTestBase.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameApplicationTestModule.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameApplicationTestModule.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameApplicationTestModule.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameApplicationTestModule.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Application.Tests/Samples/SampleAppServiceTests.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/Samples/SampleAppServiceTests.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Application.Tests/Samples/SampleAppServiceTests.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/Samples/SampleAppServiceTests.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Domain.Tests/GlobalUsings.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/GlobalUsings.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Domain.Tests/GlobalUsings.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/GlobalUsings.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Domain.Tests/Localizations/LocalizationHelper_Tests.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/Localizations/LocalizationHelper_Tests.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Domain.Tests/Localizations/LocalizationHelper_Tests.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/Localizations/LocalizationHelper_Tests.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Domain.Tests/Localizations/TestType.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/Localizations/TestType.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Domain.Tests/Localizations/TestType.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/Localizations/TestType.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj similarity index 99% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj index 14ed0130..5650b251 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj @@ -1,4 +1,7 @@ + + + net7.0 MyCompanyName.MyProjectName diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Domain.Tests/MyProjectNameDomainTestBase.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyProjectNameDomainTestBase.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Domain.Tests/MyProjectNameDomainTestBase.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyProjectNameDomainTestBase.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Domain.Tests/MyProjectNameDomainTestModule.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyProjectNameDomainTestModule.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Domain.Tests/MyProjectNameDomainTestModule.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyProjectNameDomainTestModule.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Domain.Tests/Samples/SampleDomainTests.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/Samples/SampleDomainTests.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.Domain.Tests/Samples/SampleDomainTests.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/Samples/SampleDomainTests.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestBase.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestBase.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestBase.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestBase.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs similarity index 90% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs index 5f19aa3f..48ec9830 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreTestModule.cs @@ -20,10 +20,6 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore services.Configure(options => { - options.PreConfigure(options => - { - options.DbContextOptions.UseBatchEF_Sqlite(); - }); options.Configure(context => { context.DbContextOptions.UseSqlite(_sqliteConnection); diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/GlobalUsings.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/GlobalUsings.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/GlobalUsings.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/GlobalUsings.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj similarity index 91% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj index 65583bee..85fb8c42 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj @@ -1,4 +1,7 @@ + + + net7.0 MyCompanyName.MyProjectName @@ -9,7 +12,6 @@ - diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/GlobalUsings.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/GlobalUsings.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/GlobalUsings.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/GlobalUsings.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp.csproj diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyProjectNameConsoleApiClientModule.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyProjectNameConsoleApiClientModule.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyProjectNameConsoleApiClientModule.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/MyProjectNameConsoleApiClientModule.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/Program.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/Program.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/Program.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/Program.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.secrets.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.secrets.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.secrets.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.secrets.json diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.TestBase/GlobalUsings.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/GlobalUsings.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.TestBase/GlobalUsings.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/GlobalUsings.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj similarity index 99% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj index a218c4e7..428343dd 100644 --- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj +++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj @@ -1,4 +1,7 @@ + + + net7.0 MyCompanyName.MyProjectName diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBaseModule.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBaseModule.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBaseModule.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBaseModule.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestDataSeedContributor.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestDataSeedContributor.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestDataSeedContributor.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestDataSeedContributor.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.TestBase/Security/FakeCurrentPrincipalAccessor.cs b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/Security/FakeCurrentPrincipalAccessor.cs similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.TestBase/Security/FakeCurrentPrincipalAccessor.cs rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/Security/FakeCurrentPrincipalAccessor.cs diff --git a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.TestBase/appsettings.json b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/appsettings.json similarity index 100% rename from templates/abp-vnext-pro-nuget-simplify/aspnet-core/services/test/MyCompanyName.MyProjectName.TestBase/appsettings.json rename to templates/abp-vnext-pro-nuget-simplify/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/appsettings.json diff --git a/templates/abp-vnext-pro-nuget-simplify/deploy.bat b/templates/abp-vnext-pro-nuget-simplify/deploy.bat index 16c1a0b7..fd9da9b4 100644 --- a/templates/abp-vnext-pro-nuget-simplify/deploy.bat +++ b/templates/abp-vnext-pro-nuget-simplify/deploy.bat @@ -6,8 +6,6 @@ cd ./aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator && dotnet publish -o cd %~dp0 cd ./aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host && dotnet publish -o publish cd %~dp0 -cd %~dp0 -cd ./aspnet-core/gateways/\MyCompanyName.MyProjectName.WebGateway && dotnet publish -o publish diff --git a/templates/abp-vnext-pro-nuget-simplify/vben28/.env.development b/templates/abp-vnext-pro-nuget-simplify/vben28/.env.development index 850d5ee4..11ec094b 100644 --- a/templates/abp-vnext-pro-nuget-simplify/vben28/.env.development +++ b/templates/abp-vnext-pro-nuget-simplify/vben28/.env.development @@ -21,8 +21,9 @@ VITE_GLOB_UPLOAD_URL=/upload # Interface prefix VITE_GLOB_API_URL_PREFIX= + # 接口地址 -VITE_API_URL= http://localhost:44314/gateway +VITE_API_URL= http://localhost:44315 # WEBSOCKE 地址 -VITE_WEBSOCKE_URL= http://localhost:44314/ws +VITE_WEBSOCKE_URL= http://localhost:44315 diff --git a/templates/abp-vnext-pro-nuget-simplify/vben28/.env.production b/templates/abp-vnext-pro-nuget-simplify/vben28/.env.production index edd941cb..00a7fb2f 100644 --- a/templates/abp-vnext-pro-nuget-simplify/vben28/.env.production +++ b/templates/abp-vnext-pro-nuget-simplify/vben28/.env.production @@ -34,8 +34,9 @@ VITE_USE_PWA = false # Is it compatible with older browsers VITE_LEGACY = false + # 接口地址 -VITE_API_URL= http://localhost:8081/gateway +VITE_API_URL= http://localhost:8080 # WEBSOCKE 地址 -VITE_WEBSOCKE_URL= http://localhost:8081/ws +VITE_WEBSOCKE_URL= http://localhost:8080 diff --git a/templates/abp-vnext-pro-nuget-simplify/vben28/package.json b/templates/abp-vnext-pro-nuget-simplify/vben28/package.json index cb6c684d..4b24af76 100644 --- a/templates/abp-vnext-pro-nuget-simplify/vben28/package.json +++ b/templates/abp-vnext-pro-nuget-simplify/vben28/package.json @@ -37,7 +37,7 @@ "@iconify/iconify": "^2.2.1", "@logicflow/core": "^1.1.13", "@logicflow/extension": "^1.1.13", - "@microsoft/signalr": "^6.0.6", + "@microsoft/signalr": "^7.0.2", "@vue/runtime-core": "^3.2.33", "@vue/shared": "^3.2.33", "@vueuse/core": "^8.3.0", @@ -112,7 +112,6 @@ "eslint-plugin-vue": "^8.6.0", "esno": "^0.14.1", "fs-extra": "^10.1.0", - "inquirer": "^8.2.2", "less": "^4.1.2", "lint-staged": "12.3.7", diff --git a/templates/abp-vnext-pro-nuget-simplify/vben28/src/locales/lang/en/routes/admin.ts b/templates/abp-vnext-pro-nuget-simplify/vben28/src/locales/lang/en/routes/admin.ts index 3ae3d5a5..fbd9e42e 100644 --- a/templates/abp-vnext-pro-nuget-simplify/vben28/src/locales/lang/en/routes/admin.ts +++ b/templates/abp-vnext-pro-nuget-simplify/vben28/src/locales/lang/en/routes/admin.ts @@ -35,6 +35,7 @@ export default { audit_url: 'URL', audit_entityInfo: 'EntityInformation', audit_message: 'Message', + audit_hasException: 'HasException', audit_hasException_all: 'All', audit_hasException_yes: 'Yes', audit_hasException_no: 'No', diff --git a/templates/abp-vnext-pro-nuget-simplify/vben28/src/services/ServiceProxies.ts b/templates/abp-vnext-pro-nuget-simplify/vben28/src/services/ServiceProxies.ts index e425176e..494922d8 100644 --- a/templates/abp-vnext-pro-nuget-simplify/vben28/src/services/ServiceProxies.ts +++ b/templates/abp-vnext-pro-nuget-simplify/vben28/src/services/ServiceProxies.ts @@ -136,15 +136,10 @@ export class AbpApplicationConfigurationServiceProxy extends ServiceProxyBase { } /** - * @param includeLocalizationResources (optional) * @return Success */ - applicationConfiguration(includeLocalizationResources: boolean | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/api/abp/application-configuration?"; - if (includeLocalizationResources === null) - throw new Error("The parameter 'includeLocalizationResources' cannot be null."); - else if (includeLocalizationResources !== undefined) - url_ += "IncludeLocalizationResources=" + encodeURIComponent("" + includeLocalizationResources) + "&"; + applicationConfiguration( cancelToken?: CancelToken | undefined): Promise { + let url_ = this.baseUrl + "/api/abp/application-configuration"; url_ = url_.replace(/[?&]$/, ""); let options_ = { @@ -236,122 +231,6 @@ export class AbpApplicationConfigurationServiceProxy extends ServiceProxyBase { } } -export class AbpApplicationLocalizationServiceProxy extends ServiceProxyBase { - private instance: AxiosInstance; - private baseUrl: string; - protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined; - - constructor(baseUrl?: string, instance?: AxiosInstance) { - super(); - this.instance = instance ? instance : axios.create(); - this.baseUrl = baseUrl !== undefined && baseUrl !== null ? baseUrl : ""; - } - - /** - * @param onlyDynamics (optional) - * @return Success - */ - applicationLocalization(cultureName: string, onlyDynamics: boolean | undefined , cancelToken?: CancelToken | undefined): Promise { - let url_ = this.baseUrl + "/api/abp/application-localization?"; - if (cultureName === undefined || cultureName === null) - throw new Error("The parameter 'cultureName' must be defined and cannot be null."); - else - url_ += "CultureName=" + encodeURIComponent("" + cultureName) + "&"; - if (onlyDynamics === null) - throw new Error("The parameter 'onlyDynamics' cannot be null."); - else if (onlyDynamics !== undefined) - url_ += "OnlyDynamics=" + encodeURIComponent("" + onlyDynamics) + "&"; - url_ = url_.replace(/[?&]$/, ""); - - let options_ = { - method: "GET", - url: url_, - headers: { - "Accept": "text/plain" - }, - cancelToken - }; - - return this.transformOptions(options_).then(transformedOptions_ => { - return this.instance.request(transformedOptions_); - }).catch((_error: any) => { - if (isAxiosError(_error) && _error.response) { - return _error.response; - } else { - throw _error; - } - }).then((_response: AxiosResponse) => { - return this.transformResult(url_, _response, (_response: AxiosResponse) => this.processApplicationLocalization(_response)); - }); - } - - protected processApplicationLocalization(response: AxiosResponse): Promise { - const status = response.status; - let _headers: any = {}; - if (response.headers && typeof response.headers === "object") { - for (let k in response.headers) { - if (response.headers.hasOwnProperty(k)) { - _headers[k] = response.headers[k]; - } - } - } - if (status === 200) { - const _responseText = response.data; - let result200: any = null; - let resultData200 = _responseText; - result200 = ApplicationLocalizationDto.fromJS(resultData200); - return Promise.resolve(result200); - - } else if (status === 403) { - const _responseText = response.data; - let result403: any = null; - let resultData403 = _responseText; - result403 = RemoteServiceErrorResponse.fromJS(resultData403); - return throwException("Forbidden", status, _responseText, _headers, result403); - - } else if (status === 401) { - const _responseText = response.data; - let result401: any = null; - let resultData401 = _responseText; - result401 = RemoteServiceErrorResponse.fromJS(resultData401); - return throwException("Unauthorized", status, _responseText, _headers, result401); - - } else if (status === 400) { - const _responseText = response.data; - let result400: any = null; - let resultData400 = _responseText; - result400 = RemoteServiceErrorResponse.fromJS(resultData400); - return throwException("Bad Request", status, _responseText, _headers, result400); - - } else if (status === 404) { - const _responseText = response.data; - let result404: any = null; - let resultData404 = _responseText; - result404 = RemoteServiceErrorResponse.fromJS(resultData404); - return throwException("Not Found", status, _responseText, _headers, result404); - - } else if (status === 501) { - const _responseText = response.data; - let result501: any = null; - let resultData501 = _responseText; - result501 = RemoteServiceErrorResponse.fromJS(resultData501); - return throwException("Server Error", status, _responseText, _headers, result501); - - } else if (status === 500) { - const _responseText = response.data; - let result500: any = null; - let resultData500 = _responseText; - result500 = RemoteServiceErrorResponse.fromJS(resultData500); - return throwException("Server Error", status, _responseText, _headers, result500); - - } else if (status !== 200 && status !== 204) { - const _responseText = response.data; - return throwException("An unexpected server error occurred.", status, _responseText, _headers); - } - return Promise.resolve(null as any); - } -} - export class AccountServiceProxy extends ServiceProxyBase { private instance: AxiosInstance; private baseUrl: string; @@ -6454,6 +6333,7 @@ export interface IApplicationApiDescriptionModel { } export class ApplicationAuthConfigurationDto implements IApplicationAuthConfigurationDto { + policies!: { [key: string]: boolean; } | undefined; grantedPolicies!: { [key: string]: boolean; } | undefined; constructor(data?: IApplicationAuthConfigurationDto) { @@ -6467,6 +6347,13 @@ export class ApplicationAuthConfigurationDto implements IApplicationAuthConfigur init(_data?: any) { if (_data) { + if (_data["policies"]) { + this.policies = {} as any; + for (let key in _data["policies"]) { + if (_data["policies"].hasOwnProperty(key)) + (this.policies)![key] = _data["policies"][key]; + } + } if (_data["grantedPolicies"]) { this.grantedPolicies = {} as any; for (let key in _data["grantedPolicies"]) { @@ -6486,6 +6373,13 @@ export class ApplicationAuthConfigurationDto implements IApplicationAuthConfigur toJSON(data?: any) { data = typeof data === 'object' ? data : {}; + if (this.policies) { + data["policies"] = {}; + for (let key in this.policies) { + if (this.policies.hasOwnProperty(key)) + (data["policies"])[key] = (this.policies)[key]; + } + } if (this.grantedPolicies) { data["grantedPolicies"] = {}; for (let key in this.grantedPolicies) { @@ -6498,6 +6392,7 @@ export class ApplicationAuthConfigurationDto implements IApplicationAuthConfigur } export interface IApplicationAuthConfigurationDto { + policies: { [key: string]: boolean; } | undefined; grantedPolicies: { [key: string]: boolean; } | undefined; } @@ -6687,7 +6582,6 @@ export interface IApplicationGlobalFeatureConfigurationDto { export class ApplicationLocalizationConfigurationDto implements IApplicationLocalizationConfigurationDto { values!: { [key: string]: { [key: string]: string; }; } | undefined; - resources!: { [key: string]: ApplicationLocalizationResourceDto; } | undefined; languages!: LanguageInfo[] | undefined; currentCulture!: CurrentCultureDto; defaultResourceName!: string | undefined; @@ -6712,13 +6606,6 @@ export class ApplicationLocalizationConfigurationDto implements IApplicationLoca (this.values)![key] = _data["values"][key]; } } - if (_data["resources"]) { - this.resources = {} as any; - for (let key in _data["resources"]) { - if (_data["resources"].hasOwnProperty(key)) - (this.resources)![key] = _data["resources"][key] ? ApplicationLocalizationResourceDto.fromJS(_data["resources"][key]) : new ApplicationLocalizationResourceDto(); - } - } if (Array.isArray(_data["languages"])) { this.languages = [] as any; for (let item of _data["languages"]) @@ -6759,13 +6646,6 @@ export class ApplicationLocalizationConfigurationDto implements IApplicationLoca (data["values"])[key] = (this.values)[key]; } } - if (this.resources) { - data["resources"] = {}; - for (let key in this.resources) { - if (this.resources.hasOwnProperty(key)) - (data["resources"])[key] = this.resources[key] ? this.resources[key].toJSON() : undefined; - } - } if (Array.isArray(this.languages)) { data["languages"] = []; for (let item of this.languages) @@ -6793,7 +6673,6 @@ export class ApplicationLocalizationConfigurationDto implements IApplicationLoca export interface IApplicationLocalizationConfigurationDto { values: { [key: string]: { [key: string]: string; }; } | undefined; - resources: { [key: string]: ApplicationLocalizationResourceDto; } | undefined; languages: LanguageInfo[] | undefined; currentCulture: CurrentCultureDto; defaultResourceName: string | undefined; @@ -6801,114 +6680,6 @@ export interface IApplicationLocalizationConfigurationDto { languageFilesMap: { [key: string]: NameValue[]; } | undefined; } -export class ApplicationLocalizationDto implements IApplicationLocalizationDto { - resources!: { [key: string]: ApplicationLocalizationResourceDto; } | undefined; - - constructor(data?: IApplicationLocalizationDto) { - if (data) { - for (var property in data) { - if (data.hasOwnProperty(property)) - (this)[property] = (data)[property]; - } - } - } - - init(_data?: any) { - if (_data) { - if (_data["resources"]) { - this.resources = {} as any; - for (let key in _data["resources"]) { - if (_data["resources"].hasOwnProperty(key)) - (this.resources)![key] = _data["resources"][key] ? ApplicationLocalizationResourceDto.fromJS(_data["resources"][key]) : new ApplicationLocalizationResourceDto(); - } - } - } - } - - static fromJS(data: any): ApplicationLocalizationDto { - data = typeof data === 'object' ? data : {}; - let result = new ApplicationLocalizationDto(); - result.init(data); - return result; - } - - toJSON(data?: any) { - data = typeof data === 'object' ? data : {}; - if (this.resources) { - data["resources"] = {}; - for (let key in this.resources) { - if (this.resources.hasOwnProperty(key)) - (data["resources"])[key] = this.resources[key] ? this.resources[key].toJSON() : undefined; - } - } - return data; - } -} - -export interface IApplicationLocalizationDto { - resources: { [key: string]: ApplicationLocalizationResourceDto; } | undefined; -} - -export class ApplicationLocalizationResourceDto implements IApplicationLocalizationResourceDto { - texts!: { [key: string]: string; } | undefined; - baseResources!: string[] | undefined; - - constructor(data?: IApplicationLocalizationResourceDto) { - if (data) { - for (var property in data) { - if (data.hasOwnProperty(property)) - (this)[property] = (data)[property]; - } - } - } - - init(_data?: any) { - if (_data) { - if (_data["texts"]) { - this.texts = {} as any; - for (let key in _data["texts"]) { - if (_data["texts"].hasOwnProperty(key)) - (this.texts)![key] = _data["texts"][key]; - } - } - if (Array.isArray(_data["baseResources"])) { - this.baseResources = [] as any; - for (let item of _data["baseResources"]) - this.baseResources!.push(item); - } - } - } - - static fromJS(data: any): ApplicationLocalizationResourceDto { - data = typeof data === 'object' ? data : {}; - let result = new ApplicationLocalizationResourceDto(); - result.init(data); - return result; - } - - toJSON(data?: any) { - data = typeof data === 'object' ? data : {}; - if (this.texts) { - data["texts"] = {}; - for (let key in this.texts) { - if (this.texts.hasOwnProperty(key)) - (data["texts"])[key] = (this.texts)[key]; - } - } - if (Array.isArray(this.baseResources)) { - data["baseResources"] = []; - for (let item of this.baseResources) - data["baseResources"].push(item); - } - return data; - } -} - -export interface IApplicationLocalizationResourceDto { - texts: { [key: string]: string; } | undefined; - baseResources: string[] | undefined; -} - export class ApplicationSettingConfigurationDto implements IApplicationSettingConfigurationDto { values!: { [key: string]: string; } | undefined; @@ -7037,7 +6808,6 @@ export class ControllerApiDescriptionModel implements IControllerApiDescriptionM controllerName!: string | undefined; controllerGroupName!: string | undefined; isRemoteService!: boolean; - isIntegrationService!: boolean; apiVersion!: string | undefined; type!: string | undefined; interfaces!: ControllerInterfaceApiDescriptionModel[] | undefined; @@ -7057,7 +6827,6 @@ export class ControllerApiDescriptionModel implements IControllerApiDescriptionM this.controllerName = _data["controllerName"]; this.controllerGroupName = _data["controllerGroupName"]; this.isRemoteService = _data["isRemoteService"]; - this.isIntegrationService = _data["isIntegrationService"]; this.apiVersion = _data["apiVersion"]; this.type = _data["type"]; if (Array.isArray(_data["interfaces"])) { @@ -7087,7 +6856,6 @@ export class ControllerApiDescriptionModel implements IControllerApiDescriptionM data["controllerName"] = this.controllerName; data["controllerGroupName"] = this.controllerGroupName; data["isRemoteService"] = this.isRemoteService; - data["isIntegrationService"] = this.isIntegrationService; data["apiVersion"] = this.apiVersion; data["type"] = this.type; if (Array.isArray(this.interfaces)) { @@ -7110,7 +6878,6 @@ export interface IControllerApiDescriptionModel { controllerName: string | undefined; controllerGroupName: string | undefined; isRemoteService: boolean; - isIntegrationService: boolean; apiVersion: string | undefined; type: string | undefined; interfaces: ControllerInterfaceApiDescriptionModel[] | undefined; @@ -7119,8 +6886,6 @@ export interface IControllerApiDescriptionModel { export class ControllerInterfaceApiDescriptionModel implements IControllerInterfaceApiDescriptionModel { type!: string | undefined; - name!: string | undefined; - methods!: InterfaceMethodApiDescriptionModel[] | undefined; constructor(data?: IControllerInterfaceApiDescriptionModel) { if (data) { @@ -7134,12 +6899,6 @@ export class ControllerInterfaceApiDescriptionModel implements IControllerInterf init(_data?: any) { if (_data) { this.type = _data["type"]; - this.name = _data["name"]; - if (Array.isArray(_data["methods"])) { - this.methods = [] as any; - for (let item of _data["methods"]) - this.methods!.push(InterfaceMethodApiDescriptionModel.fromJS(item)); - } } } @@ -7153,20 +6912,12 @@ export class ControllerInterfaceApiDescriptionModel implements IControllerInterf toJSON(data?: any) { data = typeof data === 'object' ? data : {}; data["type"] = this.type; - data["name"] = this.name; - if (Array.isArray(this.methods)) { - data["methods"] = []; - for (let item of this.methods) - data["methods"].push(item.toJSON()); - } return data; } } export interface IControllerInterfaceApiDescriptionModel { type: string | undefined; - name: string | undefined; - methods: InterfaceMethodApiDescriptionModel[] | undefined; } export class CreateDataDictinaryDetailInput implements ICreateDataDictinaryDetailInput { @@ -10897,58 +10648,6 @@ export interface IIdentityUserUpdateDto { concurrencyStamp: string | undefined; } -export class InterfaceMethodApiDescriptionModel implements IInterfaceMethodApiDescriptionModel { - name!: string | undefined; - parametersOnMethod!: MethodParameterApiDescriptionModel[] | undefined; - returnValue!: ReturnValueApiDescriptionModel; - - constructor(data?: IInterfaceMethodApiDescriptionModel) { - if (data) { - for (var property in data) { - if (data.hasOwnProperty(property)) - (this)[property] = (data)[property]; - } - } - } - - init(_data?: any) { - if (_data) { - this.name = _data["name"]; - if (Array.isArray(_data["parametersOnMethod"])) { - this.parametersOnMethod = [] as any; - for (let item of _data["parametersOnMethod"]) - this.parametersOnMethod!.push(MethodParameterApiDescriptionModel.fromJS(item)); - } - this.returnValue = _data["returnValue"] ? ReturnValueApiDescriptionModel.fromJS(_data["returnValue"]) : undefined; - } - } - - static fromJS(data: any): InterfaceMethodApiDescriptionModel { - data = typeof data === 'object' ? data : {}; - let result = new InterfaceMethodApiDescriptionModel(); - result.init(data); - return result; - } - - toJSON(data?: any) { - data = typeof data === 'object' ? data : {}; - data["name"] = this.name; - if (Array.isArray(this.parametersOnMethod)) { - data["parametersOnMethod"] = []; - for (let item of this.parametersOnMethod) - data["parametersOnMethod"].push(item.toJSON()); - } - data["returnValue"] = this.returnValue ? this.returnValue.toJSON() : undefined; - return data; - } -} - -export interface IInterfaceMethodApiDescriptionModel { - name: string | undefined; - parametersOnMethod: MethodParameterApiDescriptionModel[] | undefined; - returnValue: ReturnValueApiDescriptionModel; -} - export class LanguageInfo implements ILanguageInfo { cultureName!: string | undefined; uiCultureName!: string | undefined;