EsppTemplateSync настройка префикса имени шаблонов берётся из BLL
This commit is contained in:
@@ -19,10 +19,21 @@ namespace PARR.EsppTemplateSync
|
||||
services.AddSingleton(globalSettings);
|
||||
|
||||
services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
|
||||
//services.AddTransient<ITemplateSyncer, TemplateFileSyncer>();
|
||||
services.AddTransient<ITemplateSyncer, TemplateMQSyncer>();
|
||||
services.AddTransient<IParserService, ParserService>();
|
||||
services.AddTransient<IManager, Manager>();
|
||||
}
|
||||
|
||||
public static IConfigurationBuilder AddEsppTemplateConfigurations(this IConfigurationBuilder builder, IServiceCollection services)
|
||||
{
|
||||
builder.AddDalConfigurations(services);
|
||||
|
||||
return builder;
|
||||
}
|
||||
|
||||
public static void AddEsppTemplateSettings(this IServiceCollection services, IConfiguration configuration)
|
||||
{
|
||||
services.AddDallSettings(configuration);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using Microsoft.Extensions.Logging;
|
||||
using PARR.DAL.Contracts;
|
||||
using PARR.EsppTemplateSync.Domain;
|
||||
using PARR.EsppTemplateSync.Settings;
|
||||
using System.Globalization;
|
||||
@@ -9,14 +10,17 @@ namespace PARR.EsppTemplateSync.Services
|
||||
{
|
||||
private readonly ILogger<ParserService> logger;
|
||||
private readonly GlobalSettings globalSettings;
|
||||
private readonly SettingsFromDb settingsFromDb;
|
||||
|
||||
public ParserService(
|
||||
ILogger<ParserService> logger,
|
||||
GlobalSettings globalSettings
|
||||
GlobalSettings globalSettings,
|
||||
SettingsFromDb settingsFromDb
|
||||
)
|
||||
{
|
||||
this.logger = logger;
|
||||
this.globalSettings = globalSettings;
|
||||
this.settingsFromDb = settingsFromDb;
|
||||
}
|
||||
public async Task<bool> ParseFileAsync(string path)
|
||||
{
|
||||
@@ -41,11 +45,11 @@ namespace PARR.EsppTemplateSync.Services
|
||||
var name = splittedContent[0].Trim();
|
||||
|
||||
CultureInfo currentCulture = Thread.CurrentThread.CurrentCulture;
|
||||
if (globalSettings.TemplatePrefix.Trim().Length > 0
|
||||
&& !name.StartsWith(globalSettings.TemplatePrefix, true, currentCulture)
|
||||
if (!string.IsNullOrEmpty(settingsFromDb.TemplatePrefixName)
|
||||
&& !name.StartsWith(settingsFromDb.TemplatePrefixName, true, currentCulture)
|
||||
)
|
||||
{
|
||||
logger.LogWarning($"Имя шаблона не соответствует обязательному префиксу({globalSettings.TemplatePrefix}). Шаблон {name} игнорирован");
|
||||
logger.LogWarning($"Имя шаблона не соответствует обязательному префиксу({settingsFromDb.TemplatePrefixName}). Шаблон {name} игнорирован");
|
||||
return null;
|
||||
|
||||
}
|
||||
|
||||
@@ -9,7 +9,6 @@ namespace PARR.EsppTemplateSync.Settings
|
||||
public StorageSettings? StorageSettings { get; set; }
|
||||
public List<string>? IgnoreTemplateFields { get; set; }
|
||||
public string ParsingSeparator { get; set; } = "<|>";
|
||||
public string TemplatePrefix { get; set; }
|
||||
}
|
||||
|
||||
internal class MqSettings : IMqSettings
|
||||
|
||||
Reference in New Issue
Block a user