diff --git a/services/JiShe.CollectBus.Migration.Application/CollectBusMigrationApplicationModule.cs b/services/JiShe.CollectBus.Migration.Application/CollectBusMigrationApplicationModule.cs index 62df6ba..8a82b7e 100644 --- a/services/JiShe.CollectBus.Migration.Application/CollectBusMigrationApplicationModule.cs +++ b/services/JiShe.CollectBus.Migration.Application/CollectBusMigrationApplicationModule.cs @@ -7,19 +7,17 @@ using System.Reflection; using System.Threading.Tasks; using Volo.Abp; using Volo.Abp.Application; +using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AutoMapper; -using Volo.Abp.BackgroundWorkers; -using Volo.Abp.BackgroundWorkers.Hangfire; using Volo.Abp.Modularity; namespace JiShe.CollectBus.Migration; [DependsOn( - typeof(CollectBusDomainModule), + typeof(CollectBusDomainModule), typeof(CollectBusMigrationApplicationContractsModule), typeof(AbpDddApplicationModule), typeof(AbpAutoMapperModule), - typeof(AbpBackgroundWorkersHangfireModule), typeof(CollectBusFreeRedisModule), typeof(CollectBusFreeSqlModule), typeof(CollectBusIoTDbModule) @@ -38,10 +36,10 @@ public class CollectBusMigrationApplicationModule : AbpModule public override async Task OnApplicationInitializationAsync( ApplicationInitializationContext context) { - var assembly = Assembly.GetExecutingAssembly(); - var types = assembly.GetTypes().Where(t => typeof(ICollectWorker).IsAssignableFrom(t) && !t.IsInterface) - .ToList(); - foreach (var type in types) await context.AddBackgroundWorkerAsync(type); + //var assembly = Assembly.GetExecutingAssembly(); + //var types = assembly.GetTypes().Where(t => typeof(ICollectWorker).IsAssignableFrom(t) && !t.IsInterface) + // .ToList(); + //foreach (var type in types) await context.AddBackgroundWorkerAsync(type); //Task.Run(() => //{ diff --git a/services/JiShe.CollectBus.Migration.Application/CollectBusMigrationlicationAutoMapperProfile.cs b/services/JiShe.CollectBus.Migration.Application/CollectBusMigrationlicationAutoMapperProfile.cs new file mode 100644 index 0000000..4e1a5c6 --- /dev/null +++ b/services/JiShe.CollectBus.Migration.Application/CollectBusMigrationlicationAutoMapperProfile.cs @@ -0,0 +1,13 @@ +using AutoMapper; + +namespace JiShe.CollectBus; + +public class CollectBusMigrationlicationAutoMapperProfile : Profile +{ + public CollectBusMigrationlicationAutoMapperProfile() + { + /* You can configure your AutoMapper mapping configuration here. + * Alternatively, you can split your mapping configurations + * into multiple profile classes for a better organization. */ + } +} diff --git a/web/JiShe.CollectBus.Migration.Host/CollectBusHostModule.Configure.cs b/web/JiShe.CollectBus.Migration.Host/CollectBusMigrationHostModule.Configure.cs similarity index 79% rename from web/JiShe.CollectBus.Migration.Host/CollectBusHostModule.Configure.cs rename to web/JiShe.CollectBus.Migration.Host/CollectBusMigrationHostModule.Configure.cs index 4f36c13..33c2b3a 100644 --- a/web/JiShe.CollectBus.Migration.Host/CollectBusHostModule.Configure.cs +++ b/web/JiShe.CollectBus.Migration.Host/CollectBusMigrationHostModule.Configure.cs @@ -1,9 +1,11 @@ -using Hangfire; -using Hangfire.Redis.StackExchange; +//using Hangfire; +//using Hangfire.Redis.StackExchange; using JiShe.CollectBus.Migration.Host.Hangfire; +using JiShe.CollectBus.Migration.Host.HealthChecks; using JiShe.CollectBus.Migration.Host.Swaggers; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.DataProtection; +using Microsoft.Extensions.Diagnostics.HealthChecks; using Microsoft.IdentityModel.Tokens; using Microsoft.OpenApi.Models; using StackExchange.Redis; @@ -23,28 +25,28 @@ namespace JiShe.CollectBus.Migration.Host /// Configures the hangfire. /// /// The context. - private void ConfigureHangfire(ServiceConfigurationContext context) - { - var redisStorageOptions = new RedisStorageOptions() - { - Db = context.Services.GetConfiguration().GetValue("Redis:HangfireDB") - }; + //private void ConfigureHangfire(ServiceConfigurationContext context) + //{ + // var redisStorageOptions = new RedisStorageOptions() + // { + // Db = context.Services.GetConfiguration().GetValue("Redis:HangfireDB") + // }; - Configure(options => { options.IsJobExecutionEnabled = false; }); + // Configure(options => { options.IsJobExecutionEnabled = false; }); - context.Services.AddHangfire(config => - { - config.UseRedisStorage( - context.Services.GetConfiguration().GetValue("Redis:Configuration"), redisStorageOptions) - .WithJobExpirationTimeout(TimeSpan.FromDays(7)); - var delaysInSeconds = new[] { 10, 60, 60 * 3 }; // 重试时间间隔 - const int Attempts = 3; // 重试次数 - config.UseFilter(new AutomaticRetryAttribute() { Attempts = Attempts, DelaysInSeconds = delaysInSeconds }); - //config.UseFilter(new AutoDeleteAfterSuccessAttribute(TimeSpan.FromDays(7))); - config.UseFilter(new JobRetryLastFilter(Attempts)); - }); - context.Services.AddHangfireServer(); - } + // context.Services.AddHangfire(config => + // { + // config.UseRedisStorage( + // context.Services.GetConfiguration().GetValue("Redis:Configuration"), redisStorageOptions) + // .WithJobExpirationTimeout(TimeSpan.FromDays(7)); + // var delaysInSeconds = new[] { 10, 60, 60 * 3 }; // 重试时间间隔 + // const int Attempts = 3; // 重试次数 + // config.UseFilter(new AutomaticRetryAttribute() { Attempts = Attempts, DelaysInSeconds = delaysInSeconds }); + // //config.UseFilter(new AutoDeleteAfterSuccessAttribute(TimeSpan.FromDays(7))); + // config.UseFilter(new JobRetryLastFilter(Attempts)); + // }); + // context.Services.AddHangfireServer(); + //} /// /// Configures the JWT authentication. @@ -179,7 +181,7 @@ namespace JiShe.CollectBus.Migration.Host { options.IsEnabled = true; options.EntityHistorySelectors.AddAllEntities(); - options.ApplicationName = "JiShe.CollectBus"; + options.ApplicationName = "JiShe.CollectBus.Migration"; } ); @@ -245,27 +247,18 @@ namespace JiShe.CollectBus.Migration.Host /// private void ConfigureHealthChecks(ServiceConfigurationContext context, IConfiguration configuration) { - //if (!configuration.GetValue("HealthChecks:IsEnable")) return; - //var cassandraConfig = new CassandraConfig(); - //configuration.GetSection("Cassandra").Bind(cassandraConfig); - //context.Services.AddHealthChecks() - // .AddMongoDb(configuration.GetConnectionString("Default"), "MongoDB", HealthStatus.Unhealthy) - // .AddRedis(configuration.GetValue("Redis:Configuration") ?? string.Empty, "Redis", - // HealthStatus.Unhealthy) - // .AddKafka(new Confluent.Kafka.ProducerConfig - // { - // BootstrapServers = configuration.GetValue("Kafka:BootstrapServers") - // }, "Kafka", failureStatus: HealthStatus.Unhealthy) + if (!configuration.GetValue("HealthChecks:IsEnable")) return; + context.Services.AddHealthChecks() + .AddRedis(configuration.GetValue("Redis:Configuration") ?? string.Empty, "Redis", + HealthStatus.Unhealthy) + .AddCheck("IoTDB"); - // //.AddCheck("Cassandra") - // .AddCheck("IoTDB"); - - //context.Services - // .AddHealthChecksUI(options => - // { - // options.AddHealthCheckEndpoint("JiSheCollectBus", "/health"); // 映射本地端点 - // }) - // .AddInMemoryStorage(); + context.Services + .AddHealthChecksUI(options => + { + options.AddHealthCheckEndpoint("JiSheCollectBusMigration", "/health"); // 映射本地端点 + }) + .AddInMemoryStorage(); } diff --git a/web/JiShe.CollectBus.Migration.Host/CollectBusHostModule.cs b/web/JiShe.CollectBus.Migration.Host/CollectBusMigrationHostModule.cs similarity index 89% rename from web/JiShe.CollectBus.Migration.Host/CollectBusHostModule.cs rename to web/JiShe.CollectBus.Migration.Host/CollectBusMigrationHostModule.cs index 16595f9..0f90aa7 100644 --- a/web/JiShe.CollectBus.Migration.Host/CollectBusHostModule.cs +++ b/web/JiShe.CollectBus.Migration.Host/CollectBusMigrationHostModule.cs @@ -5,6 +5,7 @@ using JiShe.CollectBus.Migration.Host.Swaggers; using Microsoft.AspNetCore.Diagnostics.HealthChecks; using Swashbuckle.AspNetCore.SwaggerUI; using Volo.Abp; +using Volo.Abp.AspNetCore; using Volo.Abp.AspNetCore.Authentication.JwtBearer; using Volo.Abp.AspNetCore.Serilog; using Volo.Abp.Autofac; @@ -26,8 +27,7 @@ namespace JiShe.CollectBus.Migration.Host typeof(AbpSwashbuckleModule), typeof(AbpTimingModule), typeof(CollectBusMigrationApplicationModule), - typeof(AbpCachingStackExchangeRedisModule), - typeof(AbpBackgroundWorkersHangfireModule) + typeof(AbpCachingStackExchangeRedisModule) )] public partial class CollectBusMigrationHostModule : AbpModule { @@ -40,12 +40,12 @@ namespace JiShe.CollectBus.Migration.Host var configuration = context.Services.GetConfiguration(); ConfigureCache(context); ConfigureSwaggerServices(context, configuration); - ConfigureNetwork(context, configuration); + //ConfigureNetwork(context, configuration); ConfigureJwtAuthentication(context, configuration); - ConfigureHangfire(context); + //ConfigureHangfire(context); ConfigureAuditLog(context); ConfigureCustom(context, configuration); - //ConfigureHealthChecks(context, configuration); + ConfigureHealthChecks(context, configuration); Configure(options => { options.Kind = DateTimeKind.Local; }); Configure(options => @@ -84,13 +84,13 @@ namespace JiShe.CollectBus.Migration.Host options.DefaultModelsExpandDepth(-1); }); } - app.UseAuditing(); + //app.UseAuditing(); app.UseAbpSerilogEnrichers(); app.UseUnitOfWork(); - app.UseHangfireDashboard("/hangfire", new DashboardOptions - { - IgnoreAntiforgeryToken = true - }); + //app.UseHangfireDashboard("/hangfire", new DashboardOptions + //{ + // IgnoreAntiforgeryToken = true + //}); app.UseConfiguredEndpoints(endpoints => { if (!configuration.GetValue("HealthChecks:IsEnable")) return; diff --git a/web/JiShe.CollectBus.Migration.Host/JiShe.CollectBus.Migration.Host.csproj b/web/JiShe.CollectBus.Migration.Host/JiShe.CollectBus.Migration.Host.csproj index 88c65a6..d201582 100644 --- a/web/JiShe.CollectBus.Migration.Host/JiShe.CollectBus.Migration.Host.csproj +++ b/web/JiShe.CollectBus.Migration.Host/JiShe.CollectBus.Migration.Host.csproj @@ -27,7 +27,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/web/JiShe.CollectBus.Migration.Host/Program.cs b/web/JiShe.CollectBus.Migration.Host/Program.cs index 8f89ae9..a9bd5b9 100644 --- a/web/JiShe.CollectBus.Migration.Host/Program.cs +++ b/web/JiShe.CollectBus.Migration.Host/Program.cs @@ -16,6 +16,18 @@ public class Program /// public static async Task Main(string[] args) { + //var builder = WebApplication.CreateBuilder(args); + //builder.Host + // .UseContentRoot(Directory.GetCurrentDirectory()) + // .UseSerilog((context, loggerConfiguration) => + // { + // loggerConfiguration.ReadFrom.Configuration(context.Configuration); + // }) + // .UseAutofac(); + //var app = builder.Build(); + //await app.InitializeApplicationAsync(); + //await app.RunAsync(); + var builder = WebApplication.CreateBuilder(args); builder.Host.UseContentRoot(Directory.GetCurrentDirectory()) .UseSerilog((context, loggerConfiguration) => @@ -24,6 +36,10 @@ public class Program }) .UseAutofac(); var configuration = builder.Configuration; + await builder.AddApplicationAsync(options => + { + //options.PlugInSources.AddFolder((configuration["PlugInFolder"].IsNullOrWhiteSpace() ? Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Plugins") : configuration["PlugInFolder"]) ?? string.Empty); + }); var app = builder.Build(); await app.InitializeApplicationAsync(); await app.RunAsync(); diff --git a/web/JiShe.CollectBus.Migration.Host/Properties/launchSettings.json b/web/JiShe.CollectBus.Migration.Host/Properties/launchSettings.json index 6469cde..642958f 100644 --- a/web/JiShe.CollectBus.Migration.Host/Properties/launchSettings.json +++ b/web/JiShe.CollectBus.Migration.Host/Properties/launchSettings.json @@ -1,6 +1,6 @@ { "profiles": { - "JiShe.CollectBus.Host": { + "JiShe.CollectBus.Migration.Host": { "commandName": "Project", "launchBrowser": true, "applicationUrl": "http://localhost:44316",