IApplicationLifetime stopped

Author: fanliang11

src/Surging.Core/Surging.Core.ServiceHosting.Extensions/ServiceHostModule.cs

@@ -6,6 +6,7 @@
 using Surging.Core.CPlatform.Runtime.Server;
 using Surging.Core.ServiceHosting.Extensions.Runtime;
 using Surging.Core.ServiceHosting.Extensions.Runtime.Implementation;
+using Surging.Core.ServiceHosting.Internal;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -36,6 +37,10 @@ public override void Initialize(AppModuleContext context)
                             entry.Behavior.StopAsync(cts.Token);
                         }
                     });
+                    serviceProvider.GetInstances<IApplicationLifetime>().ApplicationStopped.Register(async () =>
+                    {
+                       await entry.Behavior.StopAsync(cts.Token);
+                    });
                 }
             });
         }

src/Surging.Core/Surging.Core.ServiceHosting/Internal/Implementation/ConsoleLifetime.cs

@@ -23,7 +23,20 @@ public Task WaitForStartAsync(CancellationToken cancellationToken)
             {
                 Console.WriteLine("服务已启动。 按下Ctrl + C关闭。");
             });
-             
+
+            AppDomain.CurrentDomain.ProcessExit += (sender, eventArgs) =>
+            {
+                ApplicationLifetime.StopApplication();
+                //阻止程序主线程自动退出，等待退出信号
+                _shutdownBlock.WaitOne();
+            };
+            //按下Ctrl+C退出程序
+            Console.CancelKeyPress += (sender, e) =>
+            {
+                e.Cancel = true;
+                _shutdownBlock.Set();
+                ApplicationLifetime.StopApplication();
+            };
             return Task.CompletedTask;
         }
 

src/Surging.Tools/Surging.Tools.Cli2/Commands/RunCommand.cs

@@ -49,6 +49,9 @@ public class RunCommand
         [Option("-p|--path", "Multiple business module paths", CommandOptionType.MultipleValue)]
         public string[] Path { get; }
 
+        [Option("--rootpath", "scan root path", CommandOptionType.SingleValue)]
+        public string RootPath {  get; }
+
         [Option("-a|--address", "registry center address default 127.0.0.1:8500", CommandOptionType.SingleValue)]
         public string Address { get; set; }
 
@@ -136,6 +139,8 @@ private void ConfigureEnvironment()
         {
             if (!Address.IsNullOrEmpty())
                 Environment.SetEnvironmentVariable("Register_Conn", Address);
+            if(Path !=null)
+                Environment.SetEnvironmentVariable("ModulePaths", string.Join('|', Path));
         }
 
         private void Configure()
@@ -151,7 +156,9 @@ private void Configure()
                 AppConfig.ServerOptions.Ports.WSPort = WSPort.Value;
             if (GrpcPort != null)
                 AppConfig.ServerOptions.Ports.GrpcPort = GrpcPort.Value;
-       
+            if(RootPath != null)
+                AppConfig.ServerOptions.RootPath = RootPath;
+
             foreach (var item in AppConfig.ServerOptions.Packages)
             {
                 if (item.TypeName == "EnginePartModule")

src/Surging.Tools/Surging.Tools.Cli2/SurgingServiceEngine.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace Surging.Tools.Cli2
 {
@@ -18,6 +19,8 @@ public SurgingServiceEngine()
             ComponentServiceLocationFormats  = new[] {
                  EnvironmentHelper.GetEnvironmentVariable("${ComponentPath1}|Components"),
             };
+            ModulePaths= EnvironmentHelper.GetEnvironmentVariable("${ModulePaths}|").Split( "|");
+            ComponentPaths = EnvironmentHelper.GetEnvironmentVariable("${ComponentPaths}|").Split("|");
             //ModuleServiceLocationFormats = new[] {
             //   ""
             //};