Merge pull request '[Л/Р 3] Халитова Ангелина' (#114) from angelina/distributed-computing:khalitova-am-lab-3 into main
Reviewed-on: http://student.git.athene.tech/v.moiseev/distributed-computing/pulls/114
This commit is contained in:
commit
e8fb644580
454
tasks/khalitova-am/lab_3/.gitignore
vendored
Normal file
454
tasks/khalitova-am/lab_3/.gitignore
vendored
Normal file
@ -0,0 +1,454 @@
|
|||||||
|
## 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
|
||||||
|
|
||||||
|
# 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
|
||||||
|
*.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 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/
|
||||||
|
|
||||||
|
# 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
|
||||||
|
|
||||||
|
##
|
||||||
|
## 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
|
||||||
|
|
||||||
|
# JetBrains Rider
|
||||||
|
.idea/
|
||||||
|
*.sln.iml
|
||||||
|
|
||||||
|
##
|
||||||
|
## Visual Studio Code
|
||||||
|
##
|
||||||
|
.vscode/*
|
||||||
|
!.vscode/settings.json
|
||||||
|
!.vscode/tasks.json
|
||||||
|
!.vscode/launch.json
|
||||||
|
!.vscode/extensions.json
|
139
tasks/khalitova-am/lab_3/README.md
Normal file
139
tasks/khalitova-am/lab_3/README.md
Normal file
@ -0,0 +1,139 @@
|
|||||||
|
# Отчёт по лабораторной работе №3
|
||||||
|
## REST API, Gateway и синхронный обмен между микросервисами
|
||||||
|
|
||||||
|
Выполнила: студентка гр. ИСЭбд-41 Халитова А.М.
|
||||||
|
|
||||||
|
## Создание микросервисов
|
||||||
|
|
||||||
|
В терминале помощью команд `dotnet new web -n worker-1` и `dotnet new web -n worker-2`создано два микросервиса:
|
||||||
|
|
||||||
|
[Код программы worker-1](worker-1/Program.cs)
|
||||||
|
|
||||||
|
[Код программы worker-2](worker-2/Program.cs)
|
||||||
|
|
||||||
|
|
||||||
|
Далее были добавлены Swagger и OpenAi в проекты. Затем запустили приложения с помощью команды `dotnet run`.
|
||||||
|
|
||||||
|
Интерфейс микросервисов c CRUD-операциями - список записей, подробности конкретной записи, создание, удаление и изменение записи:
|
||||||
|
worker-1:
|
||||||
|
![](shots/shot1.PNG)
|
||||||
|
worker-2:
|
||||||
|
![](shots/shot2.PNG)
|
||||||
|
|
||||||
|
## Реализация синхронного обмена
|
||||||
|
|
||||||
|
Синхронный вызов данных с соседнего микросервиса для worker-2 при реализации получения, создания и обновления работ:
|
||||||
|
```
|
||||||
|
app.MapGet("/getJobs/{clientId}", (string clientId) =>
|
||||||
|
{
|
||||||
|
var secondWorkerResponse = httpClient.GetStringAsync("http://worker-1:8080/getClient/" + clientId).Result;
|
||||||
|
Client client = JsonConvert.DeserializeObject<Client>(secondWorkerResponse);
|
||||||
|
if (secondWorkerResponse == null)
|
||||||
|
return Results.NotFound(new { message = "Клиент не найден" });
|
||||||
|
List<Job> clientJobs = jobs.Where(x => x.ClientId == clientId).ToList();
|
||||||
|
return Results.Json(clientJobs);
|
||||||
|
})
|
||||||
|
.WithName("GetJobs");
|
||||||
|
|
||||||
|
app.MapGet("getJob/{id}", (string id) =>
|
||||||
|
{
|
||||||
|
Job? job = jobs.FirstOrDefault(x => x.Id == id);
|
||||||
|
if (job == null)
|
||||||
|
return Results.NotFound(new { message = "Задача не найдена" });
|
||||||
|
return Results.Json(job);
|
||||||
|
})
|
||||||
|
.WithName("GetJob");
|
||||||
|
|
||||||
|
app.MapPost("createJob", (JobViewModel jobVM) =>
|
||||||
|
{
|
||||||
|
var secondWorkerResponse = httpClient.GetStringAsync("http://worker-1:8080/getClient/" + jobVM.ClientId).Result;
|
||||||
|
Client client = JsonConvert.DeserializeObject<Client>(secondWorkerResponse);
|
||||||
|
if (secondWorkerResponse == null)
|
||||||
|
return Results.NotFound(new { message = "Клиент не найден" });
|
||||||
|
Job job = new Job
|
||||||
|
{
|
||||||
|
Id = Guid.NewGuid().ToString(),
|
||||||
|
DeadLine = jobVM.DeadLine,
|
||||||
|
Description = jobVM.Description,
|
||||||
|
Client = client,
|
||||||
|
ClientId = jobVM.ClientId,
|
||||||
|
Title = jobVM.Title,
|
||||||
|
};
|
||||||
|
jobs.Add(job);
|
||||||
|
return Results.Json(job);
|
||||||
|
})
|
||||||
|
.WithName("CreateJob");
|
||||||
|
|
||||||
|
app.MapPut("updateJob/{id}", (string id, JobViewModel data) =>
|
||||||
|
{
|
||||||
|
Job? job = jobs.FirstOrDefault(x => x.Id == id);
|
||||||
|
if (job == null)
|
||||||
|
return Results.NotFound(new { message = "Задача не найдена" });
|
||||||
|
var secondWorkerResponse = httpClient.GetStringAsync("http://worker-1:8080/getClient/" + data.ClientId).Result;
|
||||||
|
Client client = JsonConvert.DeserializeObject<Client>(secondWorkerResponse);
|
||||||
|
if (secondWorkerResponse == null)
|
||||||
|
return Results.NotFound(new { message = "Клиент не найден" });
|
||||||
|
job.Title = data.Title;
|
||||||
|
job.DeadLine = data.DeadLine;
|
||||||
|
job.ClientId = data.ClientId;
|
||||||
|
job.Client = client;
|
||||||
|
job.Description = data.Description;
|
||||||
|
return Results.Json(job);
|
||||||
|
})
|
||||||
|
.WithName("UpdateJob");
|
||||||
|
```
|
||||||
|
|
||||||
|
## Реализация gateway при помощи nginx
|
||||||
|
|
||||||
|
Файл с настройкой nginx:
|
||||||
|
```
|
||||||
|
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 --build`.
|
||||||
|
|
||||||
|
В Docker Desktop проверили, что приложение успешно запущено:
|
||||||
|
![](shots/shot3.PNG)
|
||||||
|
|
||||||
|
Страница `index.html` на шлюзе geteway-1:
|
||||||
|
![](shots/shot4.PNG)
|
||||||
|
|
||||||
|
worker-1:
|
||||||
|
![](shots/shot5.PNG)
|
||||||
|
|
||||||
|
worker-2:
|
||||||
|
![](shots/shot6.PNG)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
15
tasks/khalitova-am/lab_3/docker-compose.yml
Normal file
15
tasks/khalitova-am/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/khalitova-am/lab_3/nginx.conf
Normal file
26
tasks/khalitova-am/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/khalitova-am/lab_3/shots/shot1.PNG
Normal file
BIN
tasks/khalitova-am/lab_3/shots/shot1.PNG
Normal file
Binary file not shown.
After Width: | Height: | Size: 52 KiB |
BIN
tasks/khalitova-am/lab_3/shots/shot2.PNG
Normal file
BIN
tasks/khalitova-am/lab_3/shots/shot2.PNG
Normal file
Binary file not shown.
After Width: | Height: | Size: 51 KiB |
BIN
tasks/khalitova-am/lab_3/shots/shot3.PNG
Normal file
BIN
tasks/khalitova-am/lab_3/shots/shot3.PNG
Normal file
Binary file not shown.
After Width: | Height: | Size: 55 KiB |
BIN
tasks/khalitova-am/lab_3/shots/shot4.PNG
Normal file
BIN
tasks/khalitova-am/lab_3/shots/shot4.PNG
Normal file
Binary file not shown.
After Width: | Height: | Size: 64 KiB |
BIN
tasks/khalitova-am/lab_3/shots/shot5.PNG
Normal file
BIN
tasks/khalitova-am/lab_3/shots/shot5.PNG
Normal file
Binary file not shown.
After Width: | Height: | Size: 17 KiB |
BIN
tasks/khalitova-am/lab_3/shots/shot6.PNG
Normal file
BIN
tasks/khalitova-am/lab_3/shots/shot6.PNG
Normal file
Binary file not shown.
After Width: | Height: | Size: 18 KiB |
13
tasks/khalitova-am/lab_3/static/index.html
Normal file
13
tasks/khalitova-am/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/khalitova-am/lab_3/worker-1/Dockerfile
Normal file
11
tasks/khalitova-am/lab_3/worker-1/Dockerfile
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
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"]
|
71
tasks/khalitova-am/lab_3/worker-1/Program.cs
Normal file
71
tasks/khalitova-am/lab_3/worker-1/Program.cs
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
var clients = new List<Client>() {
|
||||||
|
new Client { Id = "638f2a30-ca73-4772-b827-f9e6d0e81a86", Address = "ул. Улица", Name = "Иван" },
|
||||||
|
new Client { Id = "638f2a30-ca73-4772-b827-f9e6d0e81a89", Address = "ул. Бульвар", Name = "Петр" }
|
||||||
|
};
|
||||||
|
|
||||||
|
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("/getClients", () =>
|
||||||
|
{
|
||||||
|
return clients;
|
||||||
|
})
|
||||||
|
.WithName("GetClients");
|
||||||
|
|
||||||
|
app.MapGet("getClient/{id}", (string id) =>
|
||||||
|
{
|
||||||
|
Client? client = clients.FirstOrDefault(x => x.Id == id);
|
||||||
|
if (client == null)
|
||||||
|
return Results.NotFound(new { message = "Клиент не найден" });
|
||||||
|
return Results.Json(client);
|
||||||
|
})
|
||||||
|
.WithName("GetClient");
|
||||||
|
|
||||||
|
app.MapPost("createClient", (Client client) =>
|
||||||
|
{
|
||||||
|
client.Id = Guid.NewGuid().ToString();
|
||||||
|
clients.Add(client);
|
||||||
|
return client;
|
||||||
|
})
|
||||||
|
.WithName("CreateClient");
|
||||||
|
|
||||||
|
app.MapPut("updateClient/{id}", (Client data) =>
|
||||||
|
{
|
||||||
|
Client? client = clients.FirstOrDefault(x => x.Id == data.Id);
|
||||||
|
if (client == null)
|
||||||
|
return Results.NotFound(new { message = "Клиент не найден" });
|
||||||
|
client.Address = data.Address;
|
||||||
|
client.Name = data.Name;
|
||||||
|
return Results.Json(client);
|
||||||
|
})
|
||||||
|
.WithName("UpdateClient");
|
||||||
|
|
||||||
|
app.MapDelete("deleteClient/{id}", (string id) =>
|
||||||
|
{
|
||||||
|
Client? client = clients.FirstOrDefault(x => x.Id == id);
|
||||||
|
if (client == null)
|
||||||
|
return Results.NotFound(new { message = "Клиент не найден" });
|
||||||
|
clients.Remove(client);
|
||||||
|
return Results.Ok();
|
||||||
|
})
|
||||||
|
.WithName("DeleteClient");
|
||||||
|
|
||||||
|
app.Run();
|
||||||
|
public class Client
|
||||||
|
{
|
||||||
|
public string Id { get; set; }
|
||||||
|
public string Name { get; set; }
|
||||||
|
public string Address { get; set; }
|
||||||
|
}
|
@ -0,0 +1,28 @@
|
|||||||
|
{
|
||||||
|
"iisSettings": {
|
||||||
|
"windowsAuthentication": false,
|
||||||
|
"anonymousAuthentication": true,
|
||||||
|
"iisExpress": {
|
||||||
|
"applicationUrl": "http://localhost:64210",
|
||||||
|
"sslPort": 44366
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"profiles": {
|
||||||
|
"worker_1": {
|
||||||
|
"commandName": "Project",
|
||||||
|
"dotnetRunMessages": true,
|
||||||
|
"launchBrowser": true,
|
||||||
|
"applicationUrl": "https://localhost:7139;http://localhost:5051",
|
||||||
|
"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/khalitova-am/lab_3/worker-1/appsettings.json
Normal file
9
tasks/khalitova-am/lab_3/worker-1/appsettings.json
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.AspNetCore": "Warning"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"AllowedHosts": "*"
|
||||||
|
}
|
14
tasks/khalitova-am/lab_3/worker-1/worker-1.csproj
Normal file
14
tasks/khalitova-am/lab_3/worker-1/worker-1.csproj
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<RootNamespace>worker_1</RootNamespace>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="openapi" Version="1.0.1" />
|
||||||
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
11
tasks/khalitova-am/lab_3/worker-2/Dockerfile
Normal file
11
tasks/khalitova-am/lab_3/worker-2/Dockerfile
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
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"]
|
111
tasks/khalitova-am/lab_3/worker-2/Program.cs
Normal file
111
tasks/khalitova-am/lab_3/worker-2/Program.cs
Normal file
@ -0,0 +1,111 @@
|
|||||||
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
|
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();
|
||||||
|
|
||||||
|
var jobs = new List<Job>();
|
||||||
|
var httpClient = new HttpClient();
|
||||||
|
app.MapGet("/getJobs/{clientId}", (string clientId) =>
|
||||||
|
{
|
||||||
|
var secondWorkerResponse = httpClient.GetStringAsync("http://worker-1:8080/getClient/" + clientId).Result;
|
||||||
|
Client client = JsonConvert.DeserializeObject<Client>(secondWorkerResponse);
|
||||||
|
if (secondWorkerResponse == null)
|
||||||
|
return Results.NotFound(new { message = "Клиент не найден" });
|
||||||
|
List<Job> clientJobs = jobs.Where(x => x.ClientId == clientId).ToList();
|
||||||
|
return Results.Json(clientJobs);
|
||||||
|
})
|
||||||
|
.WithName("GetJobs");
|
||||||
|
|
||||||
|
app.MapGet("getJob/{id}", (string id) =>
|
||||||
|
{
|
||||||
|
Job? job = jobs.FirstOrDefault(x => x.Id == id);
|
||||||
|
if (job == null)
|
||||||
|
return Results.NotFound(new { message = "Задача не найдена" });
|
||||||
|
return Results.Json(job);
|
||||||
|
})
|
||||||
|
.WithName("GetJob");
|
||||||
|
|
||||||
|
app.MapPost("createJob", (JobViewModel jobVM) =>
|
||||||
|
{
|
||||||
|
var secondWorkerResponse = httpClient.GetStringAsync("http://worker-1:8080/getClient/" + jobVM.ClientId).Result;
|
||||||
|
Client client = JsonConvert.DeserializeObject<Client>(secondWorkerResponse);
|
||||||
|
if (secondWorkerResponse == null)
|
||||||
|
return Results.NotFound(new { message = "Клиент не найден" });
|
||||||
|
Job job = new Job
|
||||||
|
{
|
||||||
|
Id = Guid.NewGuid().ToString(),
|
||||||
|
DeadLine = jobVM.DeadLine,
|
||||||
|
Description = jobVM.Description,
|
||||||
|
Client = client,
|
||||||
|
ClientId = jobVM.ClientId,
|
||||||
|
Title = jobVM.Title,
|
||||||
|
};
|
||||||
|
jobs.Add(job);
|
||||||
|
return Results.Json(job);
|
||||||
|
})
|
||||||
|
.WithName("CreateJob");
|
||||||
|
|
||||||
|
app.MapPut("updateJob/{id}", (string id, JobViewModel data) =>
|
||||||
|
{
|
||||||
|
Job? job = jobs.FirstOrDefault(x => x.Id == id);
|
||||||
|
if (job == null)
|
||||||
|
return Results.NotFound(new { message = "Задача не найдена" });
|
||||||
|
var secondWorkerResponse = httpClient.GetStringAsync("http://worker-1:8080/getClient/" + data.ClientId).Result;
|
||||||
|
Client client = JsonConvert.DeserializeObject<Client>(secondWorkerResponse);
|
||||||
|
if (secondWorkerResponse == null)
|
||||||
|
return Results.NotFound(new { message = "Клиент не найден" });
|
||||||
|
job.Title = data.Title;
|
||||||
|
job.DeadLine = data.DeadLine;
|
||||||
|
job.ClientId = data.ClientId;
|
||||||
|
job.Client = client;
|
||||||
|
job.Description = data.Description;
|
||||||
|
return Results.Json(job);
|
||||||
|
})
|
||||||
|
.WithName("UpdateJob");
|
||||||
|
|
||||||
|
app.MapDelete("deleteJob/{id}", (string id) =>
|
||||||
|
{
|
||||||
|
Job? job = jobs.FirstOrDefault(x => x.Id == id);
|
||||||
|
if (job == null)
|
||||||
|
return Results.NotFound(new { message = "Задача не найдена" });
|
||||||
|
jobs.Remove(job);
|
||||||
|
return Results.Ok();
|
||||||
|
})
|
||||||
|
.WithName("DeleteJob");
|
||||||
|
|
||||||
|
app.Run();
|
||||||
|
|
||||||
|
public class Client
|
||||||
|
{
|
||||||
|
public string Id { get; set; }
|
||||||
|
public string Name { get; set; }
|
||||||
|
public string Address { get; set; }
|
||||||
|
}
|
||||||
|
public class Job
|
||||||
|
{
|
||||||
|
public string Id { get; set; }
|
||||||
|
public string Title { get; set; }
|
||||||
|
public string Description { get; set; }
|
||||||
|
public DateTime DeadLine { get; set; }
|
||||||
|
public string ClientId { get; set; }
|
||||||
|
public Client Client { get; set; }
|
||||||
|
}
|
||||||
|
public class JobViewModel
|
||||||
|
{
|
||||||
|
public string Title { get; set; }
|
||||||
|
public string Description { get; set; }
|
||||||
|
public DateTime DeadLine { get; set; }
|
||||||
|
public string ClientId { get; set; }
|
||||||
|
}
|
@ -0,0 +1,28 @@
|
|||||||
|
{
|
||||||
|
"iisSettings": {
|
||||||
|
"windowsAuthentication": false,
|
||||||
|
"anonymousAuthentication": true,
|
||||||
|
"iisExpress": {
|
||||||
|
"applicationUrl": "http://localhost:21583",
|
||||||
|
"sslPort": 44340
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"profiles": {
|
||||||
|
"worker_2": {
|
||||||
|
"commandName": "Project",
|
||||||
|
"dotnetRunMessages": true,
|
||||||
|
"launchBrowser": true,
|
||||||
|
"applicationUrl": "https://localhost:7037;http://localhost:5066",
|
||||||
|
"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/khalitova-am/lab_3/worker-2/appsettings.json
Normal file
9
tasks/khalitova-am/lab_3/worker-2/appsettings.json
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.AspNetCore": "Warning"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"AllowedHosts": "*"
|
||||||
|
}
|
16
tasks/khalitova-am/lab_3/worker-2/worker-2.csproj
Normal file
16
tasks/khalitova-am/lab_3/worker-2/worker-2.csproj
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<RootNamespace>worker_2</RootNamespace>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="newtonsoft.json" Version="13.0.3" />
|
||||||
|
<PackageReference Include="openapi" Version="1.0.1" />
|
||||||
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
Loading…
Reference in New Issue
Block a user