From 4b1d316b468ea51049c844a0391f6a3912d14d38 Mon Sep 17 00:00:00 2001 From: TekH Date: Fri, 14 Nov 2025 09:59:19 +0100 Subject: [PATCH] remove Finalizer.Win --- .../EnvelopeGenerator.Finalizer.Win.csproj | 44 ------ EnvelopeGenerator.Finalizer.Win/Extensions.cs | 35 ----- .../Job/CreateReportJob.cs | 28 ---- EnvelopeGenerator.Finalizer.Win/Program.cs | 128 ------------------ .../Properties/launchSettings.json | 41 ------ .../appsettings.Database.json | 22 --- .../appsettings.Development.json | 9 -- .../appsettings.Job.json | 8 -- .../appsettings.Logging.json | 81 ----------- .../appsettings.PdfBurner.json | 14 -- .../appsettings.json | 3 - 11 files changed, 413 deletions(-) delete mode 100644 EnvelopeGenerator.Finalizer.Win/EnvelopeGenerator.Finalizer.Win.csproj delete mode 100644 EnvelopeGenerator.Finalizer.Win/Extensions.cs delete mode 100644 EnvelopeGenerator.Finalizer.Win/Job/CreateReportJob.cs delete mode 100644 EnvelopeGenerator.Finalizer.Win/Program.cs delete mode 100644 EnvelopeGenerator.Finalizer.Win/Properties/launchSettings.json delete mode 100644 EnvelopeGenerator.Finalizer.Win/appsettings.Database.json delete mode 100644 EnvelopeGenerator.Finalizer.Win/appsettings.Development.json delete mode 100644 EnvelopeGenerator.Finalizer.Win/appsettings.Job.json delete mode 100644 EnvelopeGenerator.Finalizer.Win/appsettings.Logging.json delete mode 100644 EnvelopeGenerator.Finalizer.Win/appsettings.PdfBurner.json delete mode 100644 EnvelopeGenerator.Finalizer.Win/appsettings.json diff --git a/EnvelopeGenerator.Finalizer.Win/EnvelopeGenerator.Finalizer.Win.csproj b/EnvelopeGenerator.Finalizer.Win/EnvelopeGenerator.Finalizer.Win.csproj deleted file mode 100644 index cf43df87..00000000 --- a/EnvelopeGenerator.Finalizer.Win/EnvelopeGenerator.Finalizer.Win.csproj +++ /dev/null @@ -1,44 +0,0 @@ - - - - net8.0-windows - enable - enable - dotnet-EnvelopeGenerator.Finalizer.Win-6d5cc618-4159-4ff2-b600-8a15fbfa8099 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - diff --git a/EnvelopeGenerator.Finalizer.Win/Extensions.cs b/EnvelopeGenerator.Finalizer.Win/Extensions.cs deleted file mode 100644 index 5c0af349..00000000 --- a/EnvelopeGenerator.Finalizer.Win/Extensions.cs +++ /dev/null @@ -1,35 +0,0 @@ -using EnvelopeGenerator.Finalizer.Job; -using Quartz; - -namespace EnvelopeGenerator.Finalizer; - -public static class Extensions -{ - public static IServiceCollectionQuartzConfigurator ScheduleJobDefault(this IServiceCollectionQuartzConfigurator q, - string croneEpression) - where TJob : IJob - { - var name = $"{typeof(TJob).FullName}"; - var jobKey = new JobKey(name); - - return q.ScheduleJob(trigger => trigger - .WithIdentity(name + "-trigger") - .WithCronSchedule(croneEpression), - job => job.WithIdentity(jobKey) - ); - } - - public static IServiceCollectionQuartzConfigurator ScheduleJobDefault(this IServiceCollectionQuartzConfigurator q, - IConfiguration configuration) - where TJob : IJob - { - var expression = configuration[$"{typeof(TJob).Name}:CronExpression"]; - if (string.IsNullOrWhiteSpace(expression)) - throw new InvalidOperationException( - "Cron expression for the Worker job is not configured. " + - "Please provide a valid cron schedule in the configuration under " + - $"'{typeof(TJob).FullName}:CronExpression'."); - - return q.ScheduleJobDefault(expression); - } -} \ No newline at end of file diff --git a/EnvelopeGenerator.Finalizer.Win/Job/CreateReportJob.cs b/EnvelopeGenerator.Finalizer.Win/Job/CreateReportJob.cs deleted file mode 100644 index 69328a7c..00000000 --- a/EnvelopeGenerator.Finalizer.Win/Job/CreateReportJob.cs +++ /dev/null @@ -1,28 +0,0 @@ -using EnvelopeGenerator.Application.Common.Configurations; -using MediatR; -using Microsoft.Extensions.Options; -using Quartz; - -namespace EnvelopeGenerator.Finalizer.Job -{ - public class CreateReportJob : IJob - { - private readonly ILogger _logger; - - private readonly IMediator _mediator; - - private readonly PDFBurnerParams _options; - - public CreateReportJob(ILogger logger, IMediator mediator, IOptions options) - { - _logger = logger; - _mediator = mediator; - _options = options.Value; - } - - public Task Execute(IJobExecutionContext context) - { - return Task.CompletedTask; - } - } -} \ No newline at end of file diff --git a/EnvelopeGenerator.Finalizer.Win/Program.cs b/EnvelopeGenerator.Finalizer.Win/Program.cs deleted file mode 100644 index e88b0199..00000000 --- a/EnvelopeGenerator.Finalizer.Win/Program.cs +++ /dev/null @@ -1,128 +0,0 @@ -using EnvelopeGenerator.DependencyInjection; -using EnvelopeGenerator.Finalizer; -using EnvelopeGenerator.Finalizer.Job; -using EnvelopeGenerator.Infrastructure; -using Microsoft.EntityFrameworkCore; -using Quartz; -using Quartz.AspNetCore; -using Quartzmon; -using Serilog; - -// Load Serilog from appsettings.json -Log.Logger = new LoggerConfiguration() - .ReadFrom.Configuration(new ConfigurationBuilder() - .AddJsonFile("appsettings.Logging.json", optional: false, reloadOnChange: true) - .Build()) - .CreateLogger(); - -try -{ - Log.Information("Application is starting..."); - - var builder = WebApplication.CreateBuilder(args); - - #region Logging - builder.Logging.ClearProviders(); - builder.Logging.AddSerilog(); - #endregion - - #region Configuration - var config = builder.Configuration; - Directory - .GetFiles(builder.Environment.ContentRootPath, "appsettings.*.json", SearchOption.TopDirectoryOnly) - .Where(file => Path.GetFileName(file) != $"appsettings.Development.json") - .Where(file => Path.GetFileName(file) != $"appsettings.migration.json") - .ToList() - .ForEach(file => config.AddJsonFile(file, true, true)); - #endregion - - #region Web API Services - builder.Services.AddControllers(); - builder.Services.AddEndpointsApiExplorer(); - builder.Services.AddSwaggerGen(); - #endregion - - #region Quartz - builder.Services.AddQuartz(q => - { - q.ScheduleJobDefault(config); - }); - - builder.Services.AddQuartzServer(options => - { - options.WaitForJobsToComplete = true; - }); - - builder.Services.AddQuartzmon(); - - builder.Services.AddSingleton(provider => - provider.GetRequiredService().GetScheduler().Result - ); - #endregion - - #region Add DB Context, EG Inf. and Services - var cnnStrName = "Default"; - var connStr = config.GetConnectionString(cnnStrName) - ?? throw new InvalidOperationException($"Connection string '{cnnStrName}' is missing in the application configuration."); - - builder.Services.AddEnvelopeGenerator(egOptions => egOptions - .AddLocalization() - .AddDistributedSqlServerCache(options => - { - options.ConnectionString = connStr; - options.SchemaName = "dbo"; - options.TableName = "TBDD_CACHE"; - }) - .AddInfrastructure(opt => - { - opt.AddDbTriggerParams(config); - opt.AddDbContext((provider, options) => - { - var logger = provider.GetRequiredService>(); - var useInMemoryDb = config.GetValue("UseInMemoryDb"); - var dbCtxOpt = useInMemoryDb ? options.UseInMemoryDatabase("EGInMemoryDb") : options.UseSqlServer(connStr); - dbCtxOpt.LogTo(log => logger.LogInformation("{log}", log), LogLevel.Trace) - .EnableSensitiveDataLogging() - .EnableDetailedErrors(); - }); - }) - .AddServices(config, true) - ); - #endregion Add DB Context, EG Inf. and Services - - var app = builder.Build(); - - #region Web API Middleware - if (app.Environment.IsDevelopment()) - { - app.UseSwagger(); - app.UseSwaggerUI(); - } - - app.UseHttpsRedirection(); - - app.UseRouting(); - - app.UseAuthorization(); - - app.UseQuartzmon(new QuartzmonOptions() - { - Scheduler = app.Services.GetRequiredService(), - VirtualPathRoot = "/quartz" - }); - - app.MapControllers(); - #endregion - - app.Run(); - - Log.Information("The worker was stopped."); -} -catch (Exception ex) -{ - Log.Fatal(ex, "Worker could not be started!"); -} -finally -{ - Log.CloseAndFlush(); -} \ No newline at end of file diff --git a/EnvelopeGenerator.Finalizer.Win/Properties/launchSettings.json b/EnvelopeGenerator.Finalizer.Win/Properties/launchSettings.json deleted file mode 100644 index 2e144339..00000000 --- a/EnvelopeGenerator.Finalizer.Win/Properties/launchSettings.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "$schema": "http://json.schemastore.org/launchsettings.json", - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:17119", - "sslPort": 44321 - } - }, - "profiles": { - "http": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": false, - "launchUrl": "swagger", - "applicationUrl": "http://localhost:5010", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "https": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": true, - "launchUrl": "quartz", - "applicationUrl": "https://localhost:7141;http://localhost:5010", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": false, - "launchUrl": "swagger", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} \ No newline at end of file diff --git a/EnvelopeGenerator.Finalizer.Win/appsettings.Database.json b/EnvelopeGenerator.Finalizer.Win/appsettings.Database.json deleted file mode 100644 index 1c7059a7..00000000 --- a/EnvelopeGenerator.Finalizer.Win/appsettings.Database.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - "UseDbMigration": false, - "ConnectionStrings": { - "Default": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;", - "DbMigrationTest": "Server=SDD-VMP04-SQL17\\DD_DEVELOP01;Database=DD_ECM_DATA_MIGR_TEST;User Id=sa;Password=dd;Encrypt=false;TrustServerCertificate=True;" - }, - "DbTriggerParams": { - "Envelope": [ "TBSIG_ENVELOPE_AFT_INS" ], - "History": [ "TBSIG_ENVELOPE_HISTORY_AFT_INS" ], - "EmailOut": [ "TBEMLP_EMAIL_OUT_AFT_INS", "TBEMLP_EMAIL_OUT_AFT_UPD" ], - "EnvelopeReceiverReadOnly": [ "TBSIG_ENVELOPE_RECEIVER_READ_ONLY_UPD" ], - "Receiver": [], - "EmailTemplate": [ "TBSIG_EMAIL_TEMPLATE_AFT_UPD" ] - }, - "UseInMemoryDb": false -} \ No newline at end of file diff --git a/EnvelopeGenerator.Finalizer.Win/appsettings.Development.json b/EnvelopeGenerator.Finalizer.Win/appsettings.Development.json deleted file mode 100644 index 7589f277..00000000 --- a/EnvelopeGenerator.Finalizer.Win/appsettings.Development.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - "Debug": true -} \ No newline at end of file diff --git a/EnvelopeGenerator.Finalizer.Win/appsettings.Job.json b/EnvelopeGenerator.Finalizer.Win/appsettings.Job.json deleted file mode 100644 index 45e1fd34..00000000 --- a/EnvelopeGenerator.Finalizer.Win/appsettings.Job.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "FinishEnvelopeJob": { - "CronExpression": "* * * * * ?" - }, - "EnvelopeTaskApiJob": { - "CronExpression": "* * * * * ?" - } -} \ No newline at end of file diff --git a/EnvelopeGenerator.Finalizer.Win/appsettings.Logging.json b/EnvelopeGenerator.Finalizer.Win/appsettings.Logging.json deleted file mode 100644 index 2909cf07..00000000 --- a/EnvelopeGenerator.Finalizer.Win/appsettings.Logging.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "Serilog": { - "Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File" ], - "MinimumLevel": { - "Default": "Verbose", - "Override": { - "Microsoft": "Warning", - "System": "Warning" - } - }, - "WriteTo": [ - { - "Name": "Console", - "Args": { - "outputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}" - } - }, - { - "Name": "File", - "Args": { - "path": "E:/LogFiles/Digital Data/signFlow.Finalizer/log.Verbose-.txt", - "rollingInterval": "Day", - "restrictedToMinimumLevel": "Verbose", - "retainedFileCountLimit": 30, - "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}" - } - }, - { - "Name": "File", - "Args": { - "path": "E:/LogFiles/Digital Data/signFlow.Finalizer/log.Debug-.txt", - "rollingInterval": "Day", - "restrictedToMinimumLevel": "Debug", - "retainedFileCountLimit": 30, - "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}" - } - }, - { - "Name": "File", - "Args": { - "path": "E:/LogFiles/Digital Data/signFlow.Finalizer/log.Info-.txt", - "rollingInterval": "Day", - "restrictedToMinimumLevel": "Information", - "retainedFileCountLimit": 30, - "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}" - } - }, - { - "Name": "File", - "Args": { - "path": "E:/LogFiles/Digital Data/signFlow.Finalizer/log.Warning-.txt", - "rollingInterval": "Day", - "restrictedToMinimumLevel": "Warning", - "retainedFileCountLimit": 30, - "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}" - } - }, - { - "Name": "File", - "Args": { - "path": "E:/LogFiles/Digital Data/signFlow.Finalizer/log.Error-.txt", - "rollingInterval": "Day", - "restrictedToMinimumLevel": "Error", - "retainedFileCountLimit": 30, - "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}" - } - }, - { - "Name": "File", - "Args": { - "path": "E:/LogFiles/Digital Data/signFlow.Finalizer/log.Fatal-.txt", - "rollingInterval": "Day", - "restrictedToMinimumLevel": "Fatal", - "retainedFileCountLimit": 30, - "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}" - } - } - ], - "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ] - } -} \ No newline at end of file diff --git a/EnvelopeGenerator.Finalizer.Win/appsettings.PdfBurner.json b/EnvelopeGenerator.Finalizer.Win/appsettings.PdfBurner.json deleted file mode 100644 index 3f0309cb..00000000 --- a/EnvelopeGenerator.Finalizer.Win/appsettings.PdfBurner.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "IgnoredLabels": { - "Label": [ - "Date", - "Datum", - "ZIP", - "PLZ", - "Place", - "Ort", - "Position", - "Stellung" - ] - } -} \ No newline at end of file diff --git a/EnvelopeGenerator.Finalizer.Win/appsettings.json b/EnvelopeGenerator.Finalizer.Win/appsettings.json deleted file mode 100644 index 68e67add..00000000 --- a/EnvelopeGenerator.Finalizer.Win/appsettings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "GdPictureLicenseKey": "kG1Qf9PwmqgR8aDmIW2zI_ebj48RzqAJegRxcystEmkbTGQqfkNBdFOXIb6C_A00Ra8zZkrHdfjqzOPXK7kgkF2YDhvrqKfqh4WDug2vOt0qO31IommzkANSuLjZ4zmraoubyEVd25rE3veQ2h_j7tGIoH_LyIHmy24GaXsxdG0yCzIBMdiLbMMMDwcPY-809KeZ83Grv76OVhFvcbBWyYc251vou1N-kGg5_ZlHDgfWoY85gTLRxafjD3KS_i9ARW4BMiy36y8n7UP2jN8kGRnW_04ubpFtfjJqvtsrP_J9D0x7bqV8xtVtT5JI6dpKsVTiMgDCrIcoFSo5gCC1fw9oUopX4TDCkBQttO4-WHBlOeq9dG5Yb0otonVmJKaQA2tP6sMR-lZDs3ql_WI9t91yPWgpssrJUxSHDd27_LMTH_owJIqkF3NOJd9mYQuAv22oNKFYbH8e41pVKb8cT33Y9CgcQ_sy6YDA5PTuIRi67mjKge_nD9rd0IN213Ir9M_EFWqg9e4haWzIdHXQUo0md70kVhPX4UIH_BKJnxEEnFfoFRNMh77bB0N4jkcBEHPl-ghOERv8dOztf4vCnNpzzWvcLD2cqWIm6THy8XGGq9h4hp8aEreRleSMwv9QQAC7mjLwhQ1rBYkpUHlpTjhTLnMwHknl6HH0Z6zzmsgkRKVyfquv94Pd7QbQfZrRka0ss_48pf9p8hAywEn81Q==" -} \ No newline at end of file