[feat]adnc.infra.eventbus注册代码优化

[faat]健康检测代码优化

src/ServerApi/Services/Adnc.Cus/Adnc.Cus.Application/Registrar/CustApplicationDependencyRegistrar.cs

@@ -31,7 +31,6 @@ public override void AddAdnc()
         AddGrpcClient<MaintGrpc.MaintGrpcClient>(RpcConsts.MaintService, gprcPolicies);
         AddGrpcClient<WhseGrpc.WhseGrpcClient>(RpcConsts.WhseService, gprcPolicies);
         //rpc-even
-        AddEventBusPublishers();
-        AddEventBusSubscribers<CapEventSubscriber>();
+        AddCapEventBus<CapEventSubscriber>();
     }
 }

src/ServerApi/Services/Adnc.Maint/Adnc.Maint.Application/Adnc.Maint.Application.csproj

@@ -1,12 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<Import Project="..\..\..\build\common.props" />
-	<ItemGroup>
-	  <Compile Remove="EventSubscribers\LoginLogMqConsumer.cs" />
-	  <Compile Remove="EventSubscribers\OpsLogMqConsumer.cs" />
-	</ItemGroup>
-	<ItemGroup>
-		<Folder Include="EventSubscribers\" />
-	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Shared\Adnc.Shared.Rpc\Adnc.Shared.Rpc.csproj" />
 		<ProjectReference Include="..\..\Shared\Adnc.Shared.Application\Adnc.Shared.Application.csproj" />

src/ServerApi/Services/Adnc.Maint/Adnc.Maint.Application/Registrar/MaintApplicationDependencyRegistrar.cs

@@ -21,5 +21,7 @@ public override void AddAdnc()
         var restPolicies = this.GenerateDefaultRefitPolicies();
         AddRestClient<IAuthRestClient>(RpcConsts.UsrService, restPolicies);
         AddRestClient<IUsrRestClient>(RpcConsts.UsrService, restPolicies);
+
+        AddRabbitMqClient();
     }
 }

src/ServerApi/Services/Adnc.Ord/Adnc.Ord.Application/Registrar/OrdApplicationDependencyRegistrar.cs

@@ -26,7 +26,6 @@ public override void AddAdnc()
         AddRestClient<IMaintRestClient>(RpcConsts.MaintService, restPolicies);
         AddRestClient<IWhseRestClient>(RpcConsts.WhseService, restPolicies);
         //rpc-event
-        AddEventBusPublishers();
-        AddEventBusSubscribers<CapEventSubscriber>();
+        AddCapEventBus<CapEventSubscriber>();
     }
 }

src/ServerApi/Services/Adnc.Whse/Adnc.Whse.Application/Registrar/WhseApplicationDependencyRegistrar.cs

@@ -25,7 +25,6 @@ public override void AddAdnc()
         AddRestClient<IUsrRestClient>(RpcConsts.UsrService, restPolicies);
         AddRestClient<IMaintRestClient>(RpcConsts.MaintService, restPolicies);
         //rpc-event
-        AddEventBusPublishers();
-        AddEventBusSubscribers<CapEventSubscriber>();
+        AddCapEventBus<CapEventSubscriber>();
     }
 }

src/ServerApi/Services/Shared/Adnc.Shared.Application/Registrar/AbstractApplicationDependencyRegistrar.EventBus.cs

@@ -11,21 +11,24 @@ public abstract partial class AbstractApplicationDependencyRegistrar : IDependen
     /// <param name="tableNamePrefix">cap表面前缀</param>
     /// <param name="groupName">群组名子</param>
     /// <param name="func">回调函数</param>
+    [Obsolete("please call AddAdncInfraCap method")]
     protected virtual void AddEventBusSubscribers<TSubscriber>(Action<IServiceCollection> action = null)
         where TSubscriber : class, ICapSubscribe
     {
-        action?.Invoke(Services);
-
-        var tableNamePrefix = "cap";
-        var groupName = $"cap.{ServiceInfo.ShortName}.{this.GetEnvShortName()}".ToLower();
-
-        //add skyamp
-        //Services.AddSkyApmExtensions().AddCap();
-
-        Services.AddSingleton<TSubscriber>();
+        AddCapEventBus<TSubscriber>(action);
+    }
 
-        Services.AddCap(x =>
+    /// <summary>
+    /// 注册CAP组件(实现事件总线及最终一致性（分布式事务）的一个开源的组件)
+    /// </summary>
+    protected virtual void AddCapEventBus<TSubscriber>(Action<IServiceCollection> action = null)
+    where TSubscriber : class, ICapSubscribe
+    {
+        action?.Invoke(Services);
+        Services.AddAdncInfraCap<TSubscriber>(x =>
         {
+            var tableNamePrefix = "cap";
+            var groupName = $"cap.{ServiceInfo.ShortName}.{this.GetEnvShortName()}".ToLower();
             var mysqlConfig = MysqlSection.Get<MysqlConfig>();
             x.UseMySql(config =>
             {
@@ -42,6 +45,10 @@ protected virtual void AddEventBusSubscribers<TSubscriber>(Action<IServiceCollec
                 option.Port = rabbitMqConfig.Port;
                 option.UserName = rabbitMqConfig.UserName;
                 option.Password = rabbitMqConfig.Password;
+                option.ConnectionFactoryOptions = (facotry) =>
+                {
+                    facotry.ClientProvidedName = ServiceInfo.Id;
+                };
             });
             x.Version = ServiceInfo.Version;
             //默认值：cap.queue.{程序集名称},在 RabbitMQ 中映射到 Queue Names。
@@ -75,12 +82,21 @@ protected virtual void AddEventBusSubscribers<TSubscriber>(Action<IServiceCollec
     /// 注册事件发布者相关服务
     /// </summary>
     /// <param name="action"></param>
+    [Obsolete("please casll AddAdncInfraRabbitMq  or AddEventBusSubscribers methods")]
     protected virtual void AddEventBusPublishers(Action<IServiceCollection> action = null)
+    {
+        AddRabbitMqClient();
+    }
+
+    /// <summary>
+    /// 注册RabbitMq-Client
+    /// </summary>
+    protected virtual void AddRabbitMqClient(Action<IServiceCollection> action = null)
     {
         action?.Invoke(Services);
 
         if (RabbitMqSection is not null)
-            Services.AddAdncInfraEventBus(RabbitMqSection);
+            Services.AddAdncInfraRabbitMq(RabbitMqSection);
     }
 
 }

src/ServerApi/Services/Shared/Adnc.Shared.WebApi/Registrar/AbstractWebApiDependencyRegistrar.HealthChecks.cs

@@ -1,4 +1,5 @@
 using Adnc.Infra.EventBus.RabbitMq;
+using RabbitMQ.Client;
 
 namespace Adnc.Shared.WebApi.Registrar;
 
@@ -49,7 +50,26 @@ protected IHealthChecksBuilder AddHealthChecks(
                 throw new NullReferenceException("rabitmqConfig is null");
             checksBuilder.AddRabbitMQ(provider =>
             {
-                return provider.GetRequiredService<IRabbitMqConnection>().Connection;
+                var mqConnection = provider.GetService<IRabbitMqConnection>()?.Connection;
+                if (mqConnection is null)
+                {
+                    var serviceInfo = provider.GetService<IServiceInfo>();
+                    if (serviceInfo is null)
+                        throw new NullReferenceException($"{nameof(IServiceInfo)} is null");
+                    var factory = new ConnectionFactory
+                    {
+                        HostName = rabitmqConfig.HostName,
+                        Port = rabitmqConfig.Port,
+                        UserName = rabitmqConfig.UserName,
+                        Password = rabitmqConfig.Password,
+                        VirtualHost = rabitmqConfig.VirtualHost,
+                        ClientProvidedName = serviceInfo.Id,
+                        //Uri = new Uri($"amqps://{user}:{pass}@{host}/{vhost}"),
+                        AutomaticRecoveryEnabled = true
+                    };
+                    mqConnection = factory.CreateConnection();
+                }
+                return mqConnection;
             });
         }
 

src/ServerApi/Services/Shared/Adnc.Shared.WebApi/ServiceInfo.cs

@@ -35,14 +35,15 @@ public static ServiceInfo CreateInstance(Assembly startAssembly)
             var version = assemblyName.Version;
             var fullName = assemblyName.Name.ToLower();
             var serviceName = fullName.Replace(".", "-");
-            var ticks = DateTime.Now.GetTotalMilliseconds();
+            var ticks = DateTime.Now.GetTotalMilliseconds().ToLong();
+            var ticksHex = Convert.ToString(ticks,16);
             var envName = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")?.ToLower();
             var serviceId = envName switch
             {
-                "development" => $"{serviceName}-dev-{ticks}",
-                "test" => $"{serviceName}-test-{ticks}",
-                "staging" => $"{serviceName}-stag-{ticks}",
-                "production" => $"{serviceName}-{ticks}",
+                "development" => $"{serviceName}-dev-{ticksHex}",
+                "test" => $"{serviceName}-test-{ticksHex}",
+                "staging" => $"{serviceName}-stag-{ticksHex}",
+                "production" => $"{serviceName}-{ticksHex}",
                 _ => throw new NullReferenceException("ASPNETCORE_ENVIRONMENT")
             };