Compare commits
1 Commits
zinoveva-a
...
zinoveva-a
| Author | SHA1 | Date | |
|---|---|---|---|
| 0c1493a9d9 |
@@ -1,85 +0,0 @@
|
||||
# Отчёт по лабораторной работе №2
|
||||
|
||||
Выполнил: студентка гр. ИСЭбд-41, Зиновьева Анна.
|
||||
|
||||
Вариант программы 1: 4. Формирует файл `/var/result/data.txt` так, что каждая строка файла - количество символов в именах файлов из каталога `/var/data`.
|
||||
|
||||
Вариант программы 2: 3. Ищет набольшее число из файла `/var/data/data.txt` и сохраняет количество таких чисел из последовательности в `/var/result/result.txt`.
|
||||
|
||||
## Создание приложений
|
||||
|
||||
Создадим 2 приложения.
|
||||
Был выбран язык C# и технология .NET 7.
|
||||
|
||||
Для создания обычных консольных приложений воспользуемся командами:
|
||||
|
||||
```sh
|
||||
dotnet new console -o worker-1
|
||||
dotnet new console -o worker-2
|
||||
```
|
||||
|
||||
Согласно варианту, программа 1 должна брать все файлы из папки `/var/data`, считывать длину их названия, найти минимальное и переложить его в папку `/var/result`.
|
||||
|
||||
[Исходный текст программы worker-1](worker-1/Program.cs)
|
||||
|
||||
Согласно варианту программа 2 должна брать строки из папки `/var/data/` с скопированным файлом, пытаться привести их к числам, затем найти минимальное из них.
|
||||
Далее найти количество вхождений этого числа и результат записать в файл `/var/result/result.txt`.
|
||||
|
||||
[Исходный текст программы worker-2](worker-2/Program.cs)
|
||||
|
||||
Дополнительно создан файл [.gitignore](.gitignore) для того, чтобы не закоммитить в git ничего лишнего.
|
||||
|
||||
## Настройка окружения
|
||||
|
||||
Для связи двух приложений воспользуемся следующей схемой:
|
||||
|
||||
1. Каталог `./data` должен быть примонтирован в каталог `/var/data` для программы 1.
|
||||
Оттуда будут браться исходные данные.
|
||||
2. Каталог `./result-1` должен быть примонтирован в каталог `/var/result` для программы 2.
|
||||
Туда будут складываться промежуточные данные.
|
||||
3. Каталог `./result-1` также должен быть примонтирован в каталог `/var/data` для программы 2.
|
||||
Оттуда будут браться промежуточные результаты.
|
||||
4. Каталог `./result` должен быть примонтирован в каталог `/var/result` для программы 2.
|
||||
Туда будут складывать результаты финальной обработки.
|
||||
|
||||
Для каждой программы были созданы файлы Dockerfile ([программа 1](worker-1/Dockerfile), [программа 2](worker-2/Dockerfile)) с подробным описанием процесса сборки.
|
||||
|
||||
Был создан файл [docker-compose.yml](docker-compose.yml), в котором указан манифест для запуска распределённого приложения.
|
||||
|
||||
|
||||
## Сборка и запуск
|
||||
|
||||
1. В каталог `./data` помещены 3 файла с различной длиной названия и содержимым.
|
||||
|
||||

|
||||
|
||||
На выходе программа должна записать 7 8 8.
|
||||
|
||||

|
||||
|
||||
2. Теперь, обрабатывая этот файл:
|
||||
|
||||

|
||||
|
||||
На выходе программа должна записать число 2 в `./result` так как в файле c названием data.txt максимальное число = 8, которое встречается 2 раза.
|
||||
|
||||

|
||||
|
||||
Для запуска приложения необходимо ввести команду `docker compose up --build`.
|
||||
Результат запуска после сборки:
|
||||
|
||||
```
|
||||
[+] Running 2/0
|
||||
✔ Container lab_2-worker-1-1 Created 0.0s
|
||||
✔ Container lab_2-worker-2-1 Created 0.0s
|
||||
Attaching to lab_2-worker-1-1, lab_2-worker-2-1
|
||||
lab_2-worker-1-1 | Файл успешно создан: ../var/result/data.txt
|
||||
lab_2-worker-2-1 | The maximum number is: 8
|
||||
lab_2-worker-2-1 | The count of maximum numbers is: 2
|
||||
lab_2-worker-1-1 exited with code 0
|
||||
lab_2-worker-2-1 exited with code 0
|
||||
```
|
||||
|
||||
В результате в каталоге `./result` создался файл `result.txt` с содержимым `7 8 8`, что соответствует входным данным.
|
||||
|
||||
Изменение значений в файлах из каталога `./data` также изменяет содержимое в файлах из каталогов `./result-1` и `./result`.
|
||||
|
Before Width: | Height: | Size: 8.4 KiB |
|
Before Width: | Height: | Size: 5.3 KiB |
|
Before Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 5.6 KiB |
@@ -1,12 +0,0 @@
|
||||
5
|
||||
7
|
||||
3
|
||||
7
|
||||
5
|
||||
8
|
||||
8
|
||||
9
|
||||
9
|
||||
5
|
||||
2
|
||||
1
|
||||
@@ -1,18 +0,0 @@
|
||||
version: "3.1"
|
||||
services:
|
||||
worker-1:
|
||||
build: ./worker-1
|
||||
volumes:
|
||||
# Монтирует локальную папку data к папке data в контейнере.
|
||||
- ./data:/var/data
|
||||
# Монтирует локальную папку result-1 к папке result в контейнере.
|
||||
- ./result-1:/var/result
|
||||
worker-2:
|
||||
build: ./worker-2
|
||||
volumes:
|
||||
# Монтирует локальную папку result-1 к папке data в контейнере.
|
||||
- ./result-1:/var/data
|
||||
- ./result:/var/result
|
||||
# Зависимость от первого приложения.
|
||||
depends_on:
|
||||
- worker-1
|
||||
@@ -1,48 +0,0 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.30114.105
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "worker-1", "worker-1\worker-1.csproj", "{634E1073-C536-49F1-92E2-48812E9724D4}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "worker-2", "worker-2\worker-2.csproj", "{CD71CC0E-6A85-4AC9-B8CE-47910331C868}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
Release|Any CPU = Release|Any CPU
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{634E1073-C536-49F1-92E2-48812E9724D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{634E1073-C536-49F1-92E2-48812E9724D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{634E1073-C536-49F1-92E2-48812E9724D4}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{634E1073-C536-49F1-92E2-48812E9724D4}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{634E1073-C536-49F1-92E2-48812E9724D4}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{634E1073-C536-49F1-92E2-48812E9724D4}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{634E1073-C536-49F1-92E2-48812E9724D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{634E1073-C536-49F1-92E2-48812E9724D4}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{634E1073-C536-49F1-92E2-48812E9724D4}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{634E1073-C536-49F1-92E2-48812E9724D4}.Release|x64.Build.0 = Release|Any CPU
|
||||
{634E1073-C536-49F1-92E2-48812E9724D4}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{634E1073-C536-49F1-92E2-48812E9724D4}.Release|x86.Build.0 = Release|Any CPU
|
||||
{CD71CC0E-6A85-4AC9-B8CE-47910331C868}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{CD71CC0E-6A85-4AC9-B8CE-47910331C868}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{CD71CC0E-6A85-4AC9-B8CE-47910331C868}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{CD71CC0E-6A85-4AC9-B8CE-47910331C868}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{CD71CC0E-6A85-4AC9-B8CE-47910331C868}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{CD71CC0E-6A85-4AC9-B8CE-47910331C868}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{CD71CC0E-6A85-4AC9-B8CE-47910331C868}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{CD71CC0E-6A85-4AC9-B8CE-47910331C868}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{CD71CC0E-6A85-4AC9-B8CE-47910331C868}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{CD71CC0E-6A85-4AC9-B8CE-47910331C868}.Release|x64.Build.0 = Release|Any CPU
|
||||
{CD71CC0E-6A85-4AC9-B8CE-47910331C868}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{CD71CC0E-6A85-4AC9-B8CE-47910331C868}.Release|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
Before Width: | Height: | Size: 17 KiB |
@@ -1,3 +0,0 @@
|
||||
7
|
||||
8
|
||||
8
|
||||
@@ -1 +0,0 @@
|
||||
2
|
||||
@@ -1,18 +0,0 @@
|
||||
# Задаем базовый образ на .net
|
||||
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build-env
|
||||
# Задаем рабочую директорию
|
||||
WORKDIR /src
|
||||
|
||||
|
||||
# Копируем файлы и папки в каталог в контейнер
|
||||
COPY . ./
|
||||
# Создаем образы и устанавливаем данные пакеты в контейнер
|
||||
RUN dotnet restore
|
||||
COPY . .
|
||||
RUN dotnet publish -c Release -o /publish
|
||||
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:5.0
|
||||
WORKDIR /publish
|
||||
COPY --from=build-env /publish .
|
||||
# Вызываем приложение во время выполнения контейнера
|
||||
ENTRYPOINT ["dotnet", "worker-1.dll"]
|
||||
@@ -1,27 +0,0 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
|
||||
var dir = new DirectoryInfo("/var/data");
|
||||
|
||||
var files = dir.GetFiles();
|
||||
|
||||
//var quantity_files = dir.GetFiles().Length;
|
||||
|
||||
string resultFilePath = "/var/result/data.txt";
|
||||
try
|
||||
{
|
||||
// Создаем новый файл или перезаписываем существующий
|
||||
using (StreamWriter writer = new StreamWriter(resultFilePath, false))
|
||||
{
|
||||
foreach (var file in files)
|
||||
{
|
||||
// Записываем в файл количество символов в имени каждого файла
|
||||
writer.WriteLine(file.Name.Length);
|
||||
}
|
||||
}
|
||||
Console.WriteLine("Файл успешно создан: " + resultFilePath);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine("Произошла ошибка: " + ex.Message);
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<RootNamespace>worker_1</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
@@ -1,18 +0,0 @@
|
||||
# Задаем базовый образ на .net
|
||||
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build-env
|
||||
# Задаем рабочую директорию
|
||||
WORKDIR /src
|
||||
|
||||
|
||||
# Копируем файлы и папки в каталог в контейнер
|
||||
COPY . ./
|
||||
# Создаем образы и устанавливаем данные пакеты в контейнер
|
||||
RUN dotnet restore
|
||||
COPY . .
|
||||
RUN dotnet publish -c Release -o /publish
|
||||
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:5.0
|
||||
WORKDIR /publish
|
||||
COPY --from=build-env /publish .
|
||||
# Вызываем приложение во время выполнения контейнера
|
||||
ENTRYPOINT ["dotnet", "worker-2.dll"]
|
||||
@@ -1,58 +0,0 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
|
||||
string filePath = "/var/data/data.txt";
|
||||
string resultPath = "/var/result/result.txt";
|
||||
|
||||
// Считываем числа из файла
|
||||
int[] numbers = ReadNumbersFromFile(filePath);
|
||||
|
||||
// Ищем наибольшее число
|
||||
int maxNumber = FindMaxNumber(numbers);
|
||||
|
||||
// Считаем количество таких чисел
|
||||
int count = CountNumbers(numbers, maxNumber);
|
||||
|
||||
// Сохраняем результат в файл
|
||||
SaveCountToFile(resultPath, count);
|
||||
|
||||
Console.WriteLine($"Максимальное число: {maxNumber}");
|
||||
Console.WriteLine($"Количество макисмальных чисел: {count}");
|
||||
|
||||
static int[] ReadNumbersFromFile(string filePath)
|
||||
{
|
||||
string[] lines = File.ReadAllLines(filePath);
|
||||
int[] numbers = Array.ConvertAll(lines, int.Parse);
|
||||
return numbers;
|
||||
}
|
||||
|
||||
static int FindMaxNumber(int[] numbers)
|
||||
{
|
||||
int maxNumber = int.MinValue;
|
||||
foreach (int number in numbers)
|
||||
{
|
||||
if (number > maxNumber)
|
||||
{
|
||||
maxNumber = number;
|
||||
}
|
||||
}
|
||||
return maxNumber;
|
||||
}
|
||||
|
||||
static int CountNumbers(int[] numbers, int targetNumber)
|
||||
{
|
||||
int count = 0;
|
||||
foreach (int number in numbers)
|
||||
{
|
||||
if (number == targetNumber)
|
||||
{
|
||||
count++;
|
||||
}
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
static void SaveCountToFile(string filePath, int count)
|
||||
{
|
||||
File.WriteAllText(filePath, count.ToString());
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<RootNamespace>worker_2</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
@@ -1,7 +1,10 @@
|
||||
## Ignore Visual Studio temporary files, build results, and
|
||||
## files generated by popular Visual Studio add-ons.
|
||||
##
|
||||
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
|
||||
## Get latest from `dotnet new gitignore`
|
||||
|
||||
# dotenv files
|
||||
.env
|
||||
|
||||
# User-specific files
|
||||
*.rsuser
|
||||
@@ -57,7 +60,7 @@ dlldata.c
|
||||
# Benchmark Results
|
||||
BenchmarkDotNet.Artifacts/
|
||||
|
||||
# .NET Core
|
||||
# .NET
|
||||
project.lock.json
|
||||
project.fragment.lock.json
|
||||
artifacts/
|
||||
@@ -93,6 +96,7 @@ StyleCopReport.xml
|
||||
*.tmp_proj
|
||||
*_wpftmp.csproj
|
||||
*.log
|
||||
*.tlog
|
||||
*.vspscc
|
||||
*.vssscc
|
||||
.builds
|
||||
@@ -296,6 +300,17 @@ node_modules/
|
||||
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
|
||||
*.vbw
|
||||
|
||||
# Visual Studio 6 auto-generated project file (contains which files were open etc.)
|
||||
*.vbp
|
||||
|
||||
# Visual Studio 6 workspace and project file (working project files containing files to include in project)
|
||||
*.dsw
|
||||
*.dsp
|
||||
|
||||
# Visual Studio 6 technical files
|
||||
*.ncb
|
||||
*.aps
|
||||
|
||||
# Visual Studio LightSwitch build output
|
||||
**/*.HTMLClient/GeneratedArtifacts
|
||||
**/*.DesktopClient/GeneratedArtifacts
|
||||
@@ -352,6 +367,9 @@ ASALocalRun/
|
||||
# Local History for Visual Studio
|
||||
.localhistory/
|
||||
|
||||
# Visual Studio History (VSHistory) files
|
||||
.vshistory/
|
||||
|
||||
# BeatPulse healthcheck temp database
|
||||
healthchecksdb
|
||||
|
||||
@@ -364,6 +382,28 @@ MigrationBackup/
|
||||
# Fody - auto-generated XML schema
|
||||
FodyWeavers.xsd
|
||||
|
||||
# VS Code files for those working on multiple tools
|
||||
.vscode/*
|
||||
!.vscode/settings.json
|
||||
!.vscode/tasks.json
|
||||
!.vscode/launch.json
|
||||
!.vscode/extensions.json
|
||||
*.code-workspace
|
||||
|
||||
# Local History for Visual Studio Code
|
||||
.history/
|
||||
|
||||
# Windows Installer files from build outputs
|
||||
*.cab
|
||||
*.msi
|
||||
*.msix
|
||||
*.msm
|
||||
*.msp
|
||||
|
||||
# JetBrains Rider
|
||||
*.sln.iml
|
||||
.idea
|
||||
|
||||
##
|
||||
## Visual studio for Mac
|
||||
##
|
||||
@@ -440,15 +480,5 @@ $RECYCLE.BIN/
|
||||
# Windows shortcuts
|
||||
*.lnk
|
||||
|
||||
# JetBrains Rider
|
||||
.idea/
|
||||
*.sln.iml
|
||||
|
||||
##
|
||||
## Visual Studio Code
|
||||
##
|
||||
.vscode/*
|
||||
!.vscode/settings.json
|
||||
!.vscode/tasks.json
|
||||
!.vscode/launch.json
|
||||
!.vscode/extensions.json
|
||||
# Vim temporary swap files
|
||||
*.swp
|
||||
87
tasks/zinoveva-ad/lab_3/README.md
Normal file
@@ -0,0 +1,87 @@
|
||||
# Отчет по лабораторной работе №3
|
||||
|
||||
Выполнила студентка гр. ИСЭбд-41 Зиновьева А. Д.
|
||||
|
||||
## REST API, Gateway и синхронный обмен между микросервисами
|
||||
|
||||
## Создание микросервисов
|
||||
|
||||
1. Создала первый микросервис - `dotnet new web -n worker-1`
|
||||
2. Добавила решение - `dotnet new sln`
|
||||
3. Связала решение и проект - `dotnet sln worker-1.sln add worker-1.csproj`
|
||||
4. Для второго микросервиса выполнила пункты 1-3
|
||||
5. Добавила библиотеку Swagger и OpenAi - `dotnet add worker-1.csproj package Swashbuckle.AspNetCore` , `dotnet add worker-1.csproj package Microsoft.AspNetCore.OpenApi`
|
||||
6. Запустила - `dotnet run`
|
||||
|
||||
Скриншоты протестированных микросервисов:
|
||||

|
||||

|
||||
|
||||
## Реализация синхронного обмена
|
||||
|
||||
Код реализации синхронного обмена:
|
||||
|
||||
```cs
|
||||
//Файл Program.cs проекта worker-2
|
||||
app.MapGet("/Requests/", async () =>
|
||||
{
|
||||
var httpClient = new HttpClient();
|
||||
var secondWorkerResponse = await httpClient.GetStringAsync("http://worker-1:8080/");
|
||||
|
||||
return secondWorkerResponse.ToArray();
|
||||
})
|
||||
.WithName("GetRequests")
|
||||
.WithOpenApi();
|
||||
```
|
||||
|
||||
## Реализация gateway при помощи nginx
|
||||
|
||||
Добавила nginx.conf:
|
||||
|
||||
```conf
|
||||
server {
|
||||
listen 8080;
|
||||
listen [::]:8080;
|
||||
server_name localhost;
|
||||
|
||||
location / {
|
||||
root /usr/share/nginx/html;
|
||||
index index.html index.htm;
|
||||
}
|
||||
|
||||
location /worker-1/ {
|
||||
proxy_pass http://worker-1:8080/;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header X-Forwarded-Prefix /worker-1;
|
||||
}
|
||||
|
||||
location /worker-2/ {
|
||||
proxy_pass http://worker-2:8080/;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header X-Forwarded-Prefix /worker-2;
|
||||
}
|
||||
}
|
||||
|
||||
```
|
||||
|
||||
Результат, после выполнения команды `docker compose up`:
|
||||
|
||||
Docker:
|
||||
|
||||

|
||||
|
||||
index.html на gateway-1:
|
||||
|
||||

|
||||
|
||||
worker-1:
|
||||
|
||||

|
||||
|
||||
worker-2:
|
||||
|
||||

|
||||
15
tasks/zinoveva-ad/lab_3/docker-compose.yml
Normal file
@@ -0,0 +1,15 @@
|
||||
version: "3.1"
|
||||
services:
|
||||
worker-1:
|
||||
build: ./worker-1
|
||||
worker-2:
|
||||
build: ./worker-2
|
||||
depends_on:
|
||||
- worker-1
|
||||
gateway:
|
||||
image: nginx:latest
|
||||
ports:
|
||||
- 8080:8080
|
||||
volumes:
|
||||
- ./static:/usr/share/nginx/html:ro
|
||||
- ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
|
||||
26
tasks/zinoveva-ad/lab_3/nginx.conf
Normal file
@@ -0,0 +1,26 @@
|
||||
server {
|
||||
listen 8080;
|
||||
listen [::]:8080;
|
||||
server_name localhost;
|
||||
|
||||
location / {
|
||||
root /usr/share/nginx/html;
|
||||
index index.html index.htm;
|
||||
}
|
||||
|
||||
location /worker-1/ {
|
||||
proxy_pass http://worker-1:8080/;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header X-Forwarded-Prefix /worker-1;
|
||||
}
|
||||
|
||||
location /worker-2/ {
|
||||
proxy_pass http://worker-2:8080/;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header X-Forwarded-Prefix /worker-2;
|
||||
}
|
||||
}
|
||||
BIN
tasks/zinoveva-ad/lab_3/pic/Screenshot_1.jpg
Normal file
|
After Width: | Height: | Size: 51 KiB |
BIN
tasks/zinoveva-ad/lab_3/pic/Screenshot_2.jpg
Normal file
|
After Width: | Height: | Size: 25 KiB |
BIN
tasks/zinoveva-ad/lab_3/pic/Screenshot_3.jpg
Normal file
|
After Width: | Height: | Size: 142 KiB |
BIN
tasks/zinoveva-ad/lab_3/pic/Screenshot_4.jpg
Normal file
|
After Width: | Height: | Size: 21 KiB |
BIN
tasks/zinoveva-ad/lab_3/pic/Screenshot_5.jpg
Normal file
|
After Width: | Height: | Size: 147 KiB |
BIN
tasks/zinoveva-ad/lab_3/pic/Screenshot_6.jpg
Normal file
|
After Width: | Height: | Size: 150 KiB |
13
tasks/zinoveva-ad/lab_3/static/index.html
Normal file
@@ -0,0 +1,13 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ru">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Тестовое приложение для л/р 3</title>
|
||||
</head>
|
||||
<body>
|
||||
<p>Зиновьева Анна Дмитриевна, группа ИСЭбд-41.</p>
|
||||
<p><a href="/worker-1/">Отправить запрос к worker-1</a></p>
|
||||
<p><a href="/worker-2/">Отправить запрос к worker-2</a></p>
|
||||
</body>
|
||||
</html>
|
||||
11
tasks/zinoveva-ad/lab_3/worker-1/Dockerfile
Normal file
@@ -0,0 +1,11 @@
|
||||
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
|
||||
WORKDIR /app
|
||||
|
||||
COPY . ./
|
||||
RUN dotnet restore
|
||||
RUN dotnet publish -c Release -o out
|
||||
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:8.0
|
||||
WORKDIR /app
|
||||
COPY --from=build-env /app/out .
|
||||
ENTRYPOINT ["dotnet", "worker-1.dll"]
|
||||
124
tasks/zinoveva-ad/lab_3/worker-1/Program.cs
Normal file
@@ -0,0 +1,124 @@
|
||||
List<Request> requests = new()
|
||||
{
|
||||
new Request() { Uuid= Guid.Parse("7777fa5f-b786-4478-863a-99cc000eb752"), Title = "Документ (прием на работу)", DateDocument = new DateTime(2023, 8, 05), Employee = "Иванов Иван Иванович", IsAgreed = false },
|
||||
new Request() { Uuid= Guid.Parse("77a9aed1-218a-468e-92b9-99f6a6a34543"), Title = "Документ (увольнение)", DateDocument = new DateTime(2023, 8, 05), Employee = "Петров Петр Петрович", IsAgreed = true },
|
||||
};
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
builder.Services.AddSwaggerGen();
|
||||
|
||||
var app = builder.Build();
|
||||
|
||||
if (app.Environment.IsDevelopment())
|
||||
{
|
||||
app.UseSwagger();
|
||||
app.UseSwaggerUI();
|
||||
}
|
||||
|
||||
app.UseHttpsRedirection();
|
||||
|
||||
app.MapGet("/", () =>
|
||||
{
|
||||
return requests.Select(r => new RequestEntityDto()
|
||||
{
|
||||
Uuid = r.Uuid,
|
||||
Title = r.Title,
|
||||
DateDocument = r.DateDocument,
|
||||
Employee = r.Employee,
|
||||
IsAgreed = r.IsAgreed,
|
||||
});
|
||||
})
|
||||
.WithName("GetRequests")
|
||||
.WithOpenApi();
|
||||
|
||||
app.MapGet("/{uuid}", (Guid uuid) =>
|
||||
{
|
||||
var request = requests.FirstOrDefault(r => r.Uuid == uuid);
|
||||
if (request == null)
|
||||
return Results.NotFound();
|
||||
return Results.Json(new RequestEntityDto()
|
||||
{
|
||||
Uuid = request.Uuid,
|
||||
Title = request.Title,
|
||||
DateDocument = request.DateDocument,
|
||||
Employee = request.Employee,
|
||||
IsAgreed = request.IsAgreed,
|
||||
});
|
||||
})
|
||||
.WithName("GetRequestByGUID")
|
||||
.WithOpenApi();
|
||||
|
||||
app.MapPost("/{title}/{Employee}/{DateDocument}/{IsAgreed}", (string title, string Employee, DateTime DateDocument, bool IsAgreed) =>
|
||||
{
|
||||
Guid NewGuid = Guid.NewGuid();
|
||||
requests.Add(new Request() { Uuid = NewGuid, Title = (string)title, Employee = (string)Employee, DateDocument = (DateTime)DateDocument, IsAgreed = (bool)IsAgreed});
|
||||
|
||||
var request = requests.FirstOrDefault(r => r.Uuid == NewGuid);
|
||||
if (request == null)
|
||||
return Results.NotFound();
|
||||
return Results.Json(new RequestEntityDto()
|
||||
{
|
||||
Uuid = request.Uuid,
|
||||
Title = request.Title,
|
||||
DateDocument = request.DateDocument,
|
||||
Employee = request.Employee,
|
||||
IsAgreed = request.IsAgreed,
|
||||
});
|
||||
})
|
||||
.WithName("PostRequest")
|
||||
.WithOpenApi();
|
||||
|
||||
app.MapPatch("/{uuid}/{title}/{Employee}/{DateDocument}/{IsAgreed}", (Guid uuid, string? title, string? Employee, DateTime DateDocument, bool IsAgreed) =>
|
||||
{
|
||||
var request = requests.FirstOrDefault(r => r.Uuid == uuid);
|
||||
if (request == null)
|
||||
return Results.NotFound();
|
||||
if (title != null) request.Title = title;
|
||||
if (Employee != ",") request.Employee = Employee;
|
||||
if (DateDocument != request.DateDocument) request.DateDocument = DateDocument;
|
||||
if (IsAgreed != request.IsAgreed) request.IsAgreed = IsAgreed;
|
||||
|
||||
return Results.Json(new RequestEntityDto()
|
||||
{
|
||||
Uuid = request.Uuid,
|
||||
Title = request.Title,
|
||||
DateDocument = request.DateDocument,
|
||||
Employee = request.Employee,
|
||||
IsAgreed = request.IsAgreed,
|
||||
});
|
||||
})
|
||||
.WithName("UpdateRequest")
|
||||
.WithOpenApi();
|
||||
|
||||
app.MapDelete("/{uuid}", (Guid uuid) =>
|
||||
{
|
||||
var request = requests.FirstOrDefault(r => r.Uuid == uuid);
|
||||
if (request == null)
|
||||
return Results.NotFound();
|
||||
requests.Remove(request);
|
||||
return Results.Json(new RequestEntityDto()
|
||||
{
|
||||
Uuid = request.Uuid,
|
||||
Title = request.Title,
|
||||
DateDocument = request.DateDocument,
|
||||
Employee = request.Employee,
|
||||
IsAgreed = request.IsAgreed,
|
||||
});
|
||||
})
|
||||
.WithName("DeleteRequestByGUID")
|
||||
.WithOpenApi();
|
||||
|
||||
app.Run();
|
||||
|
||||
public class Request
|
||||
{
|
||||
public Guid Uuid { get; set; }
|
||||
public string Title { get; set; } = string.Empty;
|
||||
public string Employee { get; set; } = string.Empty;
|
||||
public DateTime DateDocument { get; set; }
|
||||
public bool IsAgreed { get; set; }
|
||||
}
|
||||
|
||||
public class RequestEntityDto : Request { }
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
"$schema": "http://json.schemastore.org/launchsettings.json",
|
||||
"iisSettings": {
|
||||
"windowsAuthentication": false,
|
||||
"anonymousAuthentication": true,
|
||||
"iisExpress": {
|
||||
"applicationUrl": "http://localhost:26412",
|
||||
"sslPort": 44362
|
||||
}
|
||||
},
|
||||
"profiles": {
|
||||
"http": {
|
||||
"commandName": "Project",
|
||||
"dotnetRunMessages": true,
|
||||
"launchBrowser": true,
|
||||
"applicationUrl": "http://localhost:5068",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
},
|
||||
"https": {
|
||||
"commandName": "Project",
|
||||
"dotnetRunMessages": true,
|
||||
"launchBrowser": true,
|
||||
"applicationUrl": "https://localhost:7253;http://localhost:5068",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
},
|
||||
"IIS Express": {
|
||||
"commandName": "IISExpress",
|
||||
"launchBrowser": true,
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
||||
9
tasks/zinoveva-ad/lab_3/worker-1/appsettings.json
Normal file
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*"
|
||||
}
|
||||
15
tasks/zinoveva-ad/lab_3/worker-1/worker-1.csproj
Normal file
@@ -0,0 +1,15 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<RootNamespace>worker_1</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
22
tasks/zinoveva-ad/lab_3/worker-1/worker-1.sln
Normal file
@@ -0,0 +1,22 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.0.31903.59
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "worker-1", "worker-1.csproj", "{A28AE5F5-3B71-480C-A9A2-899D2286584A}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{A28AE5F5-3B71-480C-A9A2-899D2286584A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{A28AE5F5-3B71-480C-A9A2-899D2286584A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{A28AE5F5-3B71-480C-A9A2-899D2286584A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{A28AE5F5-3B71-480C-A9A2-899D2286584A}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
11
tasks/zinoveva-ad/lab_3/worker-2/Dockerfile
Normal file
@@ -0,0 +1,11 @@
|
||||
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
|
||||
WORKDIR /app
|
||||
|
||||
COPY . ./
|
||||
RUN dotnet restore
|
||||
RUN dotnet publish -c Release -o out
|
||||
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:8.0
|
||||
WORKDIR /app
|
||||
COPY --from=build-env /app/out .
|
||||
ENTRYPOINT ["dotnet", "worker-2.dll"]
|
||||
132
tasks/zinoveva-ad/lab_3/worker-2/Program.cs
Normal file
@@ -0,0 +1,132 @@
|
||||
|
||||
List<Agreement> agrs = new()
|
||||
{
|
||||
new Agreement() { Uuid= Guid.NewGuid(), Number = "242697-03К", IdRequest = Guid.Parse("7777fa5f-b786-4478-863a-99cc000eb752") }
|
||||
};
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
builder.Services.AddSwaggerGen();
|
||||
|
||||
var app = builder.Build();
|
||||
|
||||
if (app.Environment.IsDevelopment())
|
||||
{
|
||||
app.UseSwagger();
|
||||
app.UseSwaggerUI();
|
||||
}
|
||||
|
||||
app.UseHttpsRedirection();
|
||||
|
||||
app.MapGet("/", () =>
|
||||
{
|
||||
return agrs.Select(r => new AgreementEntityDto()
|
||||
{
|
||||
Uuid = r.Uuid,
|
||||
Number = r.Number,
|
||||
IdRequest = r.IdRequest,
|
||||
});
|
||||
})
|
||||
.WithName("GetAgreements")
|
||||
.WithOpenApi();
|
||||
|
||||
app.MapGet("/{uuid}", (Guid uuid) =>
|
||||
{
|
||||
var agr = agrs.FirstOrDefault(r => r.Uuid == uuid);
|
||||
if (agr == null)
|
||||
return Results.NotFound();
|
||||
return Results.Json(new AgreementEntityDto()
|
||||
{
|
||||
Uuid = agr.Uuid,
|
||||
Number = agr.Number,
|
||||
IdRequest = agr.IdRequest,
|
||||
});
|
||||
})
|
||||
.WithName("GetAgreementByGUID")
|
||||
.WithOpenApi();
|
||||
|
||||
app.MapPost("/{number}/{idRequest}", (string? number, Guid idRequest) =>
|
||||
{
|
||||
Guid NewGuid = Guid.NewGuid();
|
||||
agrs.Add(new Agreement() { Uuid = NewGuid, Number = (string)number, IdRequest = (Guid)idRequest });
|
||||
|
||||
var agr = agrs.FirstOrDefault(r => r.Uuid == NewGuid);
|
||||
if (agr == null)
|
||||
return Results.NotFound();
|
||||
return Results.Json(new AgreementEntityDto()
|
||||
{
|
||||
Uuid = agr.Uuid,
|
||||
Number = agr.Number,
|
||||
IdRequest = agr.IdRequest,
|
||||
});
|
||||
})
|
||||
.WithName("PostAgreement")
|
||||
.WithOpenApi();
|
||||
|
||||
app.MapPatch("/{uuid}/{number}/{idRequest}", (Guid uuid, string ?number, Guid idRequest) =>
|
||||
{
|
||||
var agr = agrs.FirstOrDefault(r => r.Uuid == uuid);
|
||||
if (agr == null)
|
||||
return Results.NotFound();
|
||||
if (number != ",") agr.Number = number;
|
||||
if (idRequest != agr.IdRequest) agr.IdRequest = idRequest;
|
||||
|
||||
return Results.Json(new AgreementEntityDto()
|
||||
{
|
||||
Uuid = agr.Uuid,
|
||||
Number = agr.Number,
|
||||
IdRequest = agr.IdRequest,
|
||||
});
|
||||
})
|
||||
.WithName("UpdateAgreement")
|
||||
.WithOpenApi();
|
||||
|
||||
app.MapDelete("/{uuid}", (Guid uuid) =>
|
||||
{
|
||||
var agr = agrs.FirstOrDefault(r => r.Uuid == uuid);
|
||||
if (agr == null)
|
||||
return Results.NotFound();
|
||||
agrs.Remove(agr);
|
||||
return Results.Json(new AgreementEntityDto()
|
||||
{
|
||||
Uuid = agr.Uuid,
|
||||
Number = agr.Number,
|
||||
IdRequest = agr.IdRequest,
|
||||
});
|
||||
})
|
||||
.WithName("DeleteAgreement")
|
||||
.WithOpenApi();
|
||||
|
||||
app.MapGet("/Requests/", async () =>
|
||||
{
|
||||
var httpClient = new HttpClient();
|
||||
var secondWorkerResponse = await httpClient.GetStringAsync("http://worker-1:8080/");
|
||||
|
||||
return secondWorkerResponse.ToArray();
|
||||
})
|
||||
.WithName("GetRequests")
|
||||
.WithOpenApi();
|
||||
|
||||
app.Run();
|
||||
|
||||
public class Agreement
|
||||
{
|
||||
public Guid Uuid { get; set; }
|
||||
public string Number { get; set; } = string.Empty;
|
||||
public Guid IdRequest { get; set; }
|
||||
|
||||
}
|
||||
|
||||
public class AgreementEntityDto : Agreement { }
|
||||
|
||||
public class Request
|
||||
{
|
||||
public Guid Uuid { get; set; }
|
||||
public string Title { get; set; } = string.Empty;
|
||||
public string Employee { get; set; } = string.Empty;
|
||||
public DateTime DateDocument { get; set; }
|
||||
public bool IsAgreed { get; set; }
|
||||
}
|
||||
|
||||
public class RequestEntityDto : Request { }
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
"$schema": "http://json.schemastore.org/launchsettings.json",
|
||||
"iisSettings": {
|
||||
"windowsAuthentication": false,
|
||||
"anonymousAuthentication": true,
|
||||
"iisExpress": {
|
||||
"applicationUrl": "http://localhost:26693",
|
||||
"sslPort": 44348
|
||||
}
|
||||
},
|
||||
"profiles": {
|
||||
"http": {
|
||||
"commandName": "Project",
|
||||
"dotnetRunMessages": true,
|
||||
"launchBrowser": true,
|
||||
"applicationUrl": "http://localhost:5011",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
},
|
||||
"https": {
|
||||
"commandName": "Project",
|
||||
"dotnetRunMessages": true,
|
||||
"launchBrowser": true,
|
||||
"applicationUrl": "https://localhost:7162;http://localhost:5011",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
},
|
||||
"IIS Express": {
|
||||
"commandName": "IISExpress",
|
||||
"launchBrowser": true,
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
||||
9
tasks/zinoveva-ad/lab_3/worker-2/appsettings.json
Normal file
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*"
|
||||
}
|
||||
15
tasks/zinoveva-ad/lab_3/worker-2/worker-2.csproj
Normal file
@@ -0,0 +1,15 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<RootNamespace>worker_2</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
22
tasks/zinoveva-ad/lab_3/worker-2/worker-2.sln
Normal file
@@ -0,0 +1,22 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.0.31903.59
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "worker-2", "worker-2.csproj", "{F7FA965A-55AB-476E-9A6C-DFA7603EB733}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{F7FA965A-55AB-476E-9A6C-DFA7603EB733}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{F7FA965A-55AB-476E-9A6C-DFA7603EB733}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{F7FA965A-55AB-476E-9A6C-DFA7603EB733}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{F7FA965A-55AB-476E-9A6C-DFA7603EB733}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||