fix(templateTaskGenerator): изменена папка проекта

This commit is contained in:
Mikhail Kuznetsov
2025-08-26 13:40:02 +10:00
parent ba01ebb206
commit 12478e1951
18 changed files with 4 additions and 4 deletions

View File

@@ -0,0 +1,33 @@
# See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
# This stage is used when running from VS in fast mode (Default for Debug configuration)
FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base
WORKDIR /app
# This stage is used to build the service project
FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build
ARG BUILD_CONFIGURATION=Release
WORKDIR /src
COPY ["NuGet.config", "."]
COPY ["TemplateTaskGeneratorWorker/PARR.TemplateTaskGeneratorWorker.csproj", "TemplateTaskGeneratorWorker/"]
COPY ["TemplateTaskGenerator/PARR.TemplateTaskGenerator.csproj", "TemplateTaskGenerator/"]
COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
RUN dotnet restore "./TemplateTaskGeneratorWorker/PARR.TemplateTaskGeneratorWorker.csproj"
COPY . .
WORKDIR "/src/TemplateTaskGeneratorWorker"
RUN dotnet build "./PARR.TemplateTaskGeneratorWorker.csproj" -c $BUILD_CONFIGURATION -o /app/build
# This stage is used to publish the service project to be copied to the final stage
FROM build AS publish
ARG BUILD_CONFIGURATION=Release
RUN dotnet publish "./PARR.TemplateTaskGeneratorWorker.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false /p:Version=$app_version
# This stage is used in production or when running from VS in regular mode (Default when not using the Debug configuration)
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "PARR.TemplateTaskGeneratorWorker.dll"]

View File

@@ -0,0 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk.Worker">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>dotnet-TemplateTaskGeneratorWorker-31809d29-599f-4a6d-8700-45ea8d9e7649</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PARR.TemplateTaskGenerator\PARR.TemplateTaskGenerator.csproj" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,31 @@
using Elastic.CommonSchema.Serilog;
using PARR.TemplateTaskGenerator;
using PARR.TemplateTaskGeneratorWorker;
using Serilog;
var builder = Host.CreateApplicationBuilder();
builder.Services.AddLogging(config =>
{
config.ClearProviders();
var logger = new LoggerConfiguration();
if (builder.Environment.IsProduction())
logger.WriteTo.Console(new EcsTextFormatter());
else
logger.WriteTo.Console();
logger.ReadFrom.Configuration(builder.Configuration);
config.AddSerilog(logger.CreateLogger());
});
builder.Services.InstallTemplateTaskGeneratorSerivces(builder.Configuration);
builder.Configuration.AddTemplateTaskGeneratorConfigurations(builder.Services);
builder.Services.AddTemplateTaskGeneratorSettings(builder.Configuration);
builder.Services.AddHostedService<Worker>();
var host = builder.Build();
host.Run();

View File

@@ -0,0 +1,14 @@
{
"profiles": {
"TemplateTaskGeneratorWorker": {
"commandName": "Project",
"environmentVariables": {
"DOTNET_ENVIRONMENT": "Development"
},
"dotnetRunMessages": true
},
"Container (Dockerfile)": {
"commandName": "Docker"
}
}
}

View File

@@ -0,0 +1,32 @@
using PARR.TemplateTaskGenerator;
namespace PARR.TemplateTaskGeneratorWorker
{
public class Worker : BackgroundService
{
private readonly ILogger<Worker> _logger;
private readonly IMqTemplateTaskGenerator mqTemplateTaskGenerator;
public Worker(
ILogger<Worker> logger,
IMqTemplateTaskGenerator mqTemplateTaskGenerator
)
{
_logger = logger;
this.mqTemplateTaskGenerator = mqTemplateTaskGenerator;
}
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
await mqTemplateTaskGenerator.StartAsync();
}
public override Task StopAsync(CancellationToken cancellationToken)
{
mqTemplateTaskGenerator.StopAsync().Wait();
return base.StopAsync(cancellationToken);
}
}
}

View File

@@ -0,0 +1,12 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"MqSettings": {
"TemplateTaskGenerator": { "HostName": "10.99.253.216" },
"TemplateGeneratorWorker": { "HostName": "10.99.253.216" }
}
}

View File

@@ -0,0 +1,45 @@
{
"ConnectionStrings": {
"DefaultConnection": "Server=10.99.253.184;Database=parr;User Id=app_parr; Password=PosdfkhT&)%sdfligL&%5546;",
"RedisConnection": "parr-redis:6379,password=ParrP@ssPtk202MMdevDvs"
},
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"Serilog": {
"MinimumLevel": {
"Default": "Debug",
"Override": {
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Debug"
}
},
"WriteTo": [
{
"Name": "File",
"Args": {
"path": "log/log-.txt",
"rollingInterval": "Day"
}
}
]
},
"MqSettings": {
"TemplateTaskGenerator": {
"HostName": "parr-rabbitmq",
"QueueName": "parr-template-task-generator",
"User": "template_task_generator_reader",
"Password": "wzqj$Z@3:poz@oot"
},
"TemplateGeneratorWorker": {
"HostName": "parr-rabbitmq",
"QueueName": "parr-template-generator",
"User": "template_generator_writer",
"Password": "B;6h+yF$zQ0OSkLX"
}
}
}