[Л/Р 3] Миронов Евгений #49
456
tasks/mironov-eo/lab_3/.gitignore
vendored
Normal file
456
tasks/mironov-eo/lab_3/.gitignore
vendored
Normal file
@ -0,0 +1,456 @@
|
|||||||
|
var/result/
|
||||||
|
|
||||||
|
## 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
|
||||||
105
tasks/mironov-eo/lab_3/README.md
Normal file
105
tasks/mironov-eo/lab_3/README.md
Normal file
@ -0,0 +1,105 @@
|
|||||||
|
# Отчет по лабораторной работе №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`
|
||||||
|
6. Заложил в приложения следующую логику :
|
||||||
|
|
||||||
|
worker-1 - CRUD для сущности Company
|
||||||
|
|
||||||
|
worker-2 - CRUD для сущности Employee
|
||||||
|
|
||||||
|
К одной Company относится много Employee
|
||||||
|
|
||||||
|
Скриншоты API обоих приложений:
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## Реализация синхронного обмена
|
||||||
|
|
||||||
|
Реализовал простое хранилище, которое при инициализации обращается вызывает сихронно данные из соседнего микросервиса.
|
||||||
|
Далее эти данные используются при обработке запросов к API
|
||||||
|
|
||||||
|
```cs
|
||||||
|
public class Storage
|
||||||
|
{
|
||||||
|
private static Random rand = new Random();
|
||||||
|
|
||||||
|
public static CompanyDal[] Companies { get; set; }
|
||||||
|
|
||||||
|
public static List<EmployeeDal> Employees { get; set; }
|
||||||
|
|
||||||
|
static Storage()
|
||||||
|
{
|
||||||
|
var client = new HttpClient();
|
||||||
|
string reqUrl = $"http://worker-1:8080/Companies/";
|
||||||
|
Companies = client.GetFromJsonAsync<CompanyDal[]>(reqUrl).Result;//для простоты блокируем
|
||||||
|
|
||||||
|
Employees = new List<EmployeeDal>()
|
||||||
|
{
|
||||||
|
new EmployeeDal() { EmployeeId = Guid.NewGuid(), BirthDate = DateTime.Today.AddDays(-100), CompanyId = Companies[rand.Next(Companies.Length)].CompanyId, FullName = "Миронов Евгений Олегович", Position = "Ведущий разработчик" },
|
||||||
|
new EmployeeDal() { EmployeeId = Guid.NewGuid(), BirthDate = DateTime.Today.AddDays(-150), CompanyId = Companies[rand.Next(Companies.Length)].CompanyId, FullName = "Сидоров Петр Иванович", Position = "Уборщик" }
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Реализация 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:
|
||||||
|
companyId - берется из другого приложения. Идентификаторы совпали -> все отработало корректно
|
||||||
|
|
||||||
15
tasks/mironov-eo/lab_3/docker-compose.yml
Normal file
15
tasks/mironov-eo/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/mironov-eo/lab_3/nginx.conf
Normal file
26
tasks/mironov-eo/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/mironov-eo/lab_3/pic/1.png
Normal file
BIN
tasks/mironov-eo/lab_3/pic/1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 35 KiB |
BIN
tasks/mironov-eo/lab_3/pic/2.png
Normal file
BIN
tasks/mironov-eo/lab_3/pic/2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 35 KiB |
BIN
tasks/mironov-eo/lab_3/pic/3.png
Normal file
BIN
tasks/mironov-eo/lab_3/pic/3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 24 KiB |
BIN
tasks/mironov-eo/lab_3/pic/4.png
Normal file
BIN
tasks/mironov-eo/lab_3/pic/4.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 9.8 KiB |
BIN
tasks/mironov-eo/lab_3/pic/5.png
Normal file
BIN
tasks/mironov-eo/lab_3/pic/5.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 21 KiB |
BIN
tasks/mironov-eo/lab_3/pic/6.png
Normal file
BIN
tasks/mironov-eo/lab_3/pic/6.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 23 KiB |
12
tasks/mironov-eo/lab_3/static/index.html
Normal file
12
tasks/mironov-eo/lab_3/static/index.html
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
<!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/Companies/">Отправить запрос к worker-1</a></p>
|
||||||
|
<p><a href="/worker-2/Employees/">Отправить запрос к worker-2</a></p>
|
||||||
|
</html>
|
||||||
11
tasks/mironov-eo/lab_3/worker-1/Dockerfile
Normal file
11
tasks/mironov-eo/lab_3/worker-1/Dockerfile
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
COPY . ./
|
||||||
|
RUN dotnet restore
|
||||||
|
RUN dotnet publish -c Release -o out
|
||||||
|
|
||||||
|
FROM mcr.microsoft.com/dotnet/aspnet:8.0
|
||||||
|
WORKDIR /app
|
||||||
|
COPY --from=build-env /app/out .
|
||||||
|
ENTRYPOINT ["dotnet", "worker-1.dll"]
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
namespace worker_1.Models.Company.Create
|
||||||
|
{
|
||||||
|
public class CompanyForm
|
||||||
|
{
|
||||||
|
public string Name { get; set; }
|
||||||
|
|
||||||
|
public string FieldOfActivity { get; set; }
|
||||||
|
|
||||||
|
public string Location { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
namespace worker_1.Models.Company.Get
|
||||||
|
{
|
||||||
|
public class CompanyResult
|
||||||
|
{
|
||||||
|
public Guid CompanyId { get; set; }
|
||||||
|
|
||||||
|
public string Name { get; set; }
|
||||||
|
|
||||||
|
public string FieldOfActivity { get; set; }
|
||||||
|
|
||||||
|
public string Location { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
namespace worker_1.Models.Company.GetList
|
||||||
|
{
|
||||||
|
public class CompanyResult
|
||||||
|
{
|
||||||
|
public Guid CompanyId { get; set; }
|
||||||
|
|
||||||
|
public string Name { get; set; }
|
||||||
|
|
||||||
|
public string FieldOfActivity { get; set; }
|
||||||
|
|
||||||
|
public string Location { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
namespace worker_1.Models.Company.Update
|
||||||
|
{
|
||||||
|
public class CompanyForm
|
||||||
|
{
|
||||||
|
public string Name { get; set; }
|
||||||
|
|
||||||
|
public string FieldOfActivity { get; set; }
|
||||||
|
|
||||||
|
public string Location { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
131
tasks/mironov-eo/lab_3/worker-1/Program.cs
Normal file
131
tasks/mironov-eo/lab_3/worker-1/Program.cs
Normal file
@ -0,0 +1,131 @@
|
|||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
|
||||||
|
List<CompanyDal> companies = new()
|
||||||
|
{
|
||||||
|
new CompanyDal() { CompanyId = Guid.NewGuid(), Name = "Microsoft", FieldOfActivity = "Информационные технологии", Location = "США"},
|
||||||
|
new CompanyDal() { CompanyId = Guid.NewGuid(), Name = "Додо пицца", FieldOfActivity = "Питание", Location = "Россия"},
|
||||||
|
new CompanyDal() { CompanyId = Guid.NewGuid(), Name = "Renault", FieldOfActivity = "Автомобилестроение", Location = "Франция"},
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
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("/Companies/", () =>
|
||||||
|
{
|
||||||
|
var result = companies.Select(r => new worker_1.Models.Company.GetList.CompanyResult()
|
||||||
|
{
|
||||||
|
CompanyId = r.CompanyId,
|
||||||
|
Name = r.Name,
|
||||||
|
FieldOfActivity = r.FieldOfActivity,
|
||||||
|
Location = r.Location,
|
||||||
|
}).ToArray();
|
||||||
|
|
||||||
|
return Results.Ok(result);
|
||||||
|
})
|
||||||
|
.WithName("List")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapGet("/Companies/{companyId}", (Guid companyId) =>
|
||||||
|
{
|
||||||
|
var company = companies.FirstOrDefault(r => r.CompanyId == companyId);
|
||||||
|
if (company is null)
|
||||||
|
{
|
||||||
|
return Results.NotFound($"Не найдена компания {companyId}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Results.Json(new worker_1.Models.Company.Get.CompanyResult()
|
||||||
|
{
|
||||||
|
CompanyId = company.CompanyId,
|
||||||
|
Name = company.Name,
|
||||||
|
FieldOfActivity = company.FieldOfActivity,
|
||||||
|
Location = company.Location,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("Get")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapPost("/Companies/", ([FromBody] worker_1.Models.Company.Create.CompanyForm request) =>
|
||||||
|
{
|
||||||
|
Guid companyId = Guid.NewGuid();
|
||||||
|
companies.Add(new CompanyDal()
|
||||||
|
{
|
||||||
|
CompanyId = companyId,
|
||||||
|
FieldOfActivity = request.FieldOfActivity,
|
||||||
|
Location = request.Location,
|
||||||
|
Name = request.Name,
|
||||||
|
});
|
||||||
|
|
||||||
|
return Results.Ok(companyId);
|
||||||
|
})
|
||||||
|
.WithName("Create")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapPatch("/Companies/{companyId}", (Guid companyId, [FromBody] worker_1.Models.Company.Create.CompanyForm request) =>
|
||||||
|
{
|
||||||
|
var company = companies.FirstOrDefault(r => r.CompanyId == companyId);
|
||||||
|
if (company is null)
|
||||||
|
{
|
||||||
|
return Results.NotFound($"Не найдена компания {companyId}");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(request.Name))
|
||||||
|
{
|
||||||
|
company.Name = request.Name;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(request.Location))
|
||||||
|
{
|
||||||
|
company.Location = request.Location;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(request.FieldOfActivity))
|
||||||
|
{
|
||||||
|
company.FieldOfActivity = request.FieldOfActivity;
|
||||||
|
}
|
||||||
|
return Results.Ok(company);
|
||||||
|
})
|
||||||
|
.WithName("Update")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapDelete("/Companies/{companyId}", (Guid companyId) =>
|
||||||
|
{
|
||||||
|
var company = companies.FirstOrDefault(r => r.CompanyId == companyId);
|
||||||
|
if (company is null)
|
||||||
|
{
|
||||||
|
return Results.NotFound($"Не найдена компания {companyId}");
|
||||||
|
}
|
||||||
|
|
||||||
|
companies.Remove(company);
|
||||||
|
return Results.Ok(companyId);
|
||||||
|
})
|
||||||
|
.WithName("Delete")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.Run();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public class CompanyDal
|
||||||
|
{
|
||||||
|
public Guid CompanyId { get; set; }
|
||||||
|
|
||||||
|
public string Name { get; set; }
|
||||||
|
|
||||||
|
public string FieldOfActivity { get; set; }
|
||||||
|
|
||||||
|
public string Location { get; set; }
|
||||||
|
}
|
||||||
@ -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/mironov-eo/lab_3/worker-1/appsettings.json
Normal file
9
tasks/mironov-eo/lab_3/worker-1/appsettings.json
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.AspNetCore": "Warning"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"AllowedHosts": "*"
|
||||||
|
}
|
||||||
15
tasks/mironov-eo/lab_3/worker-1/worker-1.csproj
Normal file
15
tasks/mironov-eo/lab_3/worker-1/worker-1.csproj
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<RootNamespace>worker_1</RootNamespace>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
|
||||||
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
22
tasks/mironov-eo/lab_3/worker-1/worker-1.sln
Normal file
22
tasks/mironov-eo/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/mironov-eo/lab_3/worker-2/Dockerfile
Normal file
11
tasks/mironov-eo/lab_3/worker-2/Dockerfile
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
COPY . ./
|
||||||
|
RUN dotnet restore
|
||||||
|
RUN dotnet publish -c Release -o out
|
||||||
|
|
||||||
|
FROM mcr.microsoft.com/dotnet/aspnet:8.0
|
||||||
|
WORKDIR /app
|
||||||
|
COPY --from=build-env /app/out .
|
||||||
|
ENTRYPOINT ["dotnet", "worker-2.dll"]
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
namespace worker_2.Models.Employee.Create
|
||||||
|
{
|
||||||
|
public class EmployeeForm
|
||||||
|
{
|
||||||
|
public DateTime? BirthDate { get; set; }
|
||||||
|
|
||||||
|
public Guid CompanyId { get; set; }
|
||||||
|
|
||||||
|
public string FullName { get; set; }
|
||||||
|
|
||||||
|
public string Position { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
namespace worker_2.Models.Employee.Get
|
||||||
|
{
|
||||||
|
public class EmployeeResult
|
||||||
|
{
|
||||||
|
public Guid EmployeeId { get; set; }
|
||||||
|
|
||||||
|
public DateTime? BirthDate { get; set; }
|
||||||
|
|
||||||
|
public Guid CompanyId { get; set; }
|
||||||
|
|
||||||
|
public string FullName { get; set; }
|
||||||
|
|
||||||
|
public string Position { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
namespace worker_2.Models.Employee.GetList
|
||||||
|
{
|
||||||
|
public class EmployeeResult
|
||||||
|
{
|
||||||
|
public Guid EmployeeId { get; set; }
|
||||||
|
|
||||||
|
public DateTime? BirthDate { get; set; }
|
||||||
|
|
||||||
|
public Guid CompanyId { get; set; }
|
||||||
|
|
||||||
|
public string FullName { get; set; }
|
||||||
|
|
||||||
|
public string Position { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
namespace worker_2.Models.Employee.Update
|
||||||
|
{
|
||||||
|
public class EmployeeForm
|
||||||
|
{
|
||||||
|
public DateTime BirthDate { get; set; }
|
||||||
|
|
||||||
|
public Guid CompanyId { get; set; }
|
||||||
|
|
||||||
|
public string FullName { get; set; }
|
||||||
|
|
||||||
|
public string Position { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
172
tasks/mironov-eo/lab_3/worker-2/Program.cs
Normal file
172
tasks/mironov-eo/lab_3/worker-2/Program.cs
Normal file
@ -0,0 +1,172 @@
|
|||||||
|
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
|
||||||
|
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("/Employees/", () =>
|
||||||
|
{
|
||||||
|
var result = Storage.Employees.Select(r => new worker_2.Models.Employee.GetList.EmployeeResult()
|
||||||
|
{
|
||||||
|
CompanyId = r.CompanyId,
|
||||||
|
FullName = r.FullName,
|
||||||
|
BirthDate = r.BirthDate,
|
||||||
|
EmployeeId = r.EmployeeId,
|
||||||
|
Position = r.Position,
|
||||||
|
}).ToArray();
|
||||||
|
|
||||||
|
return Results.Ok(result);
|
||||||
|
})
|
||||||
|
.WithName("List")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapGet("/Employees/{employeeId}", (Guid employeeId) =>
|
||||||
|
{
|
||||||
|
var employee = Storage.Employees.FirstOrDefault(r => r.EmployeeId == employeeId);
|
||||||
|
if (employee is null)
|
||||||
|
{
|
||||||
|
return Results.NotFound($"Не найден работник {employeeId}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return Results.Json(new worker_2.Models.Employee.Get.EmployeeResult()
|
||||||
|
{
|
||||||
|
CompanyId = employee.CompanyId,
|
||||||
|
FullName = employee.FullName,
|
||||||
|
BirthDate = employee.BirthDate,
|
||||||
|
EmployeeId = employee.EmployeeId,
|
||||||
|
Position = employee.Position,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("Get")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapPost("/Employees/", ([FromBody] worker_2.Models.Employee.Create.EmployeeForm request) =>
|
||||||
|
{
|
||||||
|
if (Storage.Companies.FirstOrDefault(x => x.CompanyId == request.CompanyId) is null)
|
||||||
|
{
|
||||||
|
return Results.NotFound($"Не найдена компания {request.CompanyId}");
|
||||||
|
}
|
||||||
|
Guid employeeId = Guid.NewGuid();
|
||||||
|
Storage.Employees.Add(new EmployeeDal()
|
||||||
|
{
|
||||||
|
EmployeeId = employeeId,
|
||||||
|
BirthDate = request.BirthDate,
|
||||||
|
CompanyId = request.CompanyId,
|
||||||
|
FullName = request.FullName,
|
||||||
|
Position = request.Position,
|
||||||
|
});
|
||||||
|
|
||||||
|
return Results.Ok(employeeId);
|
||||||
|
})
|
||||||
|
.WithName("Create")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapPatch("/Employees/{employeeId}", (Guid employeeId, [FromBody] worker_2.Models.Employee.Create.EmployeeForm request) =>
|
||||||
|
{
|
||||||
|
var employee = Storage.Employees.FirstOrDefault(r => r.EmployeeId == employeeId);
|
||||||
|
if (employee is null)
|
||||||
|
{
|
||||||
|
return Results.NotFound($"Не найден работник {employeeId}");
|
||||||
|
}
|
||||||
|
|
||||||
|
if(Storage.Companies.FirstOrDefault(x => x.CompanyId == request.CompanyId) is null)
|
||||||
|
{
|
||||||
|
return Results.NotFound($"Не найдена компания {request.CompanyId}");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(request.FullName))
|
||||||
|
{
|
||||||
|
employee.FullName = request.FullName;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(request.Position))
|
||||||
|
{
|
||||||
|
employee.Position = request.Position;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (request.BirthDate.HasValue)
|
||||||
|
{
|
||||||
|
employee.BirthDate = request.BirthDate.Value;
|
||||||
|
}
|
||||||
|
return Results.Ok(employee);
|
||||||
|
})
|
||||||
|
.WithName("Update")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapDelete("/Employees/{employeeId}", (Guid employeeId) =>
|
||||||
|
{
|
||||||
|
var employee = Storage.Employees.FirstOrDefault(r => r.EmployeeId == employeeId);
|
||||||
|
if (employee is null)
|
||||||
|
{
|
||||||
|
return Results.NotFound($"Не найден работник {employeeId}");
|
||||||
|
}
|
||||||
|
|
||||||
|
Storage.Employees.Remove(employee);
|
||||||
|
return Results.Ok(employeeId);
|
||||||
|
})
|
||||||
|
.WithName("Delete")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.Run();
|
||||||
|
|
||||||
|
|
||||||
|
public class EmployeeDal
|
||||||
|
{
|
||||||
|
public Guid EmployeeId { get; set; }
|
||||||
|
|
||||||
|
public DateTime? BirthDate { get; set; }
|
||||||
|
|
||||||
|
public Guid CompanyId { get; set; }
|
||||||
|
|
||||||
|
public string FullName { get; set; }
|
||||||
|
|
||||||
|
public string Position { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class CompanyDal
|
||||||
|
{
|
||||||
|
public Guid CompanyId { get; set; }
|
||||||
|
|
||||||
|
public string Name { get; set; }
|
||||||
|
|
||||||
|
public string FieldOfActivity { get; set; }
|
||||||
|
|
||||||
|
public string Location { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class Storage
|
||||||
|
{
|
||||||
|
private static Random rand = new Random();
|
||||||
|
|
||||||
|
public static CompanyDal[] Companies { get; set; }
|
||||||
|
|
||||||
|
public static List<EmployeeDal> Employees { get; set; }
|
||||||
|
|
||||||
|
static Storage()
|
||||||
|
{
|
||||||
|
var client = new HttpClient();
|
||||||
|
string reqUrl = $"http://worker-1:8080/Companies/";
|
||||||
|
Companies = client.GetFromJsonAsync<CompanyDal[]>(reqUrl).Result;//для простоты блокируем
|
||||||
|
|
||||||
|
Employees = new List<EmployeeDal>()
|
||||||
|
{
|
||||||
|
new EmployeeDal() { EmployeeId = Guid.NewGuid(), BirthDate = DateTime.Today.AddDays(-100), CompanyId = Companies[rand.Next(Companies.Length)].CompanyId, FullName = "Миронов Евгений Олегович", Position = "Ведущий разработчик" },
|
||||||
|
new EmployeeDal() { EmployeeId = Guid.NewGuid(), BirthDate = DateTime.Today.AddDays(-150), CompanyId = Companies[rand.Next(Companies.Length)].CompanyId, FullName = "Сидоров Петр Иванович", Position = "Уборщик" }
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@ -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/mironov-eo/lab_3/worker-2/appsettings.json
Normal file
9
tasks/mironov-eo/lab_3/worker-2/appsettings.json
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.AspNetCore": "Warning"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"AllowedHosts": "*"
|
||||||
|
}
|
||||||
15
tasks/mironov-eo/lab_3/worker-2/worker-2.csproj
Normal file
15
tasks/mironov-eo/lab_3/worker-2/worker-2.csproj
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<RootNamespace>worker_2</RootNamespace>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
|
||||||
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
22
tasks/mironov-eo/lab_3/worker-2/worker-2.sln
Normal file
22
tasks/mironov-eo/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
|
||||||
Loading…
Reference in New Issue
Block a user