Merge pull request #7389 from abpframework/auto-merge/rel-4-2/117

Merge branch dev with rel-4.2

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs

@@ -18,6 +18,7 @@ using Volo.Abp.Cli.ProjectBuilding;
 using Volo.Abp.Cli.ProjectBuilding.Building;
 using Volo.Abp.Cli.ProjectBuilding.Templates.App;
 using Volo.Abp.Cli.ProjectBuilding.Templates.Console;
+using Volo.Abp.Cli.ProjectBuilding.Templates.Microservice;
 using Volo.Abp.Cli.ProjectModification;
 using Volo.Abp.Cli.Utils;
 using Volo.Abp.DependencyInjection;
@@ -238,6 +239,10 @@ namespace Volo.Abp.Cli.Commands
                 var isCommercial = template == AppProTemplate.TemplateName;
                 OpenThanksPage(uiFramework, databaseProvider, isTiered || commandLineArgs.Options.ContainsKey("separate-identity-server"), isCommercial);
             }
+            else if (MicroserviceTemplateBase.IsMicroserviceTemplate(template))
+            {
+                OpenMicroserviceDocumentPage();
+            }
         }
 
         private void OpenThanksPage(UiFramework uiFramework, DatabaseProvider databaseProvider, bool tiered, bool commercial)
@@ -249,19 +254,14 @@ namespace Volo.Abp.Cli.Commands
             var tieredYesNo = tiered ? "yes" : "no";
             var url = $"https://{urlPrefix}.abp.io/project-created-success?ui={uiFramework:g}&db={databaseProvider:g}&tiered={tieredYesNo}";
 
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            CmdHelper.OpenWebPage(url);
-            {
+        }
-                url = url.Replace("&", "^&");
+
-                Process.Start(new ProcessStartInfo("cmd", $"/c start {url}") { CreateNoWindow = true });
+        private void OpenMicroserviceDocumentPage()
-            }
+        {
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            var url = "https://docs.abp.io/en/commercial/latest/startup-templates/microservice/index";
-            {
+
-                Process.Start("xdg-open", url);
+            CmdHelper.OpenWebPage(url);
-            }
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-            {
-                Process.Start("open", url);
-            }
         }
 
         private bool GetCreateSolutionFolderPreference(CommandLineArgs commandLineArgs)

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs

@@ -12,6 +12,11 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Microservice
         {
         }
 
+        public static bool IsMicroserviceTemplate(string templateName)
+        {
+            return templateName == MicroserviceProTemplate.TemplateName;
+        }
+
         public override IEnumerable<ProjectBuildPipelineStep> GetCustomSteps(ProjectBuildContext context)
         {
             var steps = new List<ProjectBuildPipelineStep>();

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/CmdHelper.cs

@@ -7,6 +7,23 @@ namespace Volo.Abp.Cli.Utils
     {
         public static int SuccessfulExitCode = 0;
 
+        public static void OpenWebPage(string url)
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                url = url.Replace("&", "^&");
+                Process.Start(new ProcessStartInfo("cmd", $"/c start {url}") { CreateNoWindow = true });
+            }
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            {
+                Process.Start("xdg-open", url);
+            }
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                Process.Start("open", url);
+            }
+        }
+
         public static void Run(string file, string arguments)
         {
             var procStartInfo = new ProcessStartInfo(file, arguments);