[feat]代码优化调整

src/ServerApi/Infrastructures/Adnc.Infra.Caching/Adnc.Infra.Caching.csproj

@@ -7,7 +7,6 @@
 	<ItemGroup>
 		<PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-		<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
 		<PackageReference Include="Polly" Version="7.2.3" />
 		<PackageReference Include="StackExchange.Redis" Version="2.5.43" />
 		<PackageReference Include="protobuf-net" Version="3.0.101" />

src/ServerApi/Infrastructures/Adnc.Infra.Caching/Extensions/ServiceCollectionExtension.cs

@@ -3,7 +3,6 @@
 using Adnc.Infra.Caching.Core.Serialization;
 using Adnc.Infra.Caching.Interceptor.Castle;
 using Adnc.Infra.Caching.StackExchange;
-using Adnc.Infra.Core.Interceptor;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
@@ -16,6 +15,7 @@ public static IServiceCollection AddAdncInfraCaching(this IServiceCollection ser
 
         services
             .Configure<CacheOptions>(redisSection)
+            .Configure<RedisConfig>(redisSection)
             .AddSingleton<IRedisDatabaseProvider, DefaultDatabaseProvider>()
             .AddSingleton<ICachingKeyGenerator, DefaultCachingKeyGenerator>()
             .AddSingleton<DefaultRedisProvider>()

src/ServerApi/Infrastructures/Adnc.Infra.Caching/GlobalUsings.cs

@@ -1,4 +1,6 @@
-global using Microsoft.Extensions.Configuration;
+global using Adnc.Infra.Core.Configuration;
+global using Adnc.Infra.Core.Interceptor;
+global using Microsoft.Extensions.Configuration;
 global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Options;
 global using Polly;

src/ServerApi/Infrastructures/Adnc.Infra.Consul/Extensions/ServiceCollectionExtension.cs

@@ -6,18 +6,23 @@ namespace Microsoft.Extensions.DependencyInjection;
 public static class ServiceCollectionExtension
 {
     public static IServiceCollection AddAdncInfraConsul(this IServiceCollection services, IConfigurationSection consulSection)
-        => AddAdncInfraConsul(services, consulSection.Get<ConsulConfig>());
-
-    public static IServiceCollection AddAdncInfraConsul(this IServiceCollection services, ConsulConfig consulConfig)
     {
         if (services.HasRegistered(nameof(AddAdncInfraConsul)))
             return services;
 
-        services.AddScoped<ConsulDiscoverDelegatingHandler>();
-        services.AddSingleton(x => new ConsulClient(x => x.Address = new Uri(consulConfig.ConsulUrl)));
-        services.AddSingleton<ConsulRegistration>();
-        services.AddSingleton<IConsulServiceProvider, ConsulServiceProvider>();
-        services.AddSingleton<IServiceBuilder, ServiceBuilder>();
-        return services;
+        return services
+            .Configure<ConsulConfig>(consulSection)
+            .AddSingleton(provider =>
+            {
+                var configOptions = provider.GetService<IOptions<ConsulConfig>>();
+                if (configOptions is null)
+                    throw new NullReferenceException(nameof(configOptions));
+                return new ConsulClient(x => x.Address = new Uri(configOptions.Value.ConsulUrl));
+            })
+            .AddSingleton<ConsulRegistration>()
+            .AddSingleton<IConsulServiceProvider, ConsulServiceProvider>()
+            .AddSingleton<IServiceBuilder, ServiceBuilder>()
+            .AddScoped<ConsulDiscoverDelegatingHandler>()
+            ;
     }
 }

src/ServerApi/Infrastructures/Adnc.Infra.Consul/Registrar/ConsulRegistration.cs

@@ -2,7 +2,7 @@
 
 public sealed class ConsulRegistration
 {
-    private readonly ConsulConfig _consulConfig;
+    private readonly IOptions<ConsulConfig> _consulConfig;
     private readonly IHostApplicationLifetime _hostApplicationLifetime;
     private readonly ILogger<ConsulRegistration> _logger;
     private readonly ConsulClient _consulClient;
@@ -14,7 +14,7 @@ IOptions<ConsulConfig> consulOption
         , IHostApplicationLifetime hostApplicationLifetime
         , ILogger<ConsulRegistration> logger)
     {
-        _consulConfig = consulOption.Value;
+        _consulConfig = consulOption;
         _consulClient = consulClient;
         _hostApplicationLifetime = hostApplicationLifetime;
         //_serverAddressesFeature = serviceProvider.GetRequiredService<IServer>().Features.Get<IServerAddressesFeature>();
@@ -94,22 +94,22 @@ private AgentServiceRegistration GetAgentServiceRegistration(Uri serviceAddress,
         var port = serviceAddress.Port;
         var registrationInstance = new AgentServiceRegistration()
         {
-            ID = serviceId ?? $"{_consulConfig.ServiceName}-{DateTime.Now.GetTotalMilliseconds()}",
-            Name = _consulConfig.ServiceName,
+            ID = serviceId ?? $"{_consulConfig.Value.ServiceName}-{DateTime.Now.GetTotalMilliseconds()}",
+            Name = _consulConfig.Value.ServiceName,
             Address = host,
             Port = port,
             Meta = new Dictionary<string, string>() { ["Protocol"] = protocol },
-            Tags = _consulConfig.ServerTags,
+            Tags = _consulConfig.Value.ServerTags,
             Check = new AgentServiceCheck
             {
                 //服务停止多久后进行注销
-                DeregisterCriticalServiceAfter = TimeSpan.FromSeconds(_consulConfig.DeregisterCriticalServiceAfter),
+                DeregisterCriticalServiceAfter = TimeSpan.FromSeconds(_consulConfig.Value.DeregisterCriticalServiceAfter),
                 //健康检查间隔,心跳间隔
-                Interval = TimeSpan.FromSeconds(_consulConfig.HealthCheckIntervalInSecond),
+                Interval = TimeSpan.FromSeconds(_consulConfig.Value.HealthCheckIntervalInSecond),
                 //健康检查地址
-                HTTP = $"{protocol}://{host}:{port}/{_consulConfig.HealthCheckUrl}",
+                HTTP = $"{protocol}://{host}:{port}/{_consulConfig.Value.HealthCheckUrl}",
                 //超时时间
-                Timeout = TimeSpan.FromSeconds(_consulConfig.Timeout),
+                Timeout = TimeSpan.FromSeconds(_consulConfig.Value.Timeout),
             }
         };
         return registrationInstance;
@@ -119,17 +119,17 @@ private void CheckConfig()
     {
         if (_consulConfig == null)
             throw new ArgumentException(nameof(_consulConfig));
-        if (string.IsNullOrEmpty(_consulConfig.ConsulUrl))
-            throw new ArgumentException(nameof(_consulConfig.ConsulUrl));
-        if (string.IsNullOrEmpty(_consulConfig.ServiceName))
-            throw new ArgumentException(nameof(_consulConfig.ServiceName));
-        if (string.IsNullOrEmpty(_consulConfig.HealthCheckUrl))
-            throw new ArgumentException(nameof(_consulConfig.HealthCheckUrl));
-        if (_consulConfig.HealthCheckIntervalInSecond <= 0)
-            throw new ArgumentException(nameof(_consulConfig.HealthCheckIntervalInSecond));
-        if (_consulConfig.DeregisterCriticalServiceAfter <= 0)
-            throw new ArgumentException(nameof(_consulConfig.DeregisterCriticalServiceAfter));
-        if (_consulConfig.Timeout <= 0)
-            throw new ArgumentException(nameof(_consulConfig.Timeout));
+        if (string.IsNullOrEmpty(_consulConfig.Value.ConsulUrl))
+            throw new ArgumentException(nameof(_consulConfig.Value.ConsulUrl));
+        if (string.IsNullOrEmpty(_consulConfig.Value.ServiceName))
+            throw new ArgumentException(nameof(_consulConfig.Value.ServiceName));
+        if (string.IsNullOrEmpty(_consulConfig.Value.HealthCheckUrl))
+            throw new ArgumentException(nameof(_consulConfig.Value.HealthCheckUrl));
+        if (_consulConfig.Value.HealthCheckIntervalInSecond <= 0)
+            throw new ArgumentException(nameof(_consulConfig.Value.HealthCheckIntervalInSecond));
+        if (_consulConfig.Value.DeregisterCriticalServiceAfter <= 0)
+            throw new ArgumentException(nameof(_consulConfig.Value.DeregisterCriticalServiceAfter));
+        if (_consulConfig.Value.Timeout <= 0)
+            throw new ArgumentException(nameof(_consulConfig.Value.Timeout));
     }
 }

src/ServerApi/Infrastructures/Adnc.Infra.Core/Adnc.Infra.Core.csproj

@@ -14,6 +14,7 @@
 		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
 		<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
 	</ItemGroup>
 	<ItemGroup>
 	  <Folder Include="System\Extensions\Char\" />

src/ServerApi/Infrastructures/Adnc.Infra.Core/Adnc/Configuration/RedisConfig.cs

@@ -11,7 +11,7 @@ public class RedisConfig
     public bool EnableBloomFilter { get; set; }
     public int LockMs { get; set; }
     public int SleepMs { get; set; }
-    public Dbconfig dbconfig { get; set; } = default!;
+    public Dbconfig Dbconfig { get; set; } = default!;
 }
 
 public class Dbconfig

src/ServerApi/Infrastructures/Adnc.Infra.Core/GlobalUsings.cs

@@ -1,15 +1,11 @@
-global using Adnc.Infra.Core.Interfaces;
-global using Microsoft.Extensions.Configuration;
+global using Microsoft.Extensions.Configuration;
 global using Microsoft.Extensions.Hosting;
 global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Options;
-
 global using System.Collections;
 global using System.Collections.Concurrent;
-
 global using System.Diagnostics.CodeAnalysis;
 global using System.IO;
-
 global using System.Net;
 global using System.Reflection;
 global using System.Text;

src/ServerApi/Infrastructures/Adnc.Infra.Core/Microsoft/Extensions/Configuration/ConfigurationExtensions.cs

@@ -1,99 +1,12 @@
-using Adnc.Infra.Core.Configuration;
-
-namespace Microsoft.Extensions.Configuration;
+namespace Microsoft.Extensions.Configuration;
 
 public static partial class ConfigurationExtensions
 {
     /// <summary>
-    /// 服务注册类型
+    /// 获取服务注册类型
     /// </summary>
     /// <param name="serviceInfo"></param>
     /// <param name="configuration"></param>
     /// <returns></returns>
     public static string GetRegisteredType(this IConfiguration configuration) => configuration.GetValue("RegisteredType", "direct");
-
-    /// <summary>
-    /// 获取SSOAuthentication是否开启
-    /// </summary>
-    /// <param name="serviceInfo"></param>
-    /// <param name="configuration"></param>
-    /// <returns></returns>
-    public static bool IsSSOAuthentication(this IConfiguration configuration) => configuration.GetValue("SSOAuthentication", false);
-
-    /// <summary>
-    /// 获取跨域配置
-    /// </summary>
-    /// <param name="configuration"></param>
-    /// <returns></returns>
-    public static string GetAllowCorsHosts(this IConfiguration configuration) => configuration.GetValue("CorsHosts", string.Empty);
-
-    /// <summary>
-    /// 获取Consul配置
-    /// </summary>
-    /// <param name="configuration"></param>
-    /// <returns></returns>
-    public static IConfigurationSection GetConsulSection(this IConfiguration configuration) => configuration.GetSection(ConsulConfig.Name);
-
-    /// <summary>
-    /// 获取Rabitmq配置
-    /// </summary>
-    /// <param name="configuration"></param>
-    /// <returns></returns>
-    public static IConfigurationSection GetRabbitMqSection(this IConfiguration configuration) => configuration.GetSection(RabbitMqConfig.Name);
-
-    /// <summary>
-    /// 获取Redis配置
-    /// </summary>
-    /// <param name="configuration"></param>
-    /// <returns></returns>
-    public static IConfigurationSection GetRedisSection(this IConfiguration configuration) => configuration.GetSection(RedisConfig.Name);
-
-    /// <summary>
-    /// 获取Mysql配置
-    /// </summary>
-    /// <param name="configuration"></param>
-    /// <returns></returns>
-    public static IConfigurationSection GetMysqlSection(this IConfiguration configuration) => configuration.GetSection(MysqlConfig.Name);
-
-    /// <summary>
-    /// 获取Monogo配置
-    /// </summary>
-    /// <param name="configuration"></param>
-    /// <returns></returns>
-    public static IConfigurationSection GetMongoDbSection(this IConfiguration configuration) => configuration.GetSection(MongoConfig.Name);
-
-    /// <summary>
-    /// 获取JWT配置
-    /// </summary>
-    /// <param name="configuration"></param>
-    /// <returns></returns>
-    public static IConfigurationSection GetJWTSection(this IConfiguration configuration) => configuration.GetSection(JwtConfig.Name);
-
-    /// <summary>
-    /// 获取线程池配置
-    /// </summary>
-    /// <param name="configuration"></param>
-    /// <returns></returns>
-    public static IConfigurationSection GetThreadPoolSettingsSection(this IConfiguration configuration) => configuration.GetSection("ThreadPoolSettings");
-
-    /// <summary>
-    /// 获取Kestrel配置
-    /// </summary>
-    /// <param name="configuration"></param>
-    /// <returns></returns>
-    public static IConfigurationSection GetKestrelSection(this IConfiguration configuration) => configuration.GetSection(KestrelConfig.Name);
-
-    /// <summary>
-    /// 获取RpcAddressInfo配置
-    /// </summary>
-    /// <param name="configuration"></param>
-    /// <returns></returns>
-    public static IConfigurationSection GetRpcAddressInfoSection(this IConfiguration configuration) => configuration.GetSection("RpcAddressInfo");
-
-    /// <summary>
-    /// 获取RpcPartners配置
-    /// </summary>
-    /// <param name="configuration"></param>
-    /// <returns></returns>
-    public static IConfigurationSection GetRpcPartnersSection(this IConfiguration configuration) => configuration.GetSection("RpcPartners");
 }

src/ServerApi/Infrastructures/Adnc.Infra.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionExtensions.Registrar.cs

@@ -1,4 +1,6 @@
-namespace Microsoft.Extensions.DependencyInjection
+using Adnc.Infra.Core.Interfaces;
+
+namespace Microsoft.Extensions.DependencyInjection
 {
     public static partial class ServiceCollectionExtensions
     {

src/ServerApi/Infrastructures/Adnc.Infra.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionExtensions.ServiceInfo.cs

@@ -1,4 +1,6 @@
-namespace Microsoft.Extensions.DependencyInjection
+using Adnc.Infra.Core.Interfaces;
+
+namespace Microsoft.Extensions.DependencyInjection
 {
     public static partial class ServiceCollectionExtensions
     {

src/ServerApi/Infrastructures/Adnc.Infra.EventBus/Cap/CapSubscriber.cs

@@ -1,5 +1,4 @@
 using DotNetCore.CAP;
-using System.Linq.Expressions;
 
 namespace Adnc.Infra.EventBus.Cap
 {

src/ServerApi/Infrastructures/Adnc.Infra.EventBus/Extensions/ServiceCollectionExtension.cs

@@ -1,18 +1,27 @@
 using Adnc.Infra.EventBus;
 using Adnc.Infra.EventBus.Cap;
 using Adnc.Infra.EventBus.RabbitMq;
+using Microsoft.Extensions.Configuration;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
 public static class ServiceCollectionExtension
 {
-    public static IServiceCollection AddAdncInfraEventBus(this IServiceCollection services)
+    public static IServiceCollection AddAdncInfraEventBus(this IServiceCollection services, IConfigurationSection consulSection)
     {
         if (services.HasRegistered(nameof(AddAdncInfraEventBus)))
             return services;
 
-        services.AddSingleton<RabbitMqProducer>();
-        services.AddSingleton<IEventPublisher, CapPublisher>();
-        return services;
+        return services
+             .Configure<RabbitMqConfig>(consulSection)
+             .AddSingleton<IRabbitMqConnection>(provider =>
+             {
+                 var options = provider.GetRequiredService<IOptions<RabbitMqConfig>>();
+                 var logger = provider.GetRequiredService<ILogger<RabbitMqConnection>>();
+                 return RabbitMqConnection.GetInstance(options, logger);
+             })
+             .AddSingleton<RabbitMqProducer>()
+             .AddSingleton<IEventPublisher, CapPublisher>()
+             ;
     }
 }

src/ServerApi/Infrastructures/Adnc.Infra.EventBus/GlobalUsings.cs

@@ -0,0 +1,9 @@
+global using Adnc.Infra.Core.Configuration;
+global using Microsoft.Extensions.Hosting;
+global using Microsoft.Extensions.Logging;
+global using Microsoft.Extensions.Options;
+global using Polly;
+global using System.Linq.Expressions;
+global using System.Net.Sockets;
+global using System.Text;
+global using System.Text.Json;

src/ServerApi/Infrastructures/Adnc.Infra.EventBus/RabbitMq/BaseRabbitMqConsumer.cs

@@ -1,10 +1,5 @@
-using Adnc.Infra.Core.Configuration;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using RabbitMQ.Client;
+using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
-using System.Text;
 
 namespace Adnc.Infra.EventBus.RabbitMq
 {
@@ -14,9 +9,9 @@ public abstract class BaseRabbitMqConsumer : IHostedService
         private readonly IModel _channel;
         private readonly ILogger<dynamic> _logger;
 
-        protected BaseRabbitMqConsumer(IOptionsMonitor<RabbitMqConfig> options, ILogger<dynamic> logger)
+        protected BaseRabbitMqConsumer(IRabbitMqConnection RabbitMqConnection, ILogger<dynamic> logger)
         {
-            _connection = RabbitMqConnection.GetInstance(options, logger).Connection;
+            _connection = RabbitMqConnection.Connection;
             _channel = _connection.CreateModel();
             _logger = logger;
         }