From 4572f456fa62d48df2277262705b5e706da2fded Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Tue, 7 Dec 2021 16:25:04 +0800 Subject: [PATCH] fix: fix spelling errors --- aspnet-core/LINGYUN.MicroService.All.sln | 11 +++++++++-- aspnet-core/common.props | 10 ++++++++-- .../Dockerfile | 2 +- .../Dockerfile | 2 +- .../IdentityServerHttpApiHostModule.Configure.cs | 4 ++-- .../IdentityServerHttpApiHostModule.Seeder.cs | 2 +- .../IdentityServerHttpApiHostModule.cs | 2 +- ...LY.MicroService.identityServer.HttpApi.Host.csproj | 4 ++-- .../Program.cs | 2 +- .../Properties/launchSettings.json | 2 +- .../Startup.cs | 2 +- .../TenantHeaderParamter.cs | 2 +- .../UserSecurityCodeSender.cs | 4 ++-- .../LY.MicroService.identityServer/Dockerfile | 2 +- 14 files changed, 32 insertions(+), 19 deletions(-) diff --git a/aspnet-core/LINGYUN.MicroService.All.sln b/aspnet-core/LINGYUN.MicroService.All.sln index 0fef67ffb..c8839b841 100644 --- a/aspnet-core/LINGYUN.MicroService.All.sln +++ b/aspnet-core/LINGYUN.MicroService.All.sln @@ -335,9 +335,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Localization.Cu EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LY.MicroService.BackendAdmin.HttpApi.Host", "services\LY.MicroService.BackendAdmin.HttpApi.Host\LY.MicroService.BackendAdmin.HttpApi.Host.csproj", "{3811B6AE-D86C-429D-AE37-B34AE31B7174}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LY.MicroService.IdentityServer", "services\LY.MicroService.identityServer\LY.MicroService.IdentityServer.csproj", "{6DB63EC6-0278-4DBA-A999-768481018B70}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LY.MicroService.IdentityServer", "services\LY.MicroService.IdentityServer\LY.MicroService.IdentityServer.csproj", "{6DB63EC6-0278-4DBA-A999-768481018B70}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LY.MicroService.identityServer.HttpApi.Host", "services\LY.MicroService.identityServer.HttpApi.Host\LY.MicroService.identityServer.HttpApi.Host.csproj", "{B6DA1032-ADB7-4F4C-9B32-F5F9160CB6E2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LY.MicroService.IdentityServer.HttpApi.Host", "services\LY.MicroService.IdentityServer.HttpApi.Host\LY.MicroService.IdentityServer.HttpApi.Host.csproj", "{B6DA1032-ADB7-4F4C-9B32-F5F9160CB6E2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LY.MicroService.LocalizationManagement.HttpApi.Host", "services\LY.MicroService.LocalizationManagement.HttpApi.Host\LY.MicroService.LocalizationManagement.HttpApi.Host.csproj", "{8BB50CB6-1E99-4617-B8A6-EABDED67405D}" EndProject @@ -345,6 +345,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LY.MicroService.PlatformMan EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LY.MicroService.RealtimeMessage.HttpApi.Host", "services\LY.MicroService.RealtimeMessage.HttpApi.Host\LY.MicroService.RealtimeMessage.HttpApi.Host.csproj", "{A17C9F1D-457A-48AC-B89C-722D8B3955DA}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Dapr.Client.Wrapper", "modules\dapr\LINGYUN.Abp.Dapr.Client.Wrapper\LINGYUN.Abp.Dapr.Client.Wrapper.csproj", "{842E19B3-8110-40FE-AAFF-D288BC928E55}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -899,6 +901,10 @@ Global {A17C9F1D-457A-48AC-B89C-722D8B3955DA}.Debug|Any CPU.Build.0 = Debug|Any CPU {A17C9F1D-457A-48AC-B89C-722D8B3955DA}.Release|Any CPU.ActiveCfg = Release|Any CPU {A17C9F1D-457A-48AC-B89C-722D8B3955DA}.Release|Any CPU.Build.0 = Release|Any CPU + {842E19B3-8110-40FE-AAFF-D288BC928E55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {842E19B3-8110-40FE-AAFF-D288BC928E55}.Debug|Any CPU.Build.0 = Debug|Any CPU + {842E19B3-8110-40FE-AAFF-D288BC928E55}.Release|Any CPU.ActiveCfg = Release|Any CPU + {842E19B3-8110-40FE-AAFF-D288BC928E55}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1069,6 +1075,7 @@ Global {8BB50CB6-1E99-4617-B8A6-EABDED67405D} = {A2EA6B3F-AD1A-4FDA-B12E-F71B20A43A6B} {A200E783-CBA2-4F64-A6EC-49D5C6482DEB} = {E5D1B78A-1A8F-4D52-BF99-A4A863ADE898} {A17C9F1D-457A-48AC-B89C-722D8B3955DA} = {608A3BD0-FC8D-48B0-B1C5-F3203A3BE99F} + {842E19B3-8110-40FE-AAFF-D288BC928E55} = {DC33925B-264D-421B-96CC-46F853CBCC70} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C95FDF91-16F2-4A8B-A4BE-0E62D1B66718} diff --git a/aspnet-core/common.props b/aspnet-core/common.props index abee60d5d..71ffe52ae 100644 --- a/aspnet-core/common.props +++ b/aspnet-core/common.props @@ -1,8 +1,8 @@ latest - 5.0.0-rc1 - LINGYUN + 5.0.0-rc.1 + colin $(NoWarn);CS1591;CS0436 https://github.com/colinin/abp-vue-admin-element-typescript/ MIT @@ -11,6 +11,12 @@ true + + + + + + $(SolutionDir)LocalNuget diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Dockerfile b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Dockerfile index 8462dcdce..7b4de0832 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Dockerfile +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Dockerfile @@ -12,4 +12,4 @@ VOLUME [ "./app/Logs" ] VOLUME [ "./app/Modules" ] VOLUME [ "./app/file-blob-storing" ] -ENTRYPOINT ["dotnet", "LINGYUN.Platform.HttpApi.Host.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "LY.MicroService.PlatformManagement.HttpApi.Host.dll"] \ No newline at end of file diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Dockerfile b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Dockerfile index 4d2ab5df2..88275f9bc 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Dockerfile +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Dockerfile @@ -11,4 +11,4 @@ EXPOSE 80/tcp VOLUME [ "./app/Logs" ] VOLUME [ "./app/Modules" ] -ENTRYPOINT ["dotnet", "LY.MicroService.identityServer.HttpApi.Host.dll"] +ENTRYPOINT ["dotnet", "LY.MicroService.IdentityServer.HttpApi.Host.dll"] diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.Configure.cs index 0598e349b..f08cc4ad6 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.Configure.cs @@ -28,7 +28,7 @@ using Volo.Abp.MultiTenancy; using Volo.Abp.PermissionManagement; using Volo.Abp.VirtualFileSystem; -namespace LY.MicroService.identityServer; +namespace LY.MicroService.IdentityServer; public partial class IdentityServerHttpApiHostModule { @@ -165,7 +165,7 @@ public partial class IdentityServerHttpApiHostModule { Configure(options => { - options.FileSets.AddEmbedded("LY.MicroService.identityServer"); + options.FileSets.AddEmbedded("LY.MicroService.IdentityServer"); }); } diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.Seeder.cs b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.Seeder.cs index f37f4b521..d7fc4e55c 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.Seeder.cs +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.Seeder.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace LY.MicroService.identityServer; +namespace LY.MicroService.IdentityServer; public partial class IdentityServerHttpApiHostModule { diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs index 51b5718a8..630183659 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/IdentityServerHttpApiHostModule.cs @@ -23,7 +23,7 @@ using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Abp.TenantManagement.EntityFrameworkCore; -namespace LY.MicroService.identityServer; +namespace LY.MicroService.IdentityServer; [DependsOn( typeof(AbpSerilogEnrichersApplicationModule), diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/LY.MicroService.identityServer.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/LY.MicroService.identityServer.HttpApi.Host.csproj index d11d7e41d..48bf710da 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/LY.MicroService.identityServer.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/LY.MicroService.identityServer.HttpApi.Host.csproj @@ -1,8 +1,8 @@ - + net6.0 - LY.MicroService.identityServer + LY.MicroService.IdentityServer diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs index f3e2773b3..11e11824a 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Program.cs @@ -5,7 +5,7 @@ using Serilog; using System; using System.IO; -namespace LY.MicroService.identityServer; +namespace LY.MicroService.IdentityServer; public class Program { diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Properties/launchSettings.json b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Properties/launchSettings.json index dee5c1d07..f61c52af9 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Properties/launchSettings.json +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Properties/launchSettings.json @@ -8,7 +8,7 @@ } }, "profiles": { - "LY.MicroService.identityServer.HttpApi.Host": { + "LY.MicroService.IdentityServer.HttpApi.Host": { "commandName": "Project", "dotnetRunMessages": true, "launchBrowser": false, diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Startup.cs b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Startup.cs index dd14ef376..6d22b56e9 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Startup.cs +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/Startup.cs @@ -4,7 +4,7 @@ using System.IO; using Volo.Abp.IO; using Volo.Abp.Modularity.PlugIns; -namespace LY.MicroService.identityServer; +namespace LY.MicroService.IdentityServer; public class Startup { diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/TenantHeaderParamter.cs b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/TenantHeaderParamter.cs index d928f79f4..bdb444f0d 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/TenantHeaderParamter.cs +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/TenantHeaderParamter.cs @@ -4,7 +4,7 @@ using Swashbuckle.AspNetCore.SwaggerGen; using System.Collections.Generic; using Volo.Abp.MultiTenancy; -namespace LY.MicroService.identityServer; +namespace LY.MicroService.IdentityServer; public class TenantHeaderParamter : IOperationFilter { diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/UserSecurityCodeSender.cs b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/UserSecurityCodeSender.cs index ddbe425ad..7d6cd4a5b 100644 --- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/UserSecurityCodeSender.cs +++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/UserSecurityCodeSender.cs @@ -1,5 +1,5 @@ using LINGYUN.Abp.Identity; -using LY.MicroService.identityServer.Emailing.Templates; +using LY.MicroService.IdentityServer.Emailing.Templates; using Microsoft.Extensions.Localization; using System.Threading; using System.Threading.Tasks; @@ -10,7 +10,7 @@ using Volo.Abp.Identity.Localization; using Volo.Abp.Sms; using Volo.Abp.TextTemplating; -namespace LY.MicroService.identityServer; +namespace LY.MicroService.IdentityServer; public class UserSecurityCodeSender : IUserSecurityCodeSender, ITransientDependency { diff --git a/aspnet-core/services/LY.MicroService.identityServer/Dockerfile b/aspnet-core/services/LY.MicroService.identityServer/Dockerfile index ae622adca..cad1c1829 100644 --- a/aspnet-core/services/LY.MicroService.identityServer/Dockerfile +++ b/aspnet-core/services/LY.MicroService.identityServer/Dockerfile @@ -11,4 +11,4 @@ EXPOSE 80/tcp VOLUME [ "./app/Logs" ] VOLUME [ "./app/Modules" ] -ENTRYPOINT ["dotnet", "AuthServer.Host.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "LY.MicroService.IdentityServer.dll"] \ No newline at end of file