Compare commits
1 Commits
melnikov-k
...
melnikov-k
| Author | SHA1 | Date | |
|---|---|---|---|
| e6e89afa88 |
484
tasks/melnikov-ky/lab_3/.gitignore
vendored
Normal file
@@ -0,0 +1,484 @@
|
|||||||
|
## Ignore Visual Studio temporary files, build results, and
|
||||||
|
## files generated by popular Visual Studio add-ons.
|
||||||
|
##
|
||||||
|
## Get latest from `dotnet new gitignore`
|
||||||
|
|
||||||
|
# dotenv files
|
||||||
|
.env
|
||||||
|
|
||||||
|
# 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
|
||||||
|
.idea
|
||||||
|
|
||||||
|
##
|
||||||
|
## 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
|
||||||
|
|
||||||
|
# Vim temporary swap files
|
||||||
|
*.swp
|
||||||
86
tasks/melnikov-ky/lab_3/README.md
Normal file
@@ -0,0 +1,86 @@
|
|||||||
|
# Отчет по лабораторной работе №3
|
||||||
|
|
||||||
|
Выполнил студент гр. ИСЭбд-41 Мельников К.Ю.
|
||||||
|
|
||||||
|
## REST API, Gateway и синхронный обмен между микросервисами
|
||||||
|
|
||||||
|
## Создание микросервисов
|
||||||
|
|
||||||
|
1. С помощью команды `dotnet new web -n worker-1` в терминале создал первый микросервис
|
||||||
|
2. Добавил решение командой `dotnet new sln`
|
||||||
|
3. Связал решение и проект командой `dotnet sln worker-1.sln add worker-1.csproj`
|
||||||
|
4. Повторил действие для второго микросервиса
|
||||||
|
5. Добавил библиотеку Swagger и OpenAi в проекты и запустил с помощью команды `dotnet run`
|
||||||
|
|
||||||
|
Скриншоты протестированных микросервисов:
|
||||||
|

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

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

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

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

|
||||||
15
tasks/melnikov-ky/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/melnikov-ky/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/melnikov-ky/lab_3/scrins/1.png
Normal file
|
After Width: | Height: | Size: 67 KiB |
BIN
tasks/melnikov-ky/lab_3/scrins/2.png
Normal file
|
After Width: | Height: | Size: 41 KiB |
BIN
tasks/melnikov-ky/lab_3/scrins/3.png
Normal file
|
After Width: | Height: | Size: 25 KiB |
BIN
tasks/melnikov-ky/lab_3/scrins/4.png
Normal file
|
After Width: | Height: | Size: 33 KiB |
BIN
tasks/melnikov-ky/lab_3/scrins/5.png
Normal file
|
After Width: | Height: | Size: 29 KiB |
13
tasks/melnikov-ky/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/melnikov-ky/lab_3/worker-1/Dockerfile
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
COPY . ./
|
||||||
|
RUN dotnet restore
|
||||||
|
RUN dotnet publish -c Release -o out
|
||||||
|
|
||||||
|
FROM mcr.microsoft.com/dotnet/aspnet:7.0
|
||||||
|
WORKDIR /app
|
||||||
|
COPY --from=build-env /app/out .
|
||||||
|
ENTRYPOINT ["dotnet", "worker-1.dll"]
|
||||||
111
tasks/melnikov-ky/lab_3/worker-1/Program.cs
Normal file
@@ -0,0 +1,111 @@
|
|||||||
|
List<Cars> cars = new()
|
||||||
|
{
|
||||||
|
new Cars() { Uuid= Guid.Parse("6a1b4a72-5669-41fe-8d5b-106dc86f58bd"), Model = "Priora", Brand = "Lada"},
|
||||||
|
new Cars() { Uuid= Guid.Parse("464bbdb8-39c0-4644-b9c0-3df1c484ea7e"), Model = "CRV", Brand = "Honda"},
|
||||||
|
new Cars() { Uuid= Guid.Parse("f8692bea-b7e6-4164-b564-a921f16c35c9"), Model = "Jumper", Brand = "Citroen"},
|
||||||
|
};
|
||||||
|
|
||||||
|
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 cars.Select(r => new CarEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = r.Uuid,
|
||||||
|
Model = r.Model,
|
||||||
|
Brand = r.Brand,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("GetCars")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapGet("/{uuid}", (Guid uuid) =>
|
||||||
|
{
|
||||||
|
var car = cars.FirstOrDefault(r => r.Uuid == uuid);
|
||||||
|
if (car == null)
|
||||||
|
return Results.NotFound();
|
||||||
|
return Results.Json(new CarEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = car.Uuid,
|
||||||
|
Model = car.Model,
|
||||||
|
Brand = car.Brand,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("GetCarByGUID")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapPost("/{model}/{brand}", (string Model, string Brand) =>
|
||||||
|
{
|
||||||
|
Guid NewGuid = Guid.NewGuid();
|
||||||
|
cars.Add(new Cars() { Uuid = NewGuid, Model = (string)Model, Brand = (string)Brand});
|
||||||
|
|
||||||
|
var car = cars.FirstOrDefault(r => r.Uuid == NewGuid);
|
||||||
|
if (car == null)
|
||||||
|
return Results.NotFound();
|
||||||
|
return Results.Json(new CarEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = car.Uuid,
|
||||||
|
Model = car.Model,
|
||||||
|
Brand = car.Brand,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("PostCar")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapPatch("/{uuid}/{model}/{brand}", (Guid uuid, string ?model, string ?brand) =>
|
||||||
|
{
|
||||||
|
var car = cars.FirstOrDefault(r => r.Uuid == uuid);
|
||||||
|
if (car == null)
|
||||||
|
return Results.NotFound();
|
||||||
|
if (model != null) car.Model = model;
|
||||||
|
if (brand != null) car.Brand = brand;
|
||||||
|
|
||||||
|
return Results.Json(new CarEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = car.Uuid,
|
||||||
|
Model = car.Model,
|
||||||
|
Brand = car.Brand,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("UpdateCar")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapDelete("/{uuid}", (Guid uuid) =>
|
||||||
|
{
|
||||||
|
var car = cars.FirstOrDefault(r => r.Uuid == uuid);
|
||||||
|
if (car == null)
|
||||||
|
return Results.NotFound();
|
||||||
|
cars.Remove(car);
|
||||||
|
return Results.Json(new CarEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = car.Uuid,
|
||||||
|
Model = car.Model,
|
||||||
|
Brand = car.Brand,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("DeleteCarByGUID")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.Run();
|
||||||
|
|
||||||
|
public class Cars
|
||||||
|
{
|
||||||
|
public Guid Uuid { get; set; }
|
||||||
|
public string Model { get; set; } = string.Empty;
|
||||||
|
public string Brand { get; set; } = string.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
public class CarEntityDto : Cars { }
|
||||||
@@ -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"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.AspNetCore": "Warning"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
9
tasks/melnikov-ky/lab_3/worker-1/appsettings.json
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.AspNetCore": "Warning"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"AllowedHosts": "*"
|
||||||
|
}
|
||||||
15
tasks/melnikov-ky/lab_3/worker-1/worker-1.csproj
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<RootNamespace>worker_1</RootNamespace>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.0" />
|
||||||
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
22
tasks/melnikov-ky/lab_3/worker-1/worker-1.sln
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
|
||||||
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
|
# Visual Studio Version 17
|
||||||
|
VisualStudioVersion = 17.0.31903.59
|
||||||
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "worker-1", "worker-1.csproj", "{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
|
||||||
11
tasks/melnikov-ky/lab_3/worker-2/Dockerfile
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
COPY . ./
|
||||||
|
RUN dotnet restore
|
||||||
|
RUN dotnet publish -c Release -o out
|
||||||
|
|
||||||
|
FROM mcr.microsoft.com/dotnet/aspnet:7.0
|
||||||
|
WORKDIR /app
|
||||||
|
COPY --from=build-env /app/out .
|
||||||
|
ENTRYPOINT ["dotnet", "worker-2.dll"]
|
||||||
139
tasks/melnikov-ky/lab_3/worker-2/Program.cs
Normal file
@@ -0,0 +1,139 @@
|
|||||||
|
|
||||||
|
List<Parts> parts = new()
|
||||||
|
{
|
||||||
|
new Parts() { Uuid= Guid.NewGuid(), Name = "Engine", IsNew = true, IdCar = Guid.Parse("6a1b4a72-5669-41fe-8d5b-106dc86f58bd") },
|
||||||
|
new Parts() { Uuid= Guid.NewGuid(), Name = "Wheels", IsNew = false, IdCar = Guid.Parse("f8692bea-b7e6-4164-b564-a921f16c35c9") },
|
||||||
|
new Parts() { Uuid= Guid.NewGuid(), Name = "Transmission", IsNew = false, IdCar = Guid.Parse("464bbdb8-39c0-4644-b9c0-3df1c484ea7e") },
|
||||||
|
new Parts() { Uuid= Guid.NewGuid(), Name = "Radiator ", IsNew = true, IdCar = Guid.Parse("464bbdb8-39c0-4644-b9c0-3df1c484ea7e") },
|
||||||
|
};
|
||||||
|
|
||||||
|
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 parts.Select(r => new PartEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = r.Uuid,
|
||||||
|
Name = r.Name,
|
||||||
|
IsNew = r.IsNew,
|
||||||
|
IdCar = r.IdCar,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("GetParts")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapGet("/{uuid}", (Guid uuid) =>
|
||||||
|
{
|
||||||
|
var part = parts.FirstOrDefault(r => r.Uuid == uuid);
|
||||||
|
if (part == null)
|
||||||
|
return Results.NotFound();
|
||||||
|
return Results.Json(new PartEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = part.Uuid,
|
||||||
|
Name = part.Name,
|
||||||
|
IsNew = part.IsNew,
|
||||||
|
IdCar = part.IdCar,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("GetPartByGUID")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapPost("/{name}/{isNew}/{idCar}", (string? Name, bool IsNew, Guid IdCar) =>
|
||||||
|
{
|
||||||
|
Guid NewGuid = Guid.NewGuid();
|
||||||
|
parts.Add(new Parts() { Uuid = NewGuid, Name = (string)Name, IsNew = (bool)IsNew, IdCar = (Guid)IdCar });
|
||||||
|
|
||||||
|
var part = parts.FirstOrDefault(r => r.Uuid == NewGuid);
|
||||||
|
if (part == null)
|
||||||
|
return Results.NotFound();
|
||||||
|
return Results.Json(new PartEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = part.Uuid,
|
||||||
|
Name = part.Name,
|
||||||
|
IsNew = part.IsNew,
|
||||||
|
IdCar = part.IdCar,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("PostPart")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapPatch("/{uuid}/{name}/{isNew}/{idCar}", (Guid uuid, string ?name, bool isNew, Guid idCar) =>
|
||||||
|
{
|
||||||
|
var part = parts.FirstOrDefault(r => r.Uuid == uuid);
|
||||||
|
if (part == null)
|
||||||
|
return Results.NotFound();
|
||||||
|
if (name != ",") part.Name = name;
|
||||||
|
if (isNew != part.IsNew) part.IsNew = isNew;
|
||||||
|
if (idCar != part.IdCar) part.IdCar = idCar;
|
||||||
|
|
||||||
|
return Results.Json(new PartEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = part.Uuid,
|
||||||
|
Name = part.Name,
|
||||||
|
IsNew = part.IsNew,
|
||||||
|
IdCar = part.IdCar,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("UpdatePart")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapDelete("/{uuid}", (Guid uuid) =>
|
||||||
|
{
|
||||||
|
var part = parts.FirstOrDefault(r => r.Uuid == uuid);
|
||||||
|
if (part == null)
|
||||||
|
return Results.NotFound();
|
||||||
|
parts.Remove(part);
|
||||||
|
return Results.Json(new PartEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = part.Uuid,
|
||||||
|
Name = part.Name,
|
||||||
|
IsNew = part.IsNew,
|
||||||
|
IdCar = part.IdCar,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("DeletePart")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapGet("/Parts/", async () =>
|
||||||
|
{
|
||||||
|
var httpClient = new HttpClient();
|
||||||
|
var secondWorkerResponse = await httpClient.GetStringAsync("http://worker-1:8080/");
|
||||||
|
|
||||||
|
return secondWorkerResponse.ToArray();
|
||||||
|
})
|
||||||
|
.WithName("GetCars")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.Run();
|
||||||
|
|
||||||
|
public class Parts
|
||||||
|
{
|
||||||
|
public Guid Uuid { get; set; }
|
||||||
|
public string Name { get; set; } = string.Empty;
|
||||||
|
public bool IsNew { get; set; }
|
||||||
|
public Guid IdCar { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class PartEntityDto : Parts { }
|
||||||
|
|
||||||
|
public class Cars
|
||||||
|
{
|
||||||
|
public Guid Uuid { get; set; }
|
||||||
|
public string Model { get; set; } = string.Empty;
|
||||||
|
public string Brand { get; set; } = string.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
public class CarEntityDto : Cars { }
|
||||||
@@ -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"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.AspNetCore": "Warning"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
9
tasks/melnikov-ky/lab_3/worker-2/appsettings.json
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.AspNetCore": "Warning"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"AllowedHosts": "*"
|
||||||
|
}
|
||||||
15
tasks/melnikov-ky/lab_3/worker-2/worker-2.csproj
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<RootNamespace>worker_2</RootNamespace>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.0" />
|
||||||
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
22
tasks/melnikov-ky/lab_3/worker-2/worker-2.sln
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
|
||||||
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
|
# Visual Studio Version 17
|
||||||
|
VisualStudioVersion = 17.0.31903.59
|
||||||
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "worker-2", "worker-2.csproj", "{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
|
||||||
3
tasks/melnikov-ky/lab_4/.idea/.gitignore
generated
vendored
@@ -1,3 +0,0 @@
|
|||||||
# Default ignored files
|
|
||||||
/shelf/
|
|
||||||
/workspace.xml
|
|
||||||
1
tasks/melnikov-ky/lab_4/.idea/.name
generated
@@ -1 +0,0 @@
|
|||||||
receive.py
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
<component name="InspectionProjectProfileManager">
|
|
||||||
<settings>
|
|
||||||
<option name="USE_PROJECT_PROFILE" value="false" />
|
|
||||||
<version value="1.0" />
|
|
||||||
</settings>
|
|
||||||
</component>
|
|
||||||
7
tasks/melnikov-ky/lab_4/.idea/misc.xml
generated
@@ -1,7 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="Black">
|
|
||||||
<option name="sdkName" value="Python 3.12 (python4Lab)" />
|
|
||||||
</component>
|
|
||||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12 (python4Lab)" project-jdk-type="Python SDK" />
|
|
||||||
</project>
|
|
||||||
8
tasks/melnikov-ky/lab_4/.idea/modules.xml
generated
@@ -1,8 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="ProjectModuleManager">
|
|
||||||
<modules>
|
|
||||||
<module fileurl="file://$PROJECT_DIR$/.idea/python4Lab.iml" filepath="$PROJECT_DIR$/.idea/python4Lab.iml" />
|
|
||||||
</modules>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
10
tasks/melnikov-ky/lab_4/.idea/python4Lab.iml
generated
@@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<module type="PYTHON_MODULE" version="4">
|
|
||||||
<component name="NewModuleRootManager">
|
|
||||||
<content url="file://$MODULE_DIR$">
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/venv" />
|
|
||||||
</content>
|
|
||||||
<orderEntry type="inheritedJdk" />
|
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
|
||||||
</component>
|
|
||||||
</module>
|
|
||||||
6
tasks/melnikov-ky/lab_4/.idea/vcs.xml
generated
@@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="VcsDirectoryMappings">
|
|
||||||
<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
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()
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
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()
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
import pika
|
|
||||||
import time
|
|
||||||
import random
|
|
||||||
|
|
||||||
collection = ["Application for Travel Agency", "Buying tickets", "Execution of the agreement", "Check-into a hotel"]
|
|
||||||
|
|
||||||
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()
|
|
||||||
@@ -1,160 +0,0 @@
|
|||||||
# 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/
|
|
||||||
@@ -1,116 +0,0 @@
|
|||||||
# Отчет по лабораторной работе №4
|
|
||||||
|
|
||||||
Выполнил студент гр. ИСЭбд-41 Мельников К.Ю.
|
|
||||||
|
|
||||||
## Прохождение tutorial
|
|
||||||
|
|
||||||
Установил rabbitMQ server, erlang и зашел в брокер под гостем по http://localhost:15672/#/
|
|
||||||
|
|
||||||
Туториал 1:
|
|
||||||
|
|
||||||

|
|
||||||

|
|
||||||

|
|
||||||
Туториал 2:
|
|
||||||
|
|
||||||

|
|
||||||

|
|
||||||

|
|
||||||
|
|
||||||
Туториал 3:
|
|
||||||
|
|
||||||

|
|
||||||

|
|
||||||

|
|
||||||
|
|
||||||
## Разработка демонстрационных приложений
|
|
||||||
|
|
||||||
Предметная область: Дополенительные соглашения и договора на заселение в отель Туристического агентства.
|
|
||||||
Разработа три приложения согласно предметной области.
|
|
||||||
|
|
||||||
1. Publisher
|
|
||||||
|
|
||||||
```py
|
|
||||||
import pika
|
|
||||||
import time
|
|
||||||
import random
|
|
||||||
|
|
||||||
collection = ["Application for Travel Agency", "Buying tickets", "Execution of the agreement", "Check-into a hotel"]
|
|
||||||
|
|
||||||
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:
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
Результат отработки Consumer_2:
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
Вывод: Consumer_2 нагружает меньше памяти, чем Consumer_1 и принимает сообщения гораздо быстрее, тем самым не позволяя очереди накапливать огромное количество сообщений.
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
import pika, sys, os
|
|
||||||
|
|
||||||
def main():
|
|
||||||
connection = pika.BlockingConnection(pika.ConnectionParameters(host='localhost'))
|
|
||||||
channel = connection.channel()
|
|
||||||
|
|
||||||
channel.queue_declare(queue='MelnikovLogs')
|
|
||||||
|
|
||||||
def callback(ch, method, properties, body):
|
|
||||||
print(f" [x] Получено сообщение: {body}")
|
|
||||||
|
|
||||||
channel.basic_consume(queue='MelnikovLogs', 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)
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
import pika
|
|
||||||
|
|
||||||
connection = pika.BlockingConnection(pika.ConnectionParameters('localhost'))
|
|
||||||
channel = connection.channel()
|
|
||||||
|
|
||||||
channel.queue_declare(queue='melnikov')
|
|
||||||
|
|
||||||
channel.basic_publish(exchange='',routing_key='melnikov',body='Hello, my name is Kirill, i am from ISEbd-41!')
|
|
||||||
print(" [x] Отправлено сообщение")
|
|
||||||
|
|
||||||
connection.close()
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
import pika
|
|
||||||
import sys
|
|
||||||
|
|
||||||
connection = pika.BlockingConnection(pika.ConnectionParameters(host='localhost'))
|
|
||||||
channel = connection.channel()
|
|
||||||
|
|
||||||
channel.queue_declare(queue='melnikov2', durable=True)
|
|
||||||
|
|
||||||
message = ' '.join(sys.argv[1:]) or "Hello, my name is Kirill, i am from ISEbd-41!"
|
|
||||||
channel.basic_publish(exchange='', routing_key='melnikov2', body=message, properties=pika.BasicProperties(
|
|
||||||
delivery_mode=pika.spec.PERSISTENT_DELIVERY_MODE))
|
|
||||||
print(f" [x] Отправлено {message}")
|
|
||||||
connection.close()
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
import pika
|
|
||||||
import time
|
|
||||||
|
|
||||||
connection = pika.BlockingConnection(pika.ConnectionParameters(host='localhost'))
|
|
||||||
channel = connection.channel()
|
|
||||||
|
|
||||||
channel.queue_declare(queue='melnikov2', 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='melnikov2', on_message_callback=callback)
|
|
||||||
|
|
||||||
channel.start_consuming()
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
import pika
|
|
||||||
import sys
|
|
||||||
|
|
||||||
connection = pika.BlockingConnection(pika.ConnectionParameters(host='localhost'))
|
|
||||||
channel = connection.channel()
|
|
||||||
|
|
||||||
channel.exchange_declare(exchange='MelnikovLogs', exchange_type='fanout')
|
|
||||||
|
|
||||||
message = ' '.join(sys.argv[1:]) or "Info: Hello, my name is Kirill, i am from ISEbd-41!"
|
|
||||||
channel.basic_publish(exchange='MelnikovLogs', routing_key='', body=message)
|
|
||||||
print(f" [x] Отправлено сообщение: {message}")
|
|
||||||
connection.close()
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
import pika
|
|
||||||
|
|
||||||
connection = pika.BlockingConnection(pika.ConnectionParameters(host='localhost'))
|
|
||||||
channel = connection.channel()
|
|
||||||
|
|
||||||
channel.exchange_declare(exchange='MelnikovLogs', exchange_type='fanout')
|
|
||||||
|
|
||||||
result = channel.queue_declare(queue='', exclusive=True)
|
|
||||||
queue_name = result.method.queue
|
|
||||||
|
|
||||||
channel.queue_bind(exchange='MelnikovLogs', 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()
|
|
||||||
|
Before Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 124 KiB |
|
Before Width: | Height: | Size: 126 KiB |
|
Before Width: | Height: | Size: 56 KiB |
|
Before Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 32 KiB |
|
Before Width: | Height: | Size: 128 KiB |
|
Before Width: | Height: | Size: 121 KiB |
|
Before Width: | Height: | Size: 127 KiB |
|
Before Width: | Height: | Size: 27 KiB |