style: 优化代码

Author: gmf520

src/OSharp.Wpf/Stylet/IoC.cs

@@ -20,14 +20,14 @@ public static class IoC
     /// <summary>
     /// 获取指定服务类型的单个实例
     /// </summary>
-    public static Func<Type, string, object> GetInstance = (service, key) => throw new InvalidOperationException("IoC is not initialized");
+    public static Func<Type, string, object> GetInstance = (_, _) => throw new InvalidOperationException("IoC is not initialized");
 
     /// <summary>
     /// 获取指定服务类型的多个实例
     /// </summary>
-    public static Func<Type, IEnumerable<object>> GetAllInstances = service => throw new InvalidOperationException("IoC is not initialized");
+    public static Func<Type, IEnumerable<object>> GetAllInstances = _ => throw new InvalidOperationException("IoC is not initialized");
 
-    public static Action<object> BuildUp = instance => throw new InvalidOperationException("IoC is not initialized");
+    public static Action<object> BuildUp = _ => throw new InvalidOperationException("IoC is not initialized");
 
     /// <summary>
     /// 获取指定服务类型的单个实例
@@ -62,7 +62,7 @@ public static void Initialize(IContainer container)
     /// </summary>
     public static void Initialize(IServiceProvider provider)
     {
-        GetInstance = (type, key) => provider.GetService(type);
+        GetInstance = (type, _) => provider.GetService(type);
         GetAllInstances = provider.GetServices;
     }
 }

src/OSharp.Wpf/Stylet/ServiceProviderBootstrapper.cs

@@ -14,11 +14,11 @@ namespace OSharp.Wpf.Stylet;
 
 public abstract class ServiceProviderBootstrapper<TRootViewModel> : BootstrapperBase where TRootViewModel : class
 {
-    private IHostBuilder _hostBuilder;
+    private HostApplicationBuilder _hostBuilder;
     private IHost _host;
     private readonly CancellationTokenSource _cancellationTokenSource = new();
     private TRootViewModel _rootViewModel;
-    protected virtual TRootViewModel RootViewModel => this._rootViewModel ??= (TRootViewModel)this.GetInstance(typeof(TRootViewModel));
+    protected virtual TRootViewModel RootViewModel => _rootViewModel ??= (TRootViewModel)GetInstance(typeof(TRootViewModel));
 
     protected IServiceProvider ServiceProvider { get; private set; }
 
@@ -27,20 +27,20 @@ public abstract class ServiceProviderBootstrapper<TRootViewModel> : Bootstrapper
     /// </summary>
     protected override void OnStart()
     {
-        _hostBuilder = Host.CreateDefaultBuilder();
+        _hostBuilder = Host.CreateApplicationBuilder();
+        _hostBuilder.Environment.EnvironmentName = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")
+            ?? Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT") ?? "Production";
     }
 
     /// <summary>
     /// Overridden from BootstrapperBase, this sets up the IoC container
     /// </summary>
     protected override void ConfigureBootstrapper()
     {
-        _hostBuilder.ConfigureServices((context, services) =>
-        {
-            services.AddSingleton(context);
-            DefaultConfigureIoC(services);
-            ConfigureIoC(services);
-        });
+        _hostBuilder.Services.AddSingleton<IHostApplicationBuilder>(_hostBuilder);
+        DefaultConfigureIoC(_hostBuilder.Services);
+        ConfigureIoC(_hostBuilder.Services);
+
         _host = _hostBuilder.Build();
         ServiceProvider = _host.Services;
         _host.StartAsync(_cancellationTokenSource.Token).GetAwaiter().GetResult();
@@ -53,8 +53,8 @@ protected virtual void DefaultConfigureIoC(IServiceCollection services)
     {
         var viewManagerConfig = new ViewManagerConfig()
         {
-            ViewFactory = this.GetInstance,
-            ViewAssemblies = new List<Assembly>() { this.GetType().Assembly }
+            ViewFactory = GetInstance,
+            ViewAssemblies = [GetType().Assembly]
         };
 
         services.AddSingleton<IViewManager>(new ViewManager(viewManagerConfig));
@@ -100,7 +100,7 @@ protected override void OnExit(ExitEventArgs e)
         catch (Exception ex)
         {
             // 记录日志但不阻止退出
-            System.Diagnostics.Debug.WriteLine($"Error stopping host during exit: {ex.Message}");
+            Debug.WriteLine($"Error stopping host during exit: {ex.Message}");
         }
     }
 

src/OSharp/EventBuses/EventHandlerBase.cs

@@ -43,7 +43,7 @@ public virtual void Handle(IEventData eventData)
     /// <param name="eventData">事件源数据</param>
     /// <param name="cancelToken">异步取消标识</param>
     /// <returns></returns>
-    public virtual Task HandleAsync(IEventData eventData, CancellationToken cancelToken = default(CancellationToken))
+    public virtual Task HandleAsync(IEventData eventData, CancellationToken cancelToken = default)
     {
         if (!CanHandle(eventData))
         {
@@ -56,16 +56,17 @@ public virtual void Handle(IEventData eventData)
     /// 事件处理
     /// </summary>
     /// <param name="eventData">事件源数据</param>
-    public abstract void Handle(TEventData eventData);
+    public virtual void Handle(TEventData eventData)
+    { }
 
     /// <summary>
     /// 异步事件处理
     /// </summary>
     /// <param name="eventData">事件源数据</param>
     /// <param name="cancelToken">异步取消标识</param>
     /// <returns>是否成功</returns>
-    public virtual Task HandleAsync(TEventData eventData, CancellationToken cancelToken = default(CancellationToken))
+    public virtual Task HandleAsync(TEventData eventData, CancellationToken cancelToken = default)
     {
         return Task.Run(() => Handle(eventData), cancelToken);
     }
-}
+}