fix: 格式化代码

aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain/GlobalUsings.cs

@@ -1,6 +1,8 @@
 // Global using directives
 
 global using System.Net;
+global using Lion.AbpPro.BasicManagement.Localization;
+global using Lion.AbpPro.Core;
 global using Volo.Abp.Auditing;
 global using Volo.Abp.AuditLogging;
 global using Volo.Abp.AutoMapper;
@@ -9,7 +11,10 @@ global using Volo.Abp.Domain;
 global using Volo.Abp.Domain.Services;
 global using Volo.Abp.FeatureManagement;
 global using Volo.Abp.Identity;
+global using Volo.Abp.Localization;
 global using Volo.Abp.Modularity;
 global using Volo.Abp.PermissionManagement.Identity;
 global using Volo.Abp.SettingManagement;
+global using Volo.Abp.Settings;
 global using Volo.Abp.TenantManagement;
+global using Volo.Abp.Timing;

templates/abp-vnext-pro-nuget-all/aspnet-core/MyCompanyName.MyProjectName.sln

@@ -48,6 +48,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyName.MyProjectName.FreeSqlRepository", "src\MyCompanyName.MyProjectName.FreeSqlRepository\MyCompanyName.MyProjectName.FreeSqlRepository.csproj", "{27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.WebGateway", "host\MyCompanyName.MyProjectName.WebGateway\MyCompanyName.MyProjectName.WebGateway.csproj", "{9C009501-0ED2-4930-B020-C8D06FE28E44}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -114,6 +116,10 @@ Global
 		{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
+		{9C009501-0ED2-4930-B020-C8D06FE28E44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C009501-0ED2-4930-B020-C8D06FE28E44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C009501-0ED2-4930-B020-C8D06FE28E44}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C009501-0ED2-4930-B020-C8D06FE28E44}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -134,6 +140,7 @@ Global
 		{AA94D832-1CCC-4715-95A9-A483F23A1A5D} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
 		{FB20372D-6C96-4733-9AAC-12522F15CAA6} = {8C1B8C6C-C518-4290-B070-622CCA6004DA}
 		{27C7A0E6-4C2E-4AFF-9DE7-1F526DDC0D18} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
+		{9C009501-0ED2-4930-B020-C8D06FE28E44} = {8C1B8C6C-C518-4290-B070-622CCA6004DA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F}

templates/abp-vnext-pro-nuget-all/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;
@@ -59,5 +61,6 @@ global using Volo.Abp.ExceptionHandling;
 global using Volo.Abp.Http;
 global using Volo.Abp.Json;
 global using Volo.Abp.Modularity;
+global using Volo.Abp.MultiTenancy;
 global using Volo.Abp.Users;
 global using Volo.Abp.Validation;

templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs

@@ -1,6 +1,3 @@
-using Lion.AbpPro;
-using Swagger;
-
 namespace MyCompanyName.MyProjectName
 {
     [DependsOn(
@@ -27,6 +24,7 @@ namespace MyCompanyName.MyProjectName
             ConfigureIdentity(context);
             ConfigureAuditLog(context);
             ConfigurationSignalR(context);
+            ConfigurationMultiTenancy();
         }
 
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
@@ -273,5 +271,10 @@ namespace MyCompanyName.MyProjectName
                     options.IgnoredUrls.Add("/cap");
                 });
         }
+        
+        private void ConfigurationMultiTenancy()
+        {
+            Configure<AbpMultiTenancyOptions>(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; });
+        }
     }
 }

templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Pages/Monitor.cshtml

@@ -38,18 +38,18 @@
             </div>
         </div>
 
-        <div class="col-sm-6 col-md-4 col-lg-3">
+        @* <div class="col-sm-6 col-md-4 col-lg-3"> *@
-            <div class="thumbnail" style="height: 180px">
+        @*     <div class="thumbnail" style="height: 180px"> *@
-                <a href="@MyProjectNameHttpApiHostConst.HangfireDashboardEndPoint" target="_blank">
+        @*         <a href="@MyProjectNameHttpApiHostConst.HangfireDashboardEndPoint" target="_blank"> *@
-                    <img class="lazy" src="/images/hangfire.png" width="300" height="150"/>
+        @*             <img class="lazy" src="/images/hangfire.png" width="300" height="150"/> *@
-                </a>
+        @*         </a> *@
-                <div class="caption">
+        @*         <div class="caption"> *@
-                    <h3>
+        @*             <h3> *@
-                        <a href="@MyProjectNameHttpApiHostConst.HangfireDashboardEndPoint" target="_blank">Hangfire面板</a>
+        @*                 <a href="@MyProjectNameHttpApiHostConst.HangfireDashboardEndPoint" target="_blank">Hangfire面板</a> *@
-                    </h3>
+        @*             </h3> *@
-                </div>
+        @*         </div> *@
-            </div>
+        @*     </div> *@
-        </div>
+        @* </div> *@
         <div class="col-sm-6 col-md-4 col-lg-3">
             <div class="thumbnail" style="height: 180px">
                 <a href="@MyProjectNameHttpApiHostConst.MiniprofilerEndPoint" target="_blank">

templates/abp-vnext-pro-nuget-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/MyModuleNameHttpApiHostModule.cs

@@ -1,3 +1,5 @@
+using Volo.Abp.MultiTenancy;
+
 namespace MyCompanyName.MyProjectName.MyModuleName
 {
     [DependsOn(
@@ -17,6 +19,7 @@ namespace MyCompanyName.MyProjectName.MyModuleName
     public class MyModuleNameHttpApiHostModule : AbpModule
     {
         private const string DefaultCorsPolicyName = "Default";
+        private const bool MultiTenancyIsEnabled = true;
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
@@ -26,6 +29,7 @@ namespace MyCompanyName.MyProjectName.MyModuleName
             ConfigureDB();
             ConfigureLocalization();
             ConfigureVirtualFileSystem(context);
+            ConfigurationMultiTenancy();
         }
 
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
@@ -49,6 +53,11 @@ namespace MyCompanyName.MyProjectName.MyModuleName
             app.UseRouting();
             app.UseCors(DefaultCorsPolicyName);
             app.UseAuthentication();
+            
+            if (MultiTenancyIsEnabled)
+            {
+                app.UseMultiTenancy();
+            }
             app.UseAbpRequestLocalization();
             app.UseAuthorization();
             app.UseSwagger();
@@ -66,6 +75,10 @@ namespace MyCompanyName.MyProjectName.MyModuleName
             app.UseConfiguredEndpoints();
         }
         
+        private void ConfigurationMultiTenancy()
+        {
+            Configure<AbpMultiTenancyOptions>(options => { options.IsEnabled = MultiTenancyIsEnabled; });
+        }
         /// <summary>
         /// 配置跨域
         /// </summary>

templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs

@@ -63,3 +63,4 @@ global using Volo.Abp.Json;
 global using Volo.Abp.Modularity;
 global using Volo.Abp.Users;
 global using Volo.Abp.Validation;
+global using Volo.Abp.MultiTenancy;

templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs

@@ -1,6 +1,6 @@
-namespace MyCompanyName.MyProjectName
+namespace MyCompanyName.MyProjectName;
-{
+
-    [DependsOn(
+[DependsOn(
     typeof(MyProjectNameHttpApiModule),
     typeof(AbpProSharedHostingMicroserviceModule),
     typeof(AbpAspNetCoreMvcUiMultiTenancyModule),
@@ -11,9 +11,9 @@ namespace MyCompanyName.MyProjectName
     typeof(MyProjectNameApplicationModule),
     typeof(AbpAspNetCoreMvcUiBasicThemeModule),
     typeof(AbpCachingStackExchangeRedisModule)
-    )]
+)]
-    public class MyProjectNameHttpApiHostModule : AbpModule
+public class MyProjectNameHttpApiHostModule : AbpModule
-    {
+{
         
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
@@ -25,6 +25,7 @@ namespace MyCompanyName.MyProjectName
         ConfigureIdentity(context);
         ConfigureAuditLog(context);
         ConfigurationSignalR(context);
+        ConfigurationMultiTenancy();
     }
 
     public override void OnApplicationInitialization(ApplicationInitializationContext context)
@@ -264,5 +265,9 @@ namespace MyCompanyName.MyProjectName
                 options.IgnoredUrls.Add("/cap");
             });
     }
+        
+    private void ConfigurationMultiTenancy()
+    {
+        Configure<AbpMultiTenancyOptions>(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; });
     }
 }