From ffb95ccf414ca3332e9bde8f90e2861b93a3ae6b Mon Sep 17 00:00:00 2001 From: Mikhail Kuznetsov Date: Thu, 31 Aug 2023 12:04:05 +1000 Subject: [PATCH] =?UTF-8?q?=D0=A1=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83?= =?UTF-8?q?=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AIHIT/Properties/launchSettings.json | 12 ++++++++ PARR.API.sln | 12 ++++++-- PARR.DAL/Properties/launchSettings.json | 12 ++++++++ .../EsppTemplateSyncInstaller.cs | 4 ++- PARR.EsppTemplateSync/ITemplateSyncer.cs | 4 +-- PARR.EsppTemplateSync/Services/IManager.cs | 8 ++++++ .../Services/IParserService.cs | 3 +- PARR.EsppTemplateSync/Services/Manager.cs | 15 ++++++++++ .../Services/ParserService.cs | 12 +++++++- .../Settings/GlobalSettings.cs | 12 ++++++++ ...emplateSyncer.cs => TemplateFileSyncer.cs} | 28 +++++++++---------- PARR.EsppTemplateSync/TemplateMQSyncer.cs | 21 ++++++++++++++ PARR.EsppTemplateSyncWorker/Worker.cs | 4 +-- .../appsettings.Development.json | 7 ++++- PARR.EsppTemplateSyncWorker/appsettings.json | 7 ++++- .../PARR.Mail/Properties/launchSettings.json | 12 ++++++++ PARR.MockData/PARR.MockData.csproj | 10 +++++++ PARR.MockData/Program.cs | 2 ++ ....Worker.csproj => PARR.AIHITWorker.csproj} | 0 19 files changed, 159 insertions(+), 26 deletions(-) create mode 100644 PARR.AIHIT/AIHIT/Properties/launchSettings.json create mode 100644 PARR.DAL/Properties/launchSettings.json create mode 100644 PARR.EsppTemplateSync/Services/IManager.cs create mode 100644 PARR.EsppTemplateSync/Services/Manager.cs rename PARR.EsppTemplateSync/{TemplateSyncer.cs => TemplateFileSyncer.cs} (85%) create mode 100644 PARR.EsppTemplateSync/TemplateMQSyncer.cs create mode 100644 PARR.Mail/PARR.Mail/Properties/launchSettings.json create mode 100644 PARR.MockData/PARR.MockData.csproj create mode 100644 PARR.MockData/Program.cs rename PARR.Worker/PARR.Worker/{PARR.Worker.csproj => PARR.AIHITWorker.csproj} (100%) diff --git a/PARR.AIHIT/AIHIT/Properties/launchSettings.json b/PARR.AIHIT/AIHIT/Properties/launchSettings.json new file mode 100644 index 00000000..16f66015 --- /dev/null +++ b/PARR.AIHIT/AIHIT/Properties/launchSettings.json @@ -0,0 +1,12 @@ +{ + "profiles": { + "PARR.AIHIT": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:1090;http://localhost:1092" + } + } +} \ No newline at end of file diff --git a/PARR.API.sln b/PARR.API.sln index 6077f09c..d731ecfe 100644 --- a/PARR.API.sln +++ b/PARR.API.sln @@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.DAL", "PARR.DAL\PARR.D EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.Mail", "PARR.Mail\PARR.Mail\PARR.Mail.csproj", "{228C8124-69E4-4AE0-8C33-0438E54FF1BA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.Worker", "PARR.Worker\PARR.Worker\PARR.Worker.csproj", "{D15F308C-9F63-4D69-B06E-DDA26FEE9BAB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.AIHITWorker", "PARR.Worker\PARR.Worker\PARR.AIHITWorker.csproj", "{D15F308C-9F63-4D69-B06E-DDA26FEE9BAB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.AIHIT", "PARR.AIHIT\AIHIT\PARR.AIHIT.csproj", "{3ED4E1CE-2AF5-4EB3-B7DF-B77CCC242B9E}" EndProject @@ -24,9 +24,11 @@ Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.BLL", "PARR.BLL\PARR.BLL.csproj", "{7BAB9170-743D-4542-8881-9B161EE81BB6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.EsppTemplateSyncWorker", "PARR.EsppTemplateSyncWorker\PARR.EsppTemplateSyncWorker.csproj", "{7FBD65FE-26FE-4E60-AD1F-20AAC6F88C7A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.EsppTemplateSyncWorker", "PARR.EsppTemplateSyncWorker\PARR.EsppTemplateSyncWorker.csproj", "{7FBD65FE-26FE-4E60-AD1F-20AAC6F88C7A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.EsppTemplateSync", "PARR.EsppTemplateSync\PARR.EsppTemplateSync.csproj", "{39FD9AAD-0792-46B2-A935-42486A993C32}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.EsppTemplateSync", "PARR.EsppTemplateSync\PARR.EsppTemplateSync.csproj", "{39FD9AAD-0792-46B2-A935-42486A993C32}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.MockData", "PARR.MockData\PARR.MockData.csproj", "{B02E5B16-59BD-4F02-9CC4-6873409DBD84}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -68,6 +70,10 @@ Global {39FD9AAD-0792-46B2-A935-42486A993C32}.Debug|Any CPU.Build.0 = Debug|Any CPU {39FD9AAD-0792-46B2-A935-42486A993C32}.Release|Any CPU.ActiveCfg = Release|Any CPU {39FD9AAD-0792-46B2-A935-42486A993C32}.Release|Any CPU.Build.0 = Release|Any CPU + {B02E5B16-59BD-4F02-9CC4-6873409DBD84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B02E5B16-59BD-4F02-9CC4-6873409DBD84}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B02E5B16-59BD-4F02-9CC4-6873409DBD84}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B02E5B16-59BD-4F02-9CC4-6873409DBD84}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/PARR.DAL/Properties/launchSettings.json b/PARR.DAL/Properties/launchSettings.json new file mode 100644 index 00000000..97360262 --- /dev/null +++ b/PARR.DAL/Properties/launchSettings.json @@ -0,0 +1,12 @@ +{ + "profiles": { + "PARR.DAL": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:1086;http://localhost:1095" + } + } +} \ No newline at end of file diff --git a/PARR.EsppTemplateSync/EsppTemplateSyncInstaller.cs b/PARR.EsppTemplateSync/EsppTemplateSyncInstaller.cs index 6c5e8153..9357ab84 100644 --- a/PARR.EsppTemplateSync/EsppTemplateSyncInstaller.cs +++ b/PARR.EsppTemplateSync/EsppTemplateSyncInstaller.cs @@ -18,8 +18,10 @@ namespace PARR.EsppTemplateSync configuration.GetSection(nameof(GlobalSettings)).Bind(globalSettings); services.AddSingleton(globalSettings); - services.AddTransient(); + //services.AddTransient(); + services.AddTransient(); services.AddTransient(); + services.AddTransient(); } } } diff --git a/PARR.EsppTemplateSync/ITemplateSyncer.cs b/PARR.EsppTemplateSync/ITemplateSyncer.cs index 0d548af4..05ffe0bd 100644 --- a/PARR.EsppTemplateSync/ITemplateSyncer.cs +++ b/PARR.EsppTemplateSync/ITemplateSyncer.cs @@ -2,7 +2,7 @@ { public interface ITemplateSyncer { - Task StartWatchingAsync(); - void StopWatching(); + Task StartAsync(); + void Stop(); } } diff --git a/PARR.EsppTemplateSync/Services/IManager.cs b/PARR.EsppTemplateSync/Services/IManager.cs new file mode 100644 index 00000000..40b2d8e8 --- /dev/null +++ b/PARR.EsppTemplateSync/Services/IManager.cs @@ -0,0 +1,8 @@ +namespace PARR.EsppTemplateSync.Services +{ + internal interface IManager + { + Task ManageFileAsync(string path); + Task ManageStringAsync(string str); + } +} diff --git a/PARR.EsppTemplateSync/Services/IParserService.cs b/PARR.EsppTemplateSync/Services/IParserService.cs index 118b1f32..5db1ae16 100644 --- a/PARR.EsppTemplateSync/Services/IParserService.cs +++ b/PARR.EsppTemplateSync/Services/IParserService.cs @@ -2,6 +2,7 @@ { internal interface IParserService { - Task ParseAsync(string path); + Task ParseStringAsync(string str); + } } diff --git a/PARR.EsppTemplateSync/Services/Manager.cs b/PARR.EsppTemplateSync/Services/Manager.cs new file mode 100644 index 00000000..8070e9f1 --- /dev/null +++ b/PARR.EsppTemplateSync/Services/Manager.cs @@ -0,0 +1,15 @@ +namespace PARR.EsppTemplateSync.Services +{ + internal class Manager : IManager + { + public Task ManageFileAsync(string path) + { + throw new NotImplementedException(); + } + + public Task ManageStringAsync(string str) + { + throw new NotImplementedException(); + } + } +} diff --git a/PARR.EsppTemplateSync/Services/ParserService.cs b/PARR.EsppTemplateSync/Services/ParserService.cs index f240954f..c1857dac 100644 --- a/PARR.EsppTemplateSync/Services/ParserService.cs +++ b/PARR.EsppTemplateSync/Services/ParserService.cs @@ -2,7 +2,17 @@ { internal class ParserService : IParserService { - public async Task ParseAsync(string path) + public async Task ParseFileAsync(string path) + { + //TODO: + + bool isSuccess = true; + + + return isSuccess; + } + + public async Task ParseStringAsync(string str) { //TODO: diff --git a/PARR.EsppTemplateSync/Settings/GlobalSettings.cs b/PARR.EsppTemplateSync/Settings/GlobalSettings.cs index 9a4c6317..079c41c4 100644 --- a/PARR.EsppTemplateSync/Settings/GlobalSettings.cs +++ b/PARR.EsppTemplateSync/Settings/GlobalSettings.cs @@ -1,6 +1,18 @@ namespace PARR.EsppTemplateSync.Settings { internal class GlobalSettings + { + public MqSettings? MqSettings { get; set; } + + public StorageSettings? StorageSettings { get; set; } + } + + internal class MqSettings + { + + } + + internal class StorageSettings { public int CheckIntervalSeconds { get; set; } = 5; } diff --git a/PARR.EsppTemplateSync/TemplateSyncer.cs b/PARR.EsppTemplateSync/TemplateFileSyncer.cs similarity index 85% rename from PARR.EsppTemplateSync/TemplateSyncer.cs rename to PARR.EsppTemplateSync/TemplateFileSyncer.cs index 7ec9d02f..235f3574 100644 --- a/PARR.EsppTemplateSync/TemplateSyncer.cs +++ b/PARR.EsppTemplateSync/TemplateFileSyncer.cs @@ -6,29 +6,29 @@ using PARR.EsppTemplateSync.Settings; namespace PARR.EsppTemplateSync { - internal class TemplateSyncer : ITemplateSyncer + internal class TemplateFileSyncer : ITemplateSyncer { - private readonly ILogger logger; - private readonly IParserService parserService; + private readonly ILogger logger; private readonly IFileService fileService; private readonly GlobalSettings globalSettings; + private readonly IManager manager; private readonly string dirPath; private readonly string filterExtensions; //private FileSystemWatcher? watcher; - public TemplateSyncer( - StorageSettings storageSettings, - ILogger logger, - IParserService parserService, + public TemplateFileSyncer( + BLL.Settings.StorageSettings storageSettings, + ILogger logger, IFileService fileService, - GlobalSettings globalSettings + GlobalSettings globalSettings, + IManager manager ) { this.logger = logger; - this.parserService = parserService; this.fileService = fileService; this.globalSettings = globalSettings; + this.manager = manager; if (storageSettings.EsppTemplates == null) { logger.LogError("Нет секции настроек хранилища. StorageSettings, EsppTemplates"); @@ -41,7 +41,7 @@ namespace PARR.EsppTemplateSync filterExtensions = string.Join(",", storageSettings.EsppTemplates!.AllowedExtensions).Replace(".", "*."); } - public async Task StartWatchingAsync() + public async Task StartAsync() { //смотрим, доступна ли папка if (!Directory.Exists(dirPath)) @@ -50,12 +50,12 @@ namespace PARR.EsppTemplateSync throw new Exception($"Не найдена папка: {dirPath}."); } - logger.LogInformation($"Запущена проверка директории. Интервал: {globalSettings.CheckIntervalSeconds} секунд. Фильтр: {filterExtensions}"); + logger.LogInformation($"Запущена проверка директории. Интервал: {globalSettings.StorageSettings!.CheckIntervalSeconds} секунд. Фильтр: {filterExtensions}"); while (true) { await GetFilesAsync(); - await Task.Delay(globalSettings.CheckIntervalSeconds * 1000); + await Task.Delay(globalSettings.StorageSettings!.CheckIntervalSeconds * 1000); } @@ -81,7 +81,7 @@ namespace PARR.EsppTemplateSync } - public void StopWatching() + public void Stop() { //watcher?.Dispose(); logger.LogInformation($"=== === === FileWatcher остановлен === === ==="); @@ -120,7 +120,7 @@ namespace PARR.EsppTemplateSync private async Task ParseFileAsync(string path) { logger.LogInformation($"--- --- Найден файл. Готов для парсинга {path} --- ---"); - var parseResult = await parserService.ParseAsync(path); + var parseResult = await manager.ManageFileAsync(path);//parserService.ParseFileAsync(path); if (parseResult) { diff --git a/PARR.EsppTemplateSync/TemplateMQSyncer.cs b/PARR.EsppTemplateSync/TemplateMQSyncer.cs new file mode 100644 index 00000000..e5c04087 --- /dev/null +++ b/PARR.EsppTemplateSync/TemplateMQSyncer.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PARR.EsppTemplateSync +{ + internal class TemplateMQSyncer : ITemplateSyncer + { + public async Task StartAsync() + { + // throw new NotImplementedException(); + } + + public void Stop() + { + //throw new NotImplementedException(); + } + } +} diff --git a/PARR.EsppTemplateSyncWorker/Worker.cs b/PARR.EsppTemplateSyncWorker/Worker.cs index f7f55b5a..f1478de5 100644 --- a/PARR.EsppTemplateSyncWorker/Worker.cs +++ b/PARR.EsppTemplateSyncWorker/Worker.cs @@ -15,7 +15,7 @@ namespace PARR.EsppTemplateSyncWorker protected override async Task ExecuteAsync(CancellationToken stoppingToken) { - await templateSyncer.StartWatchingAsync(); + await templateSyncer.StartAsync(); //while (!stoppingToken.IsCancellationRequested) //{ @@ -26,7 +26,7 @@ namespace PARR.EsppTemplateSyncWorker public override Task StopAsync(CancellationToken cancellationToken) { - templateSyncer.StopWatching(); + templateSyncer.Stop(); return base.StopAsync(cancellationToken); } diff --git a/PARR.EsppTemplateSyncWorker/appsettings.Development.json b/PARR.EsppTemplateSyncWorker/appsettings.Development.json index f0b7b521..512fc588 100644 --- a/PARR.EsppTemplateSyncWorker/appsettings.Development.json +++ b/PARR.EsppTemplateSyncWorker/appsettings.Development.json @@ -9,6 +9,11 @@ "StoragePath": "W:\\" }, "GlobalSettings": { - "CheckIntervalSeconds": 5 + "MqSettings": { + + }, + "StorageSettings": { + "CheckIntervalSeconds": 5 + } } } diff --git a/PARR.EsppTemplateSyncWorker/appsettings.json b/PARR.EsppTemplateSyncWorker/appsettings.json index 1c1e66aa..3b90af05 100644 --- a/PARR.EsppTemplateSyncWorker/appsettings.json +++ b/PARR.EsppTemplateSyncWorker/appsettings.json @@ -32,6 +32,11 @@ } }, "GlobalSettings": { - "CheckIntervalSeconds": 30 + "MqSettings": { + + }, + "StorageSettings": { + "CheckIntervalSeconds": 30 + } } } diff --git a/PARR.Mail/PARR.Mail/Properties/launchSettings.json b/PARR.Mail/PARR.Mail/Properties/launchSettings.json new file mode 100644 index 00000000..0eea726b --- /dev/null +++ b/PARR.Mail/PARR.Mail/Properties/launchSettings.json @@ -0,0 +1,12 @@ +{ + "profiles": { + "PARR.Mail": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:1096;http://localhost:1103" + } + } +} \ No newline at end of file diff --git a/PARR.MockData/PARR.MockData.csproj b/PARR.MockData/PARR.MockData.csproj new file mode 100644 index 00000000..f02677bf --- /dev/null +++ b/PARR.MockData/PARR.MockData.csproj @@ -0,0 +1,10 @@ + + + + Exe + net7.0 + enable + enable + + + diff --git a/PARR.MockData/Program.cs b/PARR.MockData/Program.cs new file mode 100644 index 00000000..3751555c --- /dev/null +++ b/PARR.MockData/Program.cs @@ -0,0 +1,2 @@ +// See https://aka.ms/new-console-template for more information +Console.WriteLine("Hello, World!"); diff --git a/PARR.Worker/PARR.Worker/PARR.Worker.csproj b/PARR.Worker/PARR.Worker/PARR.AIHITWorker.csproj similarity index 100% rename from PARR.Worker/PARR.Worker/PARR.Worker.csproj rename to PARR.Worker/PARR.Worker/PARR.AIHITWorker.csproj