Refactor.

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs

@@ -109,7 +109,6 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
                 steps.Add(new AppTemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host"));
                 steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305"));
-                steps.Add(new AppTemplateChangeDbMigratorPortSettingsStep("44305"));
             }
         }
 
@@ -130,7 +129,6 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
                 steps.Add(new AppTemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host"));
                 steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305"));
-                steps.Add(new AppTemplateChangeDbMigratorPortSettingsStep("44305"));
             }
         }
 
@@ -148,7 +146,6 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.Host"));
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
                 steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44303"));
-                steps.Add(new AppTemplateChangeDbMigratorPortSettingsStep("44305"));
             }
 
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds"));
@@ -171,7 +168,6 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
                 steps.Add(new AppTemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host"));
                 steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305"));
-                steps.Add(new AppTemplateChangeDbMigratorPortSettingsStep("44305"));
             }
         }
 

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateChangeDbMigratorPortSettingsStep.cs

@@ -1,24 +0,0 @@
-using Volo.Abp.Cli.ProjectBuilding.Building;
-using Volo.Abp.Cli.ProjectBuilding.Files;
-
-namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
-{
-    public class AppTemplateChangeDbMigratorPortSettingsStep : ProjectBuildPipelineStep
-    {
-        public string IdentityServerPort { get; }
-
-        /// <param name="identityServerPort"></param>
-        public AppTemplateChangeDbMigratorPortSettingsStep(
-            string identityServerPort)
-        {
-            IdentityServerPort = identityServerPort;
-        }
-
-        public override void Execute(ProjectBuildContext context)
-        {
-            context
-                .GetFile("/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json")
-                .ReplaceText("44300", IdentityServerPort);
-        }
-    }
-}

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs

@@ -58,7 +58,7 @@ namespace MyCompanyName.MyProjectName
             ConfigureLocalization();
             ConfigureVirtualFileSystem(context);
             ConfigureCors(context, configuration);
-            ConfigureSwaggerServices(context, configuration);
+            ConfigureSwaggerServices(context);
         }
 
         private void ConfigureBundles()
@@ -128,14 +128,9 @@ namespace MyCompanyName.MyProjectName
                 });
         }
 
-        private static void ConfigureSwaggerServices(ServiceConfigurationContext context, IConfiguration configuration)
+        private static void ConfigureSwaggerServices(ServiceConfigurationContext context)
         {
-            context.Services.AddAbpSwaggerGenWithOAuth(
+            context.Services.AddSwaggerGen(
-                configuration["AuthServer:Authority"],
-                new Dictionary<string, string>
-                {
-                    {"MyProjectName", "MyProjectName API"}
-                },
                 options =>
                 {
                     options.SwaggerDoc("v1", new OpenApiInfo {Title = "MyProjectName API", Version = "v1"});
@@ -219,10 +214,6 @@ namespace MyCompanyName.MyProjectName
             app.UseAbpSwaggerUI(c =>
             {
                 c.SwaggerEndpoint("/swagger/v1/swagger.json", "MyProjectName API");
-
-                var configuration = context.ServiceProvider.GetRequiredService<IConfiguration>();
-                c.OAuthClientId(configuration["AuthServer:SwaggerClientId"]);
-                c.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]);
             });
 
             app.UseAuditing();

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/appsettings.json

@@ -8,9 +8,7 @@
   },
   "AuthServer": {
     "Authority": "https://localhost:44305",
-    "RequireHttpsMetadata": "false",
+    "RequireHttpsMetadata": "false"
-    "SwaggerClientId": "MyProjectName_Swagger",
-    "SwaggerClientSecret": "1q2w3e*"
   },
   "StringEncryption": {
     "DefaultPassPhrase": "gsKnGZ041HLL4IM8"

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs

@@ -185,7 +185,7 @@ namespace MyCompanyName.MyProjectName
             {
                 options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API");
 
-                var configuration = context.ServiceProvider.GetRequiredService<IConfiguration>();
+                var configuration = context.GetConfiguration();
                 options.OAuthClientId(configuration["AuthServer:SwaggerClientId"]);
                 options.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]);
             });