diff --git a/tasks/klementeva-ja/lab_2/.gitignore b/tasks/klementeva-ja/lab_2/.gitignore new file mode 100644 index 0000000..154e127 --- /dev/null +++ b/tasks/klementeva-ja/lab_2/.gitignore @@ -0,0 +1,477 @@ +## 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/main/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET +project.lock.json +project.fragment.lock.json +artifacts/ + +# Tye +.tye/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# 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 +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# 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 + +## +## Visual studio for Mac +## + + +# globs +Makefile.in +*.userprefs +*.usertasks +config.make +config.status +aclocal.m4 +install-sh +autom4te.cache/ +*.tar.gz +tarballs/ +test-results/ + +# Mac bundle stuff +*.dmg +*.app + +# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk diff --git a/tasks/klementeva-ja/lab_2/README.MD b/tasks/klementeva-ja/lab_2/README.MD new file mode 100644 index 0000000..a0b78d5 --- /dev/null +++ b/tasks/klementeva-ja/lab_2/README.MD @@ -0,0 +1,75 @@ +# Отчёт по лабораторной работе №2 + +Выполнил: студентка гр. ИСЭбд-41 Клементьева Жанна. + +Вариант программы 1: Ищет в каталоге `/var/data` файл с наибольшим количеством строк и перекладывает его в `/var/result/data.txt`. + +Вариант программы 2: Ищет наименьшее число из файла `/var/data/data.txt` и сохраняет количество таких чисел из последовательности в `/var/result/result.txt`. + +## Создание приложений + +Создадим 2 приложения. +Был выбран язык C# и технология .NET 6, потому что потому. + +Для создания обычных консольных приложений воспользуемся командами: + +```sh +dotnet new console -o worker-1 +dotnet new console -o worker-2 +``` + +Согласно варианту программа 1 ищет в каталоге `/var/data` файл с наибольшим количеством строк и перекладывает его в `/var/result/data.txt`. + +[Исходный текст программы worker-1](worker-1/Program.cs) + +Согласно варианту программа 2 ищет наименьшее число из файла `/var/data/data.txt` и сохраняет количество таких чисел из последовательности в `/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.yml), [программа 2](worker-1/Dockerfile.yml)) с подробным описанием процесса сборки. + +Был создан файл [docker-compose.yml](docker-compose.yml), в котором указан манифест для запуска распределённого приложения. + +Дополнительно был создан файл [.gitignore](.gitignore), чтобы исключить для сборки и коммита всё лишнее. + +## Сборка и запуск + +В каталог `./data` помещены 2 файла. +В первом файле были числа 1 2 3, во втором 1 1 7 5 3 1. + +Для запуска приложения необходимо ввести команду `docker compose up ---build`. + +Результат запуска после сборки: + +``` +[+] Running 2/0 + - Container lab_2-worker-1-1 Created + - Container lab_2-worker-2-1 Created +Attaching to lab_2-worker-1-1, lab_2-worker-2-1 +lab_2-worker-1-1 | Начало обработки файла /var/data/another data.txt +lab_2-worker-1-1 | Начало обработки файла /var/data/data.txt +lab_2-worker-1-1 exited with code 0 +lab_2-worker-2-1 | Чисел для обработки: 8 +lab_2-worker-2-1 exited with code 0 +``` + +В результате в каталоге `./result` создался файл `result.txt` с содержимым `3`, что соответствует входным данным. + +Изменение значений в файлах из каталога `./data` также изменяет содержимое в файлах из каталогов `./result-1` и `./result`. + +![resultat](resultat.png) \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_2/docker-compose.yml b/tasks/klementeva-ja/lab_2/docker-compose.yml new file mode 100644 index 0000000..ef6bc7d --- /dev/null +++ b/tasks/klementeva-ja/lab_2/docker-compose.yml @@ -0,0 +1,16 @@ +version: "3.1" +services: + worker-1: + build: ./worker-1 + volumes: + #монтируем локальную папку в запущенный образ контейнера + - ./data:/var/data + - ./result-1:/var/result + worker-2: + build: ./worker-2 + volumes: + - ./result-1:/var/data + - ./result:/var/result + #добавляется зависимость, так как по условию второе приложение зависит от первого + depends_on: + - worker-1 \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_2/resultat.png b/tasks/klementeva-ja/lab_2/resultat.png new file mode 100644 index 0000000..6a543c7 Binary files /dev/null and b/tasks/klementeva-ja/lab_2/resultat.png differ diff --git a/tasks/klementeva-ja/lab_2/rvip_j2.sln b/tasks/klementeva-ja/lab_2/rvip_j2.sln new file mode 100644 index 0000000..0ebb727 --- /dev/null +++ b/tasks/klementeva-ja/lab_2/rvip_j2.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.002.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "worker-1", "worker-1\worker-1.csproj", "{F6B29C3F-FC5C-4B48-A594-4B9316A21F56}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "worker-2", "worker-2\worker-2.csproj", "{B18DF6BB-6783-4F53-A5EE-140D07BF447C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F6B29C3F-FC5C-4B48-A594-4B9316A21F56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F6B29C3F-FC5C-4B48-A594-4B9316A21F56}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F6B29C3F-FC5C-4B48-A594-4B9316A21F56}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F6B29C3F-FC5C-4B48-A594-4B9316A21F56}.Release|Any CPU.Build.0 = Release|Any CPU + {B18DF6BB-6783-4F53-A5EE-140D07BF447C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B18DF6BB-6783-4F53-A5EE-140D07BF447C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B18DF6BB-6783-4F53-A5EE-140D07BF447C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B18DF6BB-6783-4F53-A5EE-140D07BF447C}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {D0BD68D2-E574-457E-B29C-4A1167DE76D6} + EndGlobalSection +EndGlobal diff --git a/tasks/klementeva-ja/lab_2/var/data/anotherData.txt b/tasks/klementeva-ja/lab_2/var/data/anotherData.txt new file mode 100644 index 0000000..5f5fbe7 --- /dev/null +++ b/tasks/klementeva-ja/lab_2/var/data/anotherData.txt @@ -0,0 +1,3 @@ +1 +2 +3 \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_2/var/data/data.txt b/tasks/klementeva-ja/lab_2/var/data/data.txt new file mode 100644 index 0000000..81ef1e5 --- /dev/null +++ b/tasks/klementeva-ja/lab_2/var/data/data.txt @@ -0,0 +1,6 @@ +1 +1 +7 +5 +3 +1 \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_2/var/result/data.txt b/tasks/klementeva-ja/lab_2/var/result/data.txt new file mode 100644 index 0000000..85954ea --- /dev/null +++ b/tasks/klementeva-ja/lab_2/var/result/data.txt @@ -0,0 +1,5 @@ +1 +2 +3 +4 +5 \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_2/var/result/result.txt b/tasks/klementeva-ja/lab_2/var/result/result.txt new file mode 100644 index 0000000..d89575e --- /dev/null +++ b/tasks/klementeva-ja/lab_2/var/result/result.txt @@ -0,0 +1 @@ +3147483647 \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_2/worker-1/Dockerfile b/tasks/klementeva-ja/lab_2/worker-1/Dockerfile new file mode 100644 index 0000000..c73f2c2 --- /dev/null +++ b/tasks/klementeva-ja/lab_2/worker-1/Dockerfile @@ -0,0 +1,15 @@ +#указываем образ из которого будем брать все слои +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env +#папка, с которой мы будем работать +WORKDIR /App +#копируем файл в рабочую дерикторию +COPY . ./ +#запускаем команду +RUN dotnet restore +RUN dotnet publish -c Release -o out + +FROM mcr.microsoft.com/dotnet/aspnet:6.0 +WORKDIR /App +#копирует не из файловой системы хоста, а из того, что собрали на прерыдущей стадии +COPY --from=build-env /App/out . +ENTRYPOINT ["dotnet", "worker-1.dll"] \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_2/worker-1/Program.cs b/tasks/klementeva-ja/lab_2/worker-1/Program.cs new file mode 100644 index 0000000..a3e4153 --- /dev/null +++ b/tasks/klementeva-ja/lab_2/worker-1/Program.cs @@ -0,0 +1,13 @@ +var files = Directory.GetFiles("/var/data"); +int maxCount = 0; +string lagrestFile = ""; +foreach(var file in files){ + var lines = File.ReadAllLines(file); + if(lines.Count() > maxCount){ + maxCount = lines.Count(); + lagrestFile = file; + } +} +if(File.Exists("/var/result/data.txt")) + File.Delete("/var/result/data.txt"); +File.Move(lagrestFile, "/var/result/data.txt"); \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_2/worker-1/worker-1.csproj b/tasks/klementeva-ja/lab_2/worker-1/worker-1.csproj new file mode 100644 index 0000000..3f5cb43 --- /dev/null +++ b/tasks/klementeva-ja/lab_2/worker-1/worker-1.csproj @@ -0,0 +1,11 @@ + + + + Exe + net6.0 + worker_1 + enable + enable + + + diff --git a/tasks/klementeva-ja/lab_2/worker-2/Dockerfile b/tasks/klementeva-ja/lab_2/worker-2/Dockerfile new file mode 100644 index 0000000..79dccce --- /dev/null +++ b/tasks/klementeva-ja/lab_2/worker-2/Dockerfile @@ -0,0 +1,15 @@ +#указываем образ из которого будем брать все слои +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env +#папка, с которой мы будем работать +WORKDIR /App +#копируем файл в рабочую дерикторию +COPY . ./ +#запускаем команду +RUN dotnet restore +RUN dotnet publish -c Release -o out + +FROM mcr.microsoft.com/dotnet/aspnet:6.0 +WORKDIR /App +#копирует не из файловой системы хоста, а из того, что собрали на прерыдущей стадии +COPY --from=build-env /App/out . +ENTRYPOINT ["dotnet", "worker-2.dll"] \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_2/worker-2/Program.cs b/tasks/klementeva-ja/lab_2/worker-2/Program.cs new file mode 100644 index 0000000..2d10218 --- /dev/null +++ b/tasks/klementeva-ja/lab_2/worker-2/Program.cs @@ -0,0 +1,23 @@ +using System.Text; + +int[] numbers = File.ReadAllLines("/var/data/data.txt").Select(x=> int.Parse(x)).ToArray(); +int minNumber = int.MaxValue; +int minNumberCount = 0; +foreach(var number in numbers){ + if(number > minNumber){ + continue; + } + if(number == minNumber){ + minNumberCount++; + continue; + } + if(number < minNumber){ + minNumber = number; + minNumberCount = 1; + } +} +using(FileStream fstream = new FileStream("/var/result/result.txt", FileMode.OpenOrCreate)){ + byte[] buffer = Encoding.Default.GetBytes(minNumberCount.ToString()); + await fstream.WriteAsync(buffer, 0, buffer.Length); +} +Console.WriteLine(minNumberCount); \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_2/worker-2/worker-2.csproj b/tasks/klementeva-ja/lab_2/worker-2/worker-2.csproj new file mode 100644 index 0000000..960073b --- /dev/null +++ b/tasks/klementeva-ja/lab_2/worker-2/worker-2.csproj @@ -0,0 +1,11 @@ + + + + Exe + net6.0 + worker_2 + enable + enable + + + diff --git a/tasks/klementeva-ja/lab_3/.gitignore b/tasks/klementeva-ja/lab_3/.gitignore new file mode 100644 index 0000000..71ec0d1 --- /dev/null +++ b/tasks/klementeva-ja/lab_3/.gitignore @@ -0,0 +1,226 @@ +# The following command works for downloading when using Git for Windows: +# curl -LOf http://gist.githubusercontent.com/kmorcinek/2710267/raw/.gitignore +# +# Download this file using PowerShell v3 under Windows with the following comand: +# Invoke-WebRequest https://gist.githubusercontent.com/kmorcinek/2710267/raw/ -OutFile .gitignore +# +# or wget: +# wget --no-check-certificate http://gist.githubusercontent.com/kmorcinek/2710267/raw/.gitignore + +# User-specific files +*.suo +*.user +*.sln.docstates + +# Build results +[Dd]ebug/ +[Rr]elease/ +x64/ +[Bb]in/ +[Oo]bj/ +# build folder is nowadays used for build scripts and should not be ignored +#build/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.scc + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +*.ncrunch* +.*crunch*.local.xml + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.Publish.xml + +# Windows Azure Build Output +csx +*.build.csdef + +# Windows Store app package directory +AppPackages/ + +# Others +*.Cache +ClientBin/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.[Pp]ublish.xml +*.pfx +*.publishsettings +modulesbin/ +tempbin/ + +# EPiServer Site file (VPP) +AppData/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# vim +*.txt~ +*.swp +*.swo + +# Temp files when opening LibreOffice on ubuntu +.~lock.* + +# svn +.svn + +# CVS - Source Control +**/CVS/ + +# Remainings from resolving conflicts in Source Control +*.orig + +# SQL Server files +**/App_Data/*.mdf +**/App_Data/*.ldf +**/App_Data/*.sdf + + +#LightSwitch generated files +GeneratedArtifacts/ +_Pvt_Extensions/ +ModelManifest.xml + +# ========================= +# Windows detritus +# ========================= + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# OS generated files # +Icon? + +# Mac desktop service store files +.DS_Store + +# SASS Compiler cache +.sass-cache + +# Visual Studio 2014 CTP +**/*.sln.ide + +# Visual Studio temp something +.vs/ + +# dotnet stuff +project.lock.json + +# VS 2015+ +*.vc.vc.opendb +*.vc.db + +# Rider +.idea/ + +# Visual Studio Code +.vscode/ + +# Output folder used by Webpack or other FE stuff +**/node_modules/* +**/wwwroot/* + +# SpecFlow specific +*.feature.cs +*.feature.xlsx.* +*.Specs_*.html + +# UWP Projects +AppPackages/ + +##### +# End of core ignore list, below put you custom 'per project' settings (patterns or path) +##### \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_3/README.md b/tasks/klementeva-ja/lab_3/README.md new file mode 100644 index 0000000..36c2f90 --- /dev/null +++ b/tasks/klementeva-ja/lab_3/README.md @@ -0,0 +1,76 @@ +# Отчет по лабораторной работе №3 REST API, Gateway и синхронный обмен между микросервисами +Выполнила студентка гр. ИСЭбд-41 Клементьева Ж.А. + +## Создание микросервисов +Создание микросервисов было реализовано следующим образом: + +1. С помощью команды `dotnet new web -n worker-2` в терминале создала первый микросервис, где решение добавила командой `dotnet new sln`. +2. Также использовала данную команду: `dotnet sln worker-2.sln add worker-2.csproj` с целью связки решения и проекта. +3. Аналогичные действия были совершены со вторым микросервисом. +4. Были добавлены библиотеки Swagger и OpenAi в проекты. +5. Также проект был запущен с помощью команды `dotnet run`. + +Скриншоты микросервисов worker 1 и worker 2: +![](pic/1.png) +![](pic/2.png) + +Путь localhost:8080: + +![](pic/3.png) + + +![](pic/4.png) + +## Синхронный обмен +Также мною был реализован код, вызывающий сихронно данные из соседнего микросервиса. +```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` были получены такие результаты: + +Результат worker1: +![](pic/5.png) +Результат worker2: +![](pic/6.png) \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_3/docker-compose.yml b/tasks/klementeva-ja/lab_3/docker-compose.yml new file mode 100644 index 0000000..e9ca4b9 --- /dev/null +++ b/tasks/klementeva-ja/lab_3/docker-compose.yml @@ -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 \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_3/nginx.conf b/tasks/klementeva-ja/lab_3/nginx.conf new file mode 100644 index 0000000..f649a4a --- /dev/null +++ b/tasks/klementeva-ja/lab_3/nginx.conf @@ -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; + } +} \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_3/pic/1.png b/tasks/klementeva-ja/lab_3/pic/1.png new file mode 100644 index 0000000..69077f2 Binary files /dev/null and b/tasks/klementeva-ja/lab_3/pic/1.png differ diff --git a/tasks/klementeva-ja/lab_3/pic/2.png b/tasks/klementeva-ja/lab_3/pic/2.png new file mode 100644 index 0000000..2bd8760 Binary files /dev/null and b/tasks/klementeva-ja/lab_3/pic/2.png differ diff --git a/tasks/klementeva-ja/lab_3/pic/3.png b/tasks/klementeva-ja/lab_3/pic/3.png new file mode 100644 index 0000000..4548fd8 Binary files /dev/null and b/tasks/klementeva-ja/lab_3/pic/3.png differ diff --git a/tasks/klementeva-ja/lab_3/pic/4.png b/tasks/klementeva-ja/lab_3/pic/4.png new file mode 100644 index 0000000..2b04e09 Binary files /dev/null and b/tasks/klementeva-ja/lab_3/pic/4.png differ diff --git a/tasks/klementeva-ja/lab_3/pic/5.png b/tasks/klementeva-ja/lab_3/pic/5.png new file mode 100644 index 0000000..0969a27 Binary files /dev/null and b/tasks/klementeva-ja/lab_3/pic/5.png differ diff --git a/tasks/klementeva-ja/lab_3/pic/6.png b/tasks/klementeva-ja/lab_3/pic/6.png new file mode 100644 index 0000000..06a68db Binary files /dev/null and b/tasks/klementeva-ja/lab_3/pic/6.png differ diff --git a/tasks/klementeva-ja/lab_3/static/index.html b/tasks/klementeva-ja/lab_3/static/index.html new file mode 100644 index 0000000..9e75aa0 --- /dev/null +++ b/tasks/klementeva-ja/lab_3/static/index.html @@ -0,0 +1,13 @@ + + + + + + Тестовое приложение по лабораторной работе №3 + + +

Клементьева Ж.А. ИСЭбд-41.

+

Запрос к worker-1

+

Запрос к worker-2

+ + \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_3/worker-1/Dockerfile b/tasks/klementeva-ja/lab_3/worker-1/Dockerfile new file mode 100644 index 0000000..7a8ce23 --- /dev/null +++ b/tasks/klementeva-ja/lab_3/worker-1/Dockerfile @@ -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"] \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_3/worker-1/Program.cs b/tasks/klementeva-ja/lab_3/worker-1/Program.cs new file mode 100644 index 0000000..60c42a4 --- /dev/null +++ b/tasks/klementeva-ja/lab_3/worker-1/Program.cs @@ -0,0 +1,124 @@ +List requests = new() +{ + new Request() { Uuid= Guid.Parse("7184fa5f-b786-4478-863a-99cc000eb752"), Title = "Расход на внедрение системы менеджмента качества", SourceOfFunds = "Шуреков", Sum = 100000, IsCompleted = false }, + new Request() { Uuid= Guid.Parse("55a9aed1-218a-468e-92b9-99f6a6a34543"), Title = "Расход на сопровождение проекта", SourceOfFunds = "Клементьев", Sum = 25000, IsCompleted = 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, + Sum = r.Sum, + SourceOfFunds = r.SourceOfFunds, + IsCompleted = r.IsCompleted, + }); +}) +.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, + Sum = request.Sum, + SourceOfFunds = request.SourceOfFunds, + IsCompleted = request.IsCompleted, + }); +}) +.WithName("GetRequestByGUID") +.WithOpenApi(); + +app.MapPost("/{title}/{sourceOfFunds}/{sum}/{isCompleted}", (string title, string sourceOfFunds, decimal sum, bool isCompleted) => +{ + Guid NewGuid = Guid.NewGuid(); + requests.Add(new Request() { Uuid = NewGuid, Title = (string)title, SourceOfFunds = (string)sourceOfFunds, Sum = (decimal)sum, IsCompleted = (bool)isCompleted}); + + 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, + Sum = request.Sum, + SourceOfFunds = request.SourceOfFunds, + IsCompleted = request.IsCompleted, + }); +}) +.WithName("PostRequest") +.WithOpenApi(); + +app.MapPatch("/{uuid}/{title}/{sourceOfFunds}/{sum}/{isCompleted}", (Guid uuid, string ?title, string ?sourceOfFunds, decimal sum, bool isCompleted) => +{ + var request = requests.FirstOrDefault(r => r.Uuid == uuid); + if (request == null) + return Results.NotFound(); + if (title != null) request.Title = title; + if (sourceOfFunds != ",") request.SourceOfFunds = sourceOfFunds; + if (sum != request.Sum && sum != 0) request.Sum = sum; + if (isCompleted != request.IsCompleted) request.IsCompleted = isCompleted; + + return Results.Json(new RequestEntityDto() + { + Uuid = request.Uuid, + Title = request.Title, + Sum = request.Sum, + SourceOfFunds = request.SourceOfFunds, + IsCompleted = request.IsCompleted, + }); +}) +.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, + Sum = request.Sum, + SourceOfFunds = request.SourceOfFunds, + IsCompleted = request.IsCompleted, + }); +}) +.WithName("DeleteRequestByGUID") +.WithOpenApi(); + +app.Run(); + +public class Request +{ + public Guid Uuid { get; set; } + public string Title { get; set; } = string.Empty; + public string SourceOfFunds { get; set; } = string.Empty; + public decimal Sum { get; set; } = 0; + public bool IsCompleted { get; set; } +} + +public class RequestEntityDto : Request { } \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_3/worker-1/Properties/launchSettings.json b/tasks/klementeva-ja/lab_3/worker-1/Properties/launchSettings.json new file mode 100644 index 0000000..bab6706 --- /dev/null +++ b/tasks/klementeva-ja/lab_3/worker-1/Properties/launchSettings.json @@ -0,0 +1,38 @@ +{ + "$schema": "http://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:51956", + "sslPort": 44303 + } + }, + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:5197", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:7027;http://localhost:5197", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/tasks/klementeva-ja/lab_3/worker-1/appsettings.Development.json b/tasks/klementeva-ja/lab_3/worker-1/appsettings.Development.json new file mode 100644 index 0000000..3b823ef --- /dev/null +++ b/tasks/klementeva-ja/lab_3/worker-1/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/tasks/klementeva-ja/lab_3/worker-1/appsettings.json b/tasks/klementeva-ja/lab_3/worker-1/appsettings.json new file mode 100644 index 0000000..10f68b8 --- /dev/null +++ b/tasks/klementeva-ja/lab_3/worker-1/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/tasks/klementeva-ja/lab_3/worker-1/worker-1.csproj b/tasks/klementeva-ja/lab_3/worker-1/worker-1.csproj new file mode 100644 index 0000000..795c30e --- /dev/null +++ b/tasks/klementeva-ja/lab_3/worker-1/worker-1.csproj @@ -0,0 +1,15 @@ + + + + net8.0 + enable + enable + worker_1 + + + + + + + + diff --git a/tasks/klementeva-ja/lab_3/worker-1/worker-1.sln b/tasks/klementeva-ja/lab_3/worker-1/worker-1.sln new file mode 100644 index 0000000..fc4131f --- /dev/null +++ b/tasks/klementeva-ja/lab_3/worker-1/worker-1.sln @@ -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", "{90F6C7BD-78E2-47C8-A702-DD47E74D3865}" +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 + {90F6C7BD-78E2-47C8-A702-DD47E74D3865}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {90F6C7BD-78E2-47C8-A702-DD47E74D3865}.Debug|Any CPU.Build.0 = Debug|Any CPU + {90F6C7BD-78E2-47C8-A702-DD47E74D3865}.Release|Any CPU.ActiveCfg = Release|Any CPU + {90F6C7BD-78E2-47C8-A702-DD47E74D3865}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/tasks/klementeva-ja/lab_3/worker-2/Dockerfile b/tasks/klementeva-ja/lab_3/worker-2/Dockerfile new file mode 100644 index 0000000..7f6b963 --- /dev/null +++ b/tasks/klementeva-ja/lab_3/worker-2/Dockerfile @@ -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"] \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_3/worker-2/Program.cs b/tasks/klementeva-ja/lab_3/worker-2/Program.cs new file mode 100644 index 0000000..a432b93 --- /dev/null +++ b/tasks/klementeva-ja/lab_3/worker-2/Program.cs @@ -0,0 +1,145 @@ + +List agrs = new() +{ + new Agreement() { Uuid= Guid.NewGuid(), Number = "ISO-13485", Date = new DateOnly(), Sum = 50000, IdRequest = Guid.Parse("7184fa5f-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, + Sum = r.Sum, + Date = r.Date, + 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, + Sum = agr.Sum, + Date = agr.Date, + IdRequest = agr.IdRequest, + }); +}) +.WithName("GetAgreementByGUID") +.WithOpenApi(); + +app.MapPost("/{number}/{date}/{sum}/{idRequest}", (string? number, DateOnly date, decimal sum, Guid idRequest) => +{ + Guid NewGuid = Guid.NewGuid(); + agrs.Add(new Agreement() { Uuid = NewGuid, Number = (string)number, Date = (DateOnly)date, Sum = (decimal)sum, 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, + Sum = agr.Sum, + Date = agr.Date, + IdRequest = agr.IdRequest, + }); +}) +.WithName("PostAgreement") +.WithOpenApi(); + +app.MapPatch("/{uuid}/{number}/{date}/{sum}/{idRequest}", (Guid uuid, string ?number, DateOnly date, decimal sum, Guid idRequest) => +{ + var agr = agrs.FirstOrDefault(r => r.Uuid == uuid); + if (agr == null) + return Results.NotFound(); + if (number != ",") agr.Number = number; + if (date != null)agr.Date = date; + if (sum != agr.Sum && sum != 0) agr.Sum = sum; + if (idRequest != agr.IdRequest) agr.IdRequest = idRequest; + + return Results.Json(new AgreementEntityDto() + { + Uuid = agr.Uuid, + Number = agr.Number, + Sum = agr.Sum, + Date = agr.Date, + 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, + Sum = agr.Sum, + Date = agr.Date, + 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 DateOnly Date { get; set; } + public Guid IdRequest { get; set; } + public decimal Sum { get; set; } = 0; +} + +public class AgreementEntityDto : Agreement { } + +public class Request +{ + public Guid Uuid { get; set; } + public string Title { get; set; } = string.Empty; + public string SourceOfFunds { get; set; } = string.Empty; + public decimal Sum { get; set; } = 0; + public bool IsCompleted { get; set; } +} + +public class RequestEntityDto : Request { } \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_3/worker-2/Properties/launchSettings.json b/tasks/klementeva-ja/lab_3/worker-2/Properties/launchSettings.json new file mode 100644 index 0000000..c0a3346 --- /dev/null +++ b/tasks/klementeva-ja/lab_3/worker-2/Properties/launchSettings.json @@ -0,0 +1,38 @@ +{ + "$schema": "http://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:36404", + "sslPort": 44384 + } + }, + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:5101", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:7125;http://localhost:5101", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/tasks/klementeva-ja/lab_3/worker-2/appsettings.Development.json b/tasks/klementeva-ja/lab_3/worker-2/appsettings.Development.json new file mode 100644 index 0000000..0c208ae --- /dev/null +++ b/tasks/klementeva-ja/lab_3/worker-2/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/tasks/klementeva-ja/lab_3/worker-2/appsettings.json b/tasks/klementeva-ja/lab_3/worker-2/appsettings.json new file mode 100644 index 0000000..b41ccef --- /dev/null +++ b/tasks/klementeva-ja/lab_3/worker-2/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/tasks/klementeva-ja/lab_3/worker-2/worker-2.csproj b/tasks/klementeva-ja/lab_3/worker-2/worker-2.csproj new file mode 100644 index 0000000..9e8d22f --- /dev/null +++ b/tasks/klementeva-ja/lab_3/worker-2/worker-2.csproj @@ -0,0 +1,15 @@ + + + + net8.0 + enable + enable + worker_2 + + + + + + + + diff --git a/tasks/klementeva-ja/lab_3/worker-2/worker-2.sln b/tasks/klementeva-ja/lab_3/worker-2/worker-2.sln new file mode 100644 index 0000000..8f8c96d --- /dev/null +++ b/tasks/klementeva-ja/lab_3/worker-2/worker-2.sln @@ -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", "{C9D63524-2C63-4E86-91B6-D86955CFA5F8}" +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 + {C9D63524-2C63-4E86-91B6-D86955CFA5F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C9D63524-2C63-4E86-91B6-D86955CFA5F8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C9D63524-2C63-4E86-91B6-D86955CFA5F8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C9D63524-2C63-4E86-91B6-D86955CFA5F8}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/tasks/klementeva-ja/lab_4/README.md b/tasks/klementeva-ja/lab_4/README.md new file mode 100644 index 0000000..aab433f --- /dev/null +++ b/tasks/klementeva-ja/lab_4/README.md @@ -0,0 +1,112 @@ +# Отчет по лабораторной работе №4 +Выполнила студентка группы ИСЭбд-41 Клементьева Жанна Андреевна + + +Порядок действий: +1. Установила rabbitMQ server, erlang +2. Зашла в брокер под гостем по http://localhost:15672/#/ + +Урок №1: + +![](pic/1.png) +![](pic/2.png) + +Урок №2: + +![](pic/2t1.png) + +Урок №3: + +![](pic/task.png) + +## Разработка демонстрационных приложений +Так как необходимо было выбрать предметную область, мой выбор остановился на: +Договора на платное внедрение системы менеджмента качества на предприятиях. + + +Далее было разработано три приложения: + +1. Publisher + +```py +import pika +import time +import random + +collection = ["Application for the implementation of a quality management system", "The contract is completed", "Enrollment order completed", "System implemented"] + +connection = pika.BlockingConnection(pika.ConnectionParameters('localhost')) +channel = connection.channel() + +channel.exchange_declare(exchange='Agreements', exchange_type='fanout') + +while True: + message = f"Message: {random.choice(collection)}" + + channel.basic_publish(exchange='Agreements', routing_key='', body=message) + + time.sleep(1) + +connection.close() +``` + +2. Consumer 1. + +```py +import pika +import time + +def process_message(ch, method, properties, body): + print(f"Получено сообщение: {body}") + time.sleep(3) + print("Сообщение успешно обработано") + +connection = pika.BlockingConnection(pika.ConnectionParameters('localhost')) +channel = connection.channel() + +result = channel.queue_declare(queue='', exclusive=True) +queue_name = result.method.queue + +channel.queue_bind(exchange='Agreements', queue=queue_name) + +channel.basic_consume(queue=queue_name, on_message_callback=process_message, auto_ack=True) + +print('Ожидание сообщений...') +channel.start_consuming() +``` + +3. Consumer 2. + +```py +import pika + + +def process_message(ch, method, properties, body): + print(f"Получено сообщение: {body}") + print("Сообщение успешно обработано") + +connection = pika.BlockingConnection(pika.ConnectionParameters('localhost')) +channel = connection.channel() + +result = channel.queue_declare(queue='', exclusive=True) +queue_name = result.method.queue + +channel.queue_bind(exchange='Agreements', queue=queue_name) + +channel.basic_consume(queue=queue_name, on_message_callback=process_message, auto_ack=True) + +print('Ожидание сообщений...') +channel.start_consuming() +``` + +## Результаты выполнения лабораторной работы +Результат Consumer_1: + +![](pic/4.png) + +Результат Consumer_2: + +![](pic/5.png) +![](pic/klementeva_consumer2.png) + +Вывод: таким образом, Consumer_1 нагружает больше, чем Consumer_2. Также он принимает сообщения гораздо медленнее. diff --git a/tasks/klementeva-ja/lab_4/pic/1.png b/tasks/klementeva-ja/lab_4/pic/1.png new file mode 100644 index 0000000..7c1f016 Binary files /dev/null and b/tasks/klementeva-ja/lab_4/pic/1.png differ diff --git a/tasks/klementeva-ja/lab_4/pic/2.png b/tasks/klementeva-ja/lab_4/pic/2.png new file mode 100644 index 0000000..7e31452 Binary files /dev/null and b/tasks/klementeva-ja/lab_4/pic/2.png differ diff --git a/tasks/klementeva-ja/lab_4/pic/2t1.png b/tasks/klementeva-ja/lab_4/pic/2t1.png new file mode 100644 index 0000000..14d100a Binary files /dev/null and b/tasks/klementeva-ja/lab_4/pic/2t1.png differ diff --git a/tasks/klementeva-ja/lab_4/pic/4.png b/tasks/klementeva-ja/lab_4/pic/4.png new file mode 100644 index 0000000..f0edcf6 Binary files /dev/null and b/tasks/klementeva-ja/lab_4/pic/4.png differ diff --git a/tasks/klementeva-ja/lab_4/pic/5.png b/tasks/klementeva-ja/lab_4/pic/5.png new file mode 100644 index 0000000..7e31452 Binary files /dev/null and b/tasks/klementeva-ja/lab_4/pic/5.png differ diff --git a/tasks/klementeva-ja/lab_4/pic/klementeva_consumer2.png b/tasks/klementeva-ja/lab_4/pic/klementeva_consumer2.png new file mode 100644 index 0000000..ce94de5 Binary files /dev/null and b/tasks/klementeva-ja/lab_4/pic/klementeva_consumer2.png differ diff --git a/tasks/klementeva-ja/lab_4/pic/task.png b/tasks/klementeva-ja/lab_4/pic/task.png new file mode 100644 index 0000000..7324d4f Binary files /dev/null and b/tasks/klementeva-ja/lab_4/pic/task.png differ diff --git a/tasks/klementeva-ja/lab_4/python4Lab/.idea/.gitignore b/tasks/klementeva-ja/lab_4/python4Lab/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/tasks/klementeva-ja/lab_4/python4Lab/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/tasks/klementeva-ja/lab_4/python4Lab/.idea/inspectionProfiles/profiles_settings.xml b/tasks/klementeva-ja/lab_4/python4Lab/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/tasks/klementeva-ja/lab_4/python4Lab/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_4/python4Lab/.idea/misc.xml b/tasks/klementeva-ja/lab_4/python4Lab/.idea/misc.xml new file mode 100644 index 0000000..f715fb8 --- /dev/null +++ b/tasks/klementeva-ja/lab_4/python4Lab/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_4/python4Lab/.idea/modules.xml b/tasks/klementeva-ja/lab_4/python4Lab/.idea/modules.xml new file mode 100644 index 0000000..9b2ca55 --- /dev/null +++ b/tasks/klementeva-ja/lab_4/python4Lab/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_4/python4Lab/.idea/python4Lab.iml b/tasks/klementeva-ja/lab_4/python4Lab/.idea/python4Lab.iml new file mode 100644 index 0000000..74d515a --- /dev/null +++ b/tasks/klementeva-ja/lab_4/python4Lab/.idea/python4Lab.iml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_4/python4Lab/Lab4MainTask/Consumer_1.py b/tasks/klementeva-ja/lab_4/python4Lab/Lab4MainTask/Consumer_1.py new file mode 100644 index 0000000..7579a74 --- /dev/null +++ b/tasks/klementeva-ja/lab_4/python4Lab/Lab4MainTask/Consumer_1.py @@ -0,0 +1,20 @@ +import pika +import time + +def process_message(ch, method, properties, body): + print(f"Получено сообщение: {body}") + time.sleep(3) + print("Сообщение успешно обработано") + +connection = pika.BlockingConnection(pika.ConnectionParameters('localhost')) +channel = connection.channel() + +result = channel.queue_declare(queue='', exclusive=True) +queue_name = result.method.queue + +channel.queue_bind(exchange='Agreements', queue=queue_name) + +channel.basic_consume(queue=queue_name, on_message_callback=process_message, auto_ack=True) + +print('Ожидание...') +channel.start_consuming() \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_4/python4Lab/Lab4MainTask/Consumer_2.py b/tasks/klementeva-ja/lab_4/python4Lab/Lab4MainTask/Consumer_2.py new file mode 100644 index 0000000..5e3c7bc --- /dev/null +++ b/tasks/klementeva-ja/lab_4/python4Lab/Lab4MainTask/Consumer_2.py @@ -0,0 +1,19 @@ +import pika + + +def process_message(ch, method, properties, body): + print(f"Получено сообщение: {body}") + print("Сообщение успешно обработано") + +connection = pika.BlockingConnection(pika.ConnectionParameters('localhost')) +channel = connection.channel() + +result = channel.queue_declare(queue='', exclusive=True) +queue_name = result.method.queue + +channel.queue_bind(exchange='Agreements', queue=queue_name) + +channel.basic_consume(queue=queue_name, on_message_callback=process_message, auto_ack=True) + +print('Ожидание...') +channel.start_consuming()Ы \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_4/python4Lab/Lab4MainTask/Publisher.py b/tasks/klementeva-ja/lab_4/python4Lab/Lab4MainTask/Publisher.py new file mode 100644 index 0000000..1f6a858 --- /dev/null +++ b/tasks/klementeva-ja/lab_4/python4Lab/Lab4MainTask/Publisher.py @@ -0,0 +1,19 @@ +import pika +import time +import random + +collection = ["Application for the implementation of a quality management system", "The contract is completed", "Enrollment order completed", "Sistem implemented"] + +connection = pika.BlockingConnection(pika.ConnectionParameters('localhost')) +channel = connection.channel() + +channel.exchange_declare(exchange='Agreements', exchange_type='fanout') + +while True: + message = f"Message: {random.choice(collection)}" + + channel.basic_publish(exchange='Agreements', routing_key='', body=message) + + time.sleep(1) + +connection.close() \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_4/python4Lab/Python.gitignore b/tasks/klementeva-ja/lab_4/python4Lab/Python.gitignore new file mode 100644 index 0000000..68bc17f --- /dev/null +++ b/tasks/klementeva-ja/lab_4/python4Lab/Python.gitignore @@ -0,0 +1,160 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ diff --git a/tasks/klementeva-ja/lab_4/python4Lab/Tut1/receive.py b/tasks/klementeva-ja/lab_4/python4Lab/Tut1/receive.py new file mode 100644 index 0000000..9d0a0db --- /dev/null +++ b/tasks/klementeva-ja/lab_4/python4Lab/Tut1/receive.py @@ -0,0 +1,25 @@ +import pika, sys, os + +def main(): + connection = pika.BlockingConnection(pika.ConnectionParameters(host='localhost')) + channel = connection.channel() + + channel.queue_declare(queue='KlementevaLogs') + + def callback(ch, method, properties, body): + print(f" [x] Получено сообщение: {body}") + + channel.basic_consume(queue='KlementevaLogs', on_message_callback=callback, auto_ack=True) + + print(' [*] Ожидание сообщений. Для завершения CTRL+C') + channel.start_consuming() + +if __name__ == '__main__': + try: + main() + except KeyboardInterrupt: + print('Произошла ошибка') + try: + sys.exit(0) + except SystemExit: + os._exit(0) \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_4/python4Lab/Tut1/send.py b/tasks/klementeva-ja/lab_4/python4Lab/Tut1/send.py new file mode 100644 index 0000000..01f8b90 --- /dev/null +++ b/tasks/klementeva-ja/lab_4/python4Lab/Tut1/send.py @@ -0,0 +1,11 @@ +import pika + +connection = pika.BlockingConnection(pika.ConnectionParameters('localhost')) +channel = connection.channel() + +channel.queue_declare(queue='klementeva') + +channel.basic_publish(exchange='',routing_key='klementeva',body='My name is Zhanna Klementeva from ISEbd-41!') +print("Отправлено") + +connection.close() \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_4/python4Lab/Tut2/new_task.py b/tasks/klementeva-ja/lab_4/python4Lab/Tut2/new_task.py new file mode 100644 index 0000000..53ebee8 --- /dev/null +++ b/tasks/klementeva-ja/lab_4/python4Lab/Tut2/new_task.py @@ -0,0 +1,13 @@ +import pika +import sys + +connection = pika.BlockingConnection(pika.ConnectionParameters(host='localhost')) +channel = connection.channel() + +channel.queue_declare(queue='klementeva2', durable=True) + +message = ' '.join(sys.argv[1:]) or "My name is Zhanna Klementeva from ISEbd-41!" +channel.basic_publish(exchange='', routing_key='klementeva2', body=message, properties=pika.BasicProperties( + delivery_mode=pika.spec.PERSISTENT_DELIVERY_MODE)) +print(f" [x] Отправлено {message}") +connection.close() \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_4/python4Lab/Tut2/worker.py b/tasks/klementeva-ja/lab_4/python4Lab/Tut2/worker.py new file mode 100644 index 0000000..36e3710 --- /dev/null +++ b/tasks/klementeva-ja/lab_4/python4Lab/Tut2/worker.py @@ -0,0 +1,19 @@ +import pika +import time + +connection = pika.BlockingConnection(pika.ConnectionParameters(host='localhost')) +channel = connection.channel() + +channel.queue_declare(queue='klementeva2', durable=True) +print(' [*] Ожидание сообщений') + +def callback(ch, method, properties, body): + print(f" [x] Получено сообщение: {body.decode()}") + time.sleep(body.count(b'.')) + print(" [x] Выполнено") + ch.basic_ack(delivery_tag=method.delivery_tag) + +channel.basic_qos(prefetch_count=1) +channel.basic_consume(queue='klementeva2', on_message_callback=callback) + +channel.start_consuming() \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_4/python4Lab/Tut3/emit_log.py b/tasks/klementeva-ja/lab_4/python4Lab/Tut3/emit_log.py new file mode 100644 index 0000000..75d51ab --- /dev/null +++ b/tasks/klementeva-ja/lab_4/python4Lab/Tut3/emit_log.py @@ -0,0 +1,12 @@ +import pika +import sys + +connection = pika.BlockingConnection(pika.ConnectionParameters(host='localhost')) +channel = connection.channel() + +channel.exchange_declare(exchange='KlementevaLogs', exchange_type='fanout') + +message = ' '.join(sys.argv[1:]) or "My name is Zhanna Klementeva from ISEbd-41!" +channel.basic_publish(exchange='KlementevaLogs', routing_key='', body=message) +print(f" [x] Отправлено сообщение: {message}") +connection.close() \ No newline at end of file diff --git a/tasks/klementeva-ja/lab_4/python4Lab/Tut3/receive_logs.py b/tasks/klementeva-ja/lab_4/python4Lab/Tut3/receive_logs.py new file mode 100644 index 0000000..a6eb435 --- /dev/null +++ b/tasks/klementeva-ja/lab_4/python4Lab/Tut3/receive_logs.py @@ -0,0 +1,21 @@ +import pika + +connection = pika.BlockingConnection(pika.ConnectionParameters(host='localhost')) +channel = connection.channel() + +channel.exchange_declare(exchange='KlementevaLogs', exchange_type='fanout') + +result = channel.queue_declare(queue='', exclusive=True) +queue_name = result.method.queue + +channel.queue_bind(exchange='KlementevaLogs', queue=queue_name) + +print(' [*] Ожидание сообщений. Для завершения CTRL+C') + +def callback(ch, method, properties, body): + print(f" [x] {body}") + +channel.basic_consume( + queue=queue_name, on_message_callback=callback, auto_ack=True) + +channel.start_consuming() \ No newline at end of file