Compare commits
No commits in common. "main" and "mochalov_danila_lab_2" have entirely different histories.
main
...
mochalov_d
3
dozorova_alena_lab_6/.gitignore → .gitignore
vendored
3
dozorova_alena_lab_6/.gitignore → .gitignore
vendored
@ -7,6 +7,3 @@
|
|||||||
/dozorova_alena_lab_2/ConsoleApp2/.vs
|
/dozorova_alena_lab_2/ConsoleApp2/.vs
|
||||||
/dozorova_alena_lab_2/ConsoleApp2/bin
|
/dozorova_alena_lab_2/ConsoleApp2/bin
|
||||||
/dozorova_alena_lab_2/ConsoleApp2/obj
|
/dozorova_alena_lab_2/ConsoleApp2/obj
|
||||||
/dozorova_alena_lab_6/ConsoleApp1/.vs
|
|
||||||
/dozorova_alena_lab_6/ConsoleApp1/bin
|
|
||||||
/dozorova_alena_lab_6/ConsoleApp1/obj
|
|
||||||
@ -1 +0,0 @@
|
|||||||
main.py
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
<component name="InspectionProjectProfileManager">
|
|
||||||
<profile version="1.0">
|
|
||||||
<option name="myName" value="Project Default" />
|
|
||||||
<inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="WARNING" enabled_by_default="true">
|
|
||||||
<option name="ignoredIdentifiers">
|
|
||||||
<list>
|
|
||||||
<option value="str.__pos__" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</inspection_tool>
|
|
||||||
</profile>
|
|
||||||
</component>
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
<component name="InspectionProjectProfileManager">
|
|
||||||
<settings>
|
|
||||||
<option name="USE_PROJECT_PROFILE" value="false" />
|
|
||||||
<version value="1.0" />
|
|
||||||
</settings>
|
|
||||||
</component>
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (tukaeva_alfiya_lab_4)" project-jdk-type="Python SDK" />
|
|
||||||
</project>
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
# Лабораторная работа 1
|
|
||||||
|
|
||||||
## Описание
|
|
||||||
Данная лабораторная работа предназначена для настройки 3 сервисов — **Gitea**, **Redmine** и БД **MySQL** — с использованием Docker Compose. **Gitea** — это лёгкая система контроля версий с веб-интерфейсом, а **Redmine** — система управления проектами и задачами, а также баг-трекер. **MySQL** — база данных, используемая Redmine для хранения данных.
|
|
||||||
|
|
||||||
## Запуск проекта
|
|
||||||
1. Убедитесь, что у вас установлены **Docker** и **Docker Compose**.
|
|
||||||
2. Клонируйте репозиторий с данным проектом или создайте файл `docker-compose.yml` с конфигурацией, представленной там.
|
|
||||||
3. В командной строке перейдите в директорию с файлом `docker-compose.yml`.
|
|
||||||
4. Запустите команды:
|
|
||||||
```bash
|
|
||||||
docker-compose up -d
|
|
||||||
```
|
|
||||||
Эта команда запустит контейнеры в фоновом режиме.
|
|
||||||
5. После запуска:
|
|
||||||
- Gitea будет доступен по адресу: [http://localhost:3000](http://localhost:3000)
|
|
||||||
- Redmine будет доступен по адресу: [http://localhost:8080](http://localhost:8080)
|
|
||||||
|
|
||||||
## Конфигурация
|
|
||||||
В файле `docker-compose.yml` определены следующие сервисы:
|
|
||||||
- **Gitea**:
|
|
||||||
- Запускается из официального образа `gitea/gitea:latest`.
|
|
||||||
- Использует `SQLite` для хранения данных.
|
|
||||||
- Настроен на порту 3000 для веб-доступа и 2222 для SSH.
|
|
||||||
- **Redmine**:
|
|
||||||
- Запускается из официального образа `redmine`.
|
|
||||||
- Подключен к базе данных MySQL.
|
|
||||||
- Доступен на порту 8080.
|
|
||||||
- **MySQL**:
|
|
||||||
- Запускается из образа `mysql:8.0`.
|
|
||||||
- Используется Redmine для хранения данных.
|
|
||||||
- Настроен с дефолтными пользователем, базой и паролем.
|
|
||||||
|
|
||||||
## Остановка проекта
|
|
||||||
Для остановки контейнеров запустите:
|
|
||||||
```bash
|
|
||||||
docker-compose down
|
|
||||||
```
|
|
||||||
Это завершит работу всех контейнеров и освободит порты.
|
|
||||||
|
|
||||||
## Примечания
|
|
||||||
- При необходимости вы можете изменить порты или другие параметры, отредактировав файл `docker-compose.yml`.
|
|
||||||
- Данные хранятся в именованных томах `gitea_data` и `db_data`, что позволяет сохранять данные при перезапуске контейнеров.
|
|
||||||
- Ссылка на демонстрацию работы программы: https://vk.com/video215756667_456239451?list=ln-AMZSRDejYptijuOt9u
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
version: '3.9' # Версия Docker Compose
|
|
||||||
|
|
||||||
services:
|
|
||||||
# Gitea сервис
|
|
||||||
gitea:
|
|
||||||
image: gitea/gitea:latest # Образ Gitea для запуска сервиса
|
|
||||||
container_name: gitea # Имя контейнера для удобства
|
|
||||||
environment: # Переменные среды
|
|
||||||
USER_UID: 1000 # UID пользователя внутри контейнера
|
|
||||||
USER_GID: 1000 # GID пользователя внутри контейнера
|
|
||||||
GITEA__database__DB_TYPE: sqlite3 # Тип бд (SQLite для простоты)
|
|
||||||
GITEA__database__PATH: /data/gitea/gitea.db # Путь к базе данных
|
|
||||||
GITEA__server__ROOT_URL: http://localhost:3000 # URL для доступа
|
|
||||||
GITEA__server__HTTP_PORT: 3000 # Порт для веб-интерфейса
|
|
||||||
volumes:
|
|
||||||
- gitea_data:/data # Монтирование директории данных для сохранения данных
|
|
||||||
ports:
|
|
||||||
- "3000:3000" # Порт для доступа к веб-интерфейсу Gitea
|
|
||||||
- "2222:22" # SSH порт для клонирования репозиториев
|
|
||||||
restart: always # Автоматический перезапуск контейнера в случае сбоя
|
|
||||||
|
|
||||||
# Redmine сервис
|
|
||||||
redmine:
|
|
||||||
image: redmine # Образ Redmine для запуска сервиса
|
|
||||||
restart: always # Автоматический перезапуск контейнера
|
|
||||||
ports:
|
|
||||||
- 8080:3000 # Порт для доступа к веб-интерфейсу
|
|
||||||
environment: # Переменные среды
|
|
||||||
REDMINE_DB_MYSQL: db # Имя хоста бд для подключения
|
|
||||||
REDMINE_DB_PASSWORD: example # Пароль для подключения к базе данных
|
|
||||||
|
|
||||||
# MySQL база данных для Redmine
|
|
||||||
db:
|
|
||||||
image: mysql:8.0 # Образ MySQL для бд
|
|
||||||
restart: always # Автоматический перезапуск контейнера
|
|
||||||
environment: # Переменные среды
|
|
||||||
MYSQL_ROOT_PASSWORD: example # Пароль пользователя root для MySQL
|
|
||||||
MYSQL_DATABASE: redmine # Имя бд для Redmine
|
|
||||||
MYSQL_USER: user # Пользователь MySQL
|
|
||||||
MYSQL_PASSWORD: password # Пароль для пользователя MySQL
|
|
||||||
volumes:
|
|
||||||
- db_data:/var/lib/mysql # Монтирование для сохранения данных бд
|
|
||||||
|
|
||||||
volumes: # Именованные тома
|
|
||||||
gitea_data: # Том для данных Gitea
|
|
||||||
db_data: # Том для данных MySQL
|
|
||||||
92
afanasev_dmitry_lab_2/.gitignore
vendored
92
afanasev_dmitry_lab_2/.gitignore
vendored
@ -1,92 +0,0 @@
|
|||||||
data/
|
|
||||||
|
|
||||||
##############################
|
|
||||||
## Java
|
|
||||||
##############################
|
|
||||||
.mtj.tmp/
|
|
||||||
*.class
|
|
||||||
*.jar
|
|
||||||
*.war
|
|
||||||
*.ear
|
|
||||||
*.nar
|
|
||||||
hs_err_pid*
|
|
||||||
replay_pid*
|
|
||||||
|
|
||||||
##############################
|
|
||||||
## Maven
|
|
||||||
##############################
|
|
||||||
target/
|
|
||||||
pom.xml.tag
|
|
||||||
pom.xml.releaseBackup
|
|
||||||
pom.xml.versionsBackup
|
|
||||||
pom.xml.next
|
|
||||||
pom.xml.bak
|
|
||||||
release.properties
|
|
||||||
dependency-reduced-pom.xml
|
|
||||||
buildNumber.properties
|
|
||||||
.mvn/timing.properties
|
|
||||||
.mvn/wrapper/maven-wrapper.jar
|
|
||||||
|
|
||||||
##############################
|
|
||||||
## Gradle
|
|
||||||
##############################
|
|
||||||
bin/
|
|
||||||
build/
|
|
||||||
.gradle
|
|
||||||
.gradletasknamecache
|
|
||||||
gradle-app.setting
|
|
||||||
!gradle-wrapper.jar
|
|
||||||
|
|
||||||
##############################
|
|
||||||
## IntelliJ
|
|
||||||
##############################
|
|
||||||
out/
|
|
||||||
.idea/
|
|
||||||
.idea_modules/
|
|
||||||
*.iml
|
|
||||||
*.ipr
|
|
||||||
*.iws
|
|
||||||
|
|
||||||
##############################
|
|
||||||
## Eclipse
|
|
||||||
##############################
|
|
||||||
.settings/
|
|
||||||
bin/
|
|
||||||
tmp/
|
|
||||||
.metadata
|
|
||||||
.classpath
|
|
||||||
.project
|
|
||||||
*.tmp
|
|
||||||
*.bak
|
|
||||||
*.swp
|
|
||||||
*~.nib
|
|
||||||
local.properties
|
|
||||||
.loadpath
|
|
||||||
.factorypath
|
|
||||||
|
|
||||||
##############################
|
|
||||||
## NetBeans
|
|
||||||
##############################
|
|
||||||
nbproject/private/
|
|
||||||
build/
|
|
||||||
nbbuild/
|
|
||||||
dist/
|
|
||||||
nbdist/
|
|
||||||
nbactions.xml
|
|
||||||
nb-configuration.xml
|
|
||||||
|
|
||||||
##############################
|
|
||||||
## Visual Studio Code
|
|
||||||
##############################
|
|
||||||
.vscode/
|
|
||||||
.code-workspace
|
|
||||||
|
|
||||||
##############################
|
|
||||||
## OS X
|
|
||||||
##############################
|
|
||||||
.DS_Store
|
|
||||||
|
|
||||||
##############################
|
|
||||||
## Miscellaneous
|
|
||||||
##############################
|
|
||||||
*.log
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
# Лабораторная работа 2
|
|
||||||
|
|
||||||
## Описание
|
|
||||||
Данная лабораторная работа предназначена для настройки 2 сервисов (простейшего распределенного приложения) с использованием Docker Compose. **FirstService** — ищет в каталоге /var/data файл с наибольшим количеством строк и перекладывает его в /var/result/data.txt. **SecondService** — ищет наименьшее число из файла /var/result/data.txt (сгенерирован 1-ым сервисом) и сохраняет его третью степень в /var/result/result.txt.
|
|
||||||
|
|
||||||
## Запуск проекта
|
|
||||||
1. Убедитесь, что у вас установлены **Docker** и **Docker Compose**.
|
|
||||||
2. Клонируйте репозиторий с данным проектом.
|
|
||||||
3. В командной строке перейдите в директорию с файлом `docker-compose.yml`.
|
|
||||||
4. Запустите команды:
|
|
||||||
```bash
|
|
||||||
docker-compose up -d
|
|
||||||
```
|
|
||||||
Эта команда запустит контейнеры в фоновом режиме.
|
|
||||||
5. После запуска:
|
|
||||||
- Посмотреть логи первого сервиса о том, что файл создался успешно.
|
|
||||||
- Посмотреть логи второго сервиса о том, что он обработал созданный первым сервисом файл.
|
|
||||||
|
|
||||||
## Конфигурация
|
|
||||||
В файле `docker-compose.yml` определены следующие сервисы:
|
|
||||||
- **FirstService**:
|
|
||||||
- Создает образ из директории `firstService`.
|
|
||||||
- Использует локальную директорию `/var/data` и общую `/var/result` для хранения данных.
|
|
||||||
- **SecondService**:
|
|
||||||
- Создает образ из директории `secondService`.
|
|
||||||
- Использует общую `/var/result` директорию для хранения данных.
|
|
||||||
- Запускается после первого сервиса.
|
|
||||||
|
|
||||||
## Остановка проекта
|
|
||||||
Для остановки контейнеров запустите:
|
|
||||||
```bash
|
|
||||||
docker-compose down
|
|
||||||
```
|
|
||||||
Это завершит работу всех контейнеров.
|
|
||||||
|
|
||||||
## Примечания
|
|
||||||
- При необходимости можно изменить директорию с данными или другие параметры, отредактировав файл `docker-compose.yml`.
|
|
||||||
- Ссылка на демонстрацию работы программы: https://vk.com/video215756667_456239452?list=ln-rAyQWJj8q7ezqCaZzL
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
version: '3.9'
|
|
||||||
|
|
||||||
services:
|
|
||||||
first-service:
|
|
||||||
build: ./firstService # Путь к докер-файлу 1 приложения
|
|
||||||
volumes:
|
|
||||||
- D:/java/DAS_2024_1/afanasev_dmitry_lab_2/data:/var/data # Монтируем директорию с данными
|
|
||||||
- common-volume:/var/result # Монтируем общую директорию (нужна 2-му сервису для работы)
|
|
||||||
second-service:
|
|
||||||
build: ./secondService # Путь к докер-файлу 2 приложения
|
|
||||||
volumes:
|
|
||||||
- common-volume:/var/result # Монтируем общую директорию (нужна 2-му сервису для работы)
|
|
||||||
depends_on:
|
|
||||||
- first-service # Запуск после первого сервиса
|
|
||||||
|
|
||||||
volumes: # Именованные тома
|
|
||||||
common-volume: # Общий для 2-ух сервисов
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
# Используем образ с Java 17
|
|
||||||
FROM bellsoft/liberica-openjdk-alpine:17.0.8
|
|
||||||
|
|
||||||
# Создаем директорию для исходных файлов
|
|
||||||
RUN mkdir /var/data
|
|
||||||
|
|
||||||
# Создаем директорию для приложения
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Копируем файлы приложения в контейнер
|
|
||||||
COPY src /app/src
|
|
||||||
|
|
||||||
# Компилируем приложение
|
|
||||||
RUN javac /app/src/FirstService.java
|
|
||||||
|
|
||||||
# Определяем команду для запуска приложения
|
|
||||||
CMD ["java", "-cp", "/app/src", "FirstService"]
|
|
||||||
@ -1,52 +0,0 @@
|
|||||||
import java.io.*;
|
|
||||||
import java.nio.file.*;
|
|
||||||
|
|
||||||
public class FirstService {
|
|
||||||
// 1. Ищет в каталоге /var/data файл с наибольшим количеством строк и перекладывает его в /var/result/data.txt.
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
Path sourceDir = Paths.get("/var/data");
|
|
||||||
Path destinationDir = Paths.get("/var/result");
|
|
||||||
Path destinationFile = destinationDir.resolve("data.txt");
|
|
||||||
Path largestFile = null;
|
|
||||||
long maxLineCount = 0;
|
|
||||||
|
|
||||||
try {
|
|
||||||
// существует ли каталог /var/result, если нет, создаем
|
|
||||||
if (!Files.exists(destinationDir)) {
|
|
||||||
Files.createDirectories(destinationDir);
|
|
||||||
} else {
|
|
||||||
// иначе чистим
|
|
||||||
try (DirectoryStream<Path> stream = Files.newDirectoryStream(destinationDir)) {
|
|
||||||
for (Path file : stream) {
|
|
||||||
Files.delete(file);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// поиск файла с наибольшим количеством строк в каталоге /var/data
|
|
||||||
try (DirectoryStream<Path> stream = Files.newDirectoryStream(sourceDir)) {
|
|
||||||
for (Path file : stream) {
|
|
||||||
if (Files.isRegularFile(file)) {
|
|
||||||
long lineCount = Files.lines(file).count();
|
|
||||||
if (lineCount > maxLineCount) {
|
|
||||||
maxLineCount = lineCount;
|
|
||||||
largestFile = file;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// копируем файл с наибольшим количеством строк в /var/result/data.txt
|
|
||||||
if (largestFile != null) {
|
|
||||||
Files.copy(largestFile, destinationFile, StandardCopyOption.REPLACE_EXISTING);
|
|
||||||
System.out.println("Файл " + largestFile + " скопирован в " + destinationFile);
|
|
||||||
} else {
|
|
||||||
System.out.println("В каталоге " + sourceDir + " нет файлов.");
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
# Используем образ с Java 17
|
|
||||||
FROM bellsoft/liberica-openjdk-alpine:17.0.8
|
|
||||||
|
|
||||||
# Создаем директорию для исходных файлов
|
|
||||||
RUN mkdir /var/data
|
|
||||||
|
|
||||||
# Создаем директорию для приложения
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Копируем файлы приложения в контейнер
|
|
||||||
COPY src /app/src
|
|
||||||
|
|
||||||
# Компилируем приложение
|
|
||||||
RUN javac /app/src/SecondService.java
|
|
||||||
|
|
||||||
# Определяем команду для запуска приложения
|
|
||||||
CMD ["java", "-cp", "/app/src", "SecondService"]
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
import java.io.*;
|
|
||||||
import java.nio.file.*;
|
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
public class SecondService {
|
|
||||||
// 2. Ищет наименьшее число из файла /var/result/data.txt и сохраняет его третью степень в /var/result/result.txt.
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
Path sourceFile = Paths.get("/var/result/data.txt");
|
|
||||||
Path destinationDir = Paths.get("/var/result");
|
|
||||||
Path destinationFile = destinationDir.resolve("result.txt");
|
|
||||||
|
|
||||||
try {
|
|
||||||
// создание /var/result, если не существует
|
|
||||||
if (!Files.exists(destinationDir)) {
|
|
||||||
Files.createDirectories(destinationDir);
|
|
||||||
}
|
|
||||||
|
|
||||||
// читаем числа из файла и находим наименьшее
|
|
||||||
List<Integer> numbers = new ArrayList<>();
|
|
||||||
try (BufferedReader reader = Files.newBufferedReader(sourceFile)) {
|
|
||||||
String line;
|
|
||||||
while ((line = reader.readLine()) != null) {
|
|
||||||
try {
|
|
||||||
numbers.add(Integer.parseInt(line.trim()));
|
|
||||||
} catch (NumberFormatException e) {
|
|
||||||
System.out.println("Некорректная строка: " + line);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!numbers.isEmpty()) {
|
|
||||||
// находим наименьшее число и его третью степень
|
|
||||||
int minNumber = Collections.min(numbers);
|
|
||||||
int minNumberCubed = (int) Math.pow(minNumber, 3);
|
|
||||||
|
|
||||||
// записываем результат в /var/result/result.txt
|
|
||||||
try (BufferedWriter writer = Files.newBufferedWriter(destinationFile)) {
|
|
||||||
writer.write(String.valueOf(minNumberCubed));
|
|
||||||
System.out.println("Третья степень наименьшего числа - " + minNumber + " (" + minNumberCubed +
|
|
||||||
") сохранена в " + destinationFile);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
System.out.println("Файл " + sourceFile + " пуст или не содержит чисел.");
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
# Лабораторная работа 3
|
|
||||||
|
|
||||||
## Описание
|
|
||||||
Данная лабораторная работа предназначена для настройки 3 сервисов — **Melon**, **Water** и прокси-сервер **Nginx** — с использованием Docker Compose. **Melon** — сервис с дынями, где для каждого свой арбуз, а **Water** — сервис с водой и связанных с ними арбузами. **Nginx** — прокси-сервер, работающий на Unix-подобных операционных системах.
|
|
||||||
|
|
||||||
## Запуск проекта
|
|
||||||
1. Убедитесь, что у вас установлены **Docker** и **Docker Compose**.
|
|
||||||
2. Клонируйте репозиторий с данным проектом.
|
|
||||||
3. В командной строке перейдите в директорию с файлом `docker-compose.yml`.
|
|
||||||
4. Запустите команды:
|
|
||||||
```bash
|
|
||||||
docker-compose up -d
|
|
||||||
```
|
|
||||||
Эта команда запустит контейнеры в фоновом режиме.
|
|
||||||
5. После запуска:
|
|
||||||
- Melon будет доступен по адресу: [http://localhost:8080](http://localhost:8080)
|
|
||||||
- Water будет доступен по адресу: [http://localhost:8081](http://localhost:8081)
|
|
||||||
|
|
||||||
## Конфигурация
|
|
||||||
В файле `docker-compose.yml` определены следующие сервисы:
|
|
||||||
- **Melon**:
|
|
||||||
- Настроен на порту 8080 для веб-доступа.
|
|
||||||
- Обращается к **Nginx** для доступа к сервису **Water**.
|
|
||||||
- Реализует базовые CRUD-операции.
|
|
||||||
- **Water**:
|
|
||||||
- Настроен на порту 8081 для веб-доступа.
|
|
||||||
- Реализует базовые CRUD-операции.
|
|
||||||
- **Nginx**:
|
|
||||||
- Запускается из образа `nginx`.
|
|
||||||
- Используется для проксирования запросов.
|
|
||||||
|
|
||||||
## Остановка проекта
|
|
||||||
Для остановки контейнеров запустите:
|
|
||||||
```bash
|
|
||||||
docker-compose down
|
|
||||||
```
|
|
||||||
Это завершит работу всех контейнеров и освободит порты.
|
|
||||||
|
|
||||||
## Примечания
|
|
||||||
- При необходимости вы можете изменить порты или другие параметры, отредактировав файл `docker-compose.yml`.
|
|
||||||
- Ссылка на демонстрацию работы программы: https://vk.com/video215756667_456239453?list=ln-6zVfNOSwMQtpVWKkGe
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
version: '3.9'
|
|
||||||
services:
|
|
||||||
melon:
|
|
||||||
build: ./melon
|
|
||||||
ports:
|
|
||||||
- "8080:8080"
|
|
||||||
expose: # Указывает, какой порт будет открыт внутри контейнера
|
|
||||||
- 8080
|
|
||||||
|
|
||||||
water:
|
|
||||||
build: ./water
|
|
||||||
ports:
|
|
||||||
- "8081:8081"
|
|
||||||
expose: # Указывает, какой порт будет открыт внутри контейнера
|
|
||||||
- 8081
|
|
||||||
|
|
||||||
nginx:
|
|
||||||
image: nginx
|
|
||||||
ports:
|
|
||||||
- "80:80"
|
|
||||||
volumes:
|
|
||||||
- ./nginx.conf:/etc/nginx/nginx.conf
|
|
||||||
depends_on:
|
|
||||||
- melon
|
|
||||||
- water
|
|
||||||
2
afanasev_dmitry_lab_3/melon/.gitattributes
vendored
2
afanasev_dmitry_lab_3/melon/.gitattributes
vendored
@ -1,2 +0,0 @@
|
|||||||
/mvnw text eol=lf
|
|
||||||
*.cmd text eol=crlf
|
|
||||||
33
afanasev_dmitry_lab_3/melon/.gitignore
vendored
33
afanasev_dmitry_lab_3/melon/.gitignore
vendored
@ -1,33 +0,0 @@
|
|||||||
HELP.md
|
|
||||||
target/
|
|
||||||
!.mvn/wrapper/maven-wrapper.jar
|
|
||||||
!**/src/main/**/target/
|
|
||||||
!**/src/test/**/target/
|
|
||||||
|
|
||||||
### STS ###
|
|
||||||
.apt_generated
|
|
||||||
.classpath
|
|
||||||
.factorypath
|
|
||||||
.project
|
|
||||||
.settings
|
|
||||||
.springBeans
|
|
||||||
.sts4-cache
|
|
||||||
|
|
||||||
### IntelliJ IDEA ###
|
|
||||||
.idea
|
|
||||||
*.iws
|
|
||||||
*.iml
|
|
||||||
*.ipr
|
|
||||||
|
|
||||||
### NetBeans ###
|
|
||||||
/nbproject/private/
|
|
||||||
/nbbuild/
|
|
||||||
/dist/
|
|
||||||
/nbdist/
|
|
||||||
/.nb-gradle/
|
|
||||||
build/
|
|
||||||
!**/src/main/**/build/
|
|
||||||
!**/src/test/**/build/
|
|
||||||
|
|
||||||
### VS Code ###
|
|
||||||
.vscode/
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
# Licensed to the Apache Software Foundation (ASF) under one
|
|
||||||
# or more contributor license agreements. See the NOTICE file
|
|
||||||
# distributed with this work for additional information
|
|
||||||
# regarding copyright ownership. The ASF licenses this file
|
|
||||||
# to you under the Apache License, Version 2.0 (the
|
|
||||||
# "License"); you may not use this file except in compliance
|
|
||||||
# with the License. You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing,
|
|
||||||
# software distributed under the License is distributed on an
|
|
||||||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
# KIND, either express or implied. See the License for the
|
|
||||||
# specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
wrapperVersion=3.3.2
|
|
||||||
distributionType=only-script
|
|
||||||
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
FROM bellsoft/liberica-openjdk-alpine:17.0.8
|
|
||||||
ADD target/melon-0.0.1-SNAPSHOT.jar /app/
|
|
||||||
CMD ["java", "-Xmx200m", "-jar", "/app/melon-0.0.1-SNAPSHOT.jar"]
|
|
||||||
WORKDIR /app
|
|
||||||
259
afanasev_dmitry_lab_3/melon/mvnw
vendored
259
afanasev_dmitry_lab_3/melon/mvnw
vendored
@ -1,259 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
# Licensed to the Apache Software Foundation (ASF) under one
|
|
||||||
# or more contributor license agreements. See the NOTICE file
|
|
||||||
# distributed with this work for additional information
|
|
||||||
# regarding copyright ownership. The ASF licenses this file
|
|
||||||
# to you under the Apache License, Version 2.0 (the
|
|
||||||
# "License"); you may not use this file except in compliance
|
|
||||||
# with the License. You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing,
|
|
||||||
# software distributed under the License is distributed on an
|
|
||||||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
# KIND, either express or implied. See the License for the
|
|
||||||
# specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
# Apache Maven Wrapper startup batch script, version 3.3.2
|
|
||||||
#
|
|
||||||
# Optional ENV vars
|
|
||||||
# -----------------
|
|
||||||
# JAVA_HOME - location of a JDK home dir, required when download maven via java source
|
|
||||||
# MVNW_REPOURL - repo url base for downloading maven distribution
|
|
||||||
# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
|
|
||||||
# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
set -euf
|
|
||||||
[ "${MVNW_VERBOSE-}" != debug ] || set -x
|
|
||||||
|
|
||||||
# OS specific support.
|
|
||||||
native_path() { printf %s\\n "$1"; }
|
|
||||||
case "$(uname)" in
|
|
||||||
CYGWIN* | MINGW*)
|
|
||||||
[ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
|
|
||||||
native_path() { cygpath --path --windows "$1"; }
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# set JAVACMD and JAVACCMD
|
|
||||||
set_java_home() {
|
|
||||||
# For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
|
|
||||||
if [ -n "${JAVA_HOME-}" ]; then
|
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ]; then
|
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
|
||||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
|
||||||
JAVACCMD="$JAVA_HOME/jre/sh/javac"
|
|
||||||
else
|
|
||||||
JAVACMD="$JAVA_HOME/bin/java"
|
|
||||||
JAVACCMD="$JAVA_HOME/bin/javac"
|
|
||||||
|
|
||||||
if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
|
|
||||||
echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
|
|
||||||
echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
JAVACMD="$(
|
|
||||||
'set' +e
|
|
||||||
'unset' -f command 2>/dev/null
|
|
||||||
'command' -v java
|
|
||||||
)" || :
|
|
||||||
JAVACCMD="$(
|
|
||||||
'set' +e
|
|
||||||
'unset' -f command 2>/dev/null
|
|
||||||
'command' -v javac
|
|
||||||
)" || :
|
|
||||||
|
|
||||||
if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
|
|
||||||
echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# hash string like Java String::hashCode
|
|
||||||
hash_string() {
|
|
||||||
str="${1:-}" h=0
|
|
||||||
while [ -n "$str" ]; do
|
|
||||||
char="${str%"${str#?}"}"
|
|
||||||
h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
|
|
||||||
str="${str#?}"
|
|
||||||
done
|
|
||||||
printf %x\\n $h
|
|
||||||
}
|
|
||||||
|
|
||||||
verbose() { :; }
|
|
||||||
[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
|
|
||||||
|
|
||||||
die() {
|
|
||||||
printf %s\\n "$1" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
trim() {
|
|
||||||
# MWRAPPER-139:
|
|
||||||
# Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
|
|
||||||
# Needed for removing poorly interpreted newline sequences when running in more
|
|
||||||
# exotic environments such as mingw bash on Windows.
|
|
||||||
printf "%s" "${1}" | tr -d '[:space:]'
|
|
||||||
}
|
|
||||||
|
|
||||||
# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
|
|
||||||
while IFS="=" read -r key value; do
|
|
||||||
case "${key-}" in
|
|
||||||
distributionUrl) distributionUrl=$(trim "${value-}") ;;
|
|
||||||
distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
|
|
||||||
esac
|
|
||||||
done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
|
|
||||||
[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
|
|
||||||
|
|
||||||
case "${distributionUrl##*/}" in
|
|
||||||
maven-mvnd-*bin.*)
|
|
||||||
MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
|
|
||||||
case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
|
|
||||||
*AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
|
|
||||||
:Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
|
|
||||||
:Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
|
|
||||||
:Linux*x86_64*) distributionPlatform=linux-amd64 ;;
|
|
||||||
*)
|
|
||||||
echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
|
|
||||||
distributionPlatform=linux-amd64
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
|
|
||||||
;;
|
|
||||||
maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
|
|
||||||
*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# apply MVNW_REPOURL and calculate MAVEN_HOME
|
|
||||||
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
|
|
||||||
[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
|
|
||||||
distributionUrlName="${distributionUrl##*/}"
|
|
||||||
distributionUrlNameMain="${distributionUrlName%.*}"
|
|
||||||
distributionUrlNameMain="${distributionUrlNameMain%-bin}"
|
|
||||||
MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
|
|
||||||
MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
|
|
||||||
|
|
||||||
exec_maven() {
|
|
||||||
unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
|
|
||||||
exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
|
|
||||||
}
|
|
||||||
|
|
||||||
if [ -d "$MAVEN_HOME" ]; then
|
|
||||||
verbose "found existing MAVEN_HOME at $MAVEN_HOME"
|
|
||||||
exec_maven "$@"
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "${distributionUrl-}" in
|
|
||||||
*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
|
|
||||||
*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# prepare tmp dir
|
|
||||||
if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
|
|
||||||
clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
|
|
||||||
trap clean HUP INT TERM EXIT
|
|
||||||
else
|
|
||||||
die "cannot create temp dir"
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir -p -- "${MAVEN_HOME%/*}"
|
|
||||||
|
|
||||||
# Download and Install Apache Maven
|
|
||||||
verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
|
|
||||||
verbose "Downloading from: $distributionUrl"
|
|
||||||
verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
|
|
||||||
|
|
||||||
# select .zip or .tar.gz
|
|
||||||
if ! command -v unzip >/dev/null; then
|
|
||||||
distributionUrl="${distributionUrl%.zip}.tar.gz"
|
|
||||||
distributionUrlName="${distributionUrl##*/}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# verbose opt
|
|
||||||
__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
|
|
||||||
[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
|
|
||||||
|
|
||||||
# normalize http auth
|
|
||||||
case "${MVNW_PASSWORD:+has-password}" in
|
|
||||||
'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
|
|
||||||
has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
|
|
||||||
verbose "Found wget ... using wget"
|
|
||||||
wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
|
|
||||||
elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
|
|
||||||
verbose "Found curl ... using curl"
|
|
||||||
curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
|
|
||||||
elif set_java_home; then
|
|
||||||
verbose "Falling back to use Java to download"
|
|
||||||
javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
|
|
||||||
targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
|
|
||||||
cat >"$javaSource" <<-END
|
|
||||||
public class Downloader extends java.net.Authenticator
|
|
||||||
{
|
|
||||||
protected java.net.PasswordAuthentication getPasswordAuthentication()
|
|
||||||
{
|
|
||||||
return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
|
|
||||||
}
|
|
||||||
public static void main( String[] args ) throws Exception
|
|
||||||
{
|
|
||||||
setDefault( new Downloader() );
|
|
||||||
java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
END
|
|
||||||
# For Cygwin/MinGW, switch paths to Windows format before running javac and java
|
|
||||||
verbose " - Compiling Downloader.java ..."
|
|
||||||
"$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
|
|
||||||
verbose " - Running Downloader.java ..."
|
|
||||||
"$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If specified, validate the SHA-256 sum of the Maven distribution zip file
|
|
||||||
if [ -n "${distributionSha256Sum-}" ]; then
|
|
||||||
distributionSha256Result=false
|
|
||||||
if [ "$MVN_CMD" = mvnd.sh ]; then
|
|
||||||
echo "Checksum validation is not supported for maven-mvnd." >&2
|
|
||||||
echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
|
|
||||||
exit 1
|
|
||||||
elif command -v sha256sum >/dev/null; then
|
|
||||||
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then
|
|
||||||
distributionSha256Result=true
|
|
||||||
fi
|
|
||||||
elif command -v shasum >/dev/null; then
|
|
||||||
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
|
|
||||||
distributionSha256Result=true
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
|
|
||||||
echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
if [ $distributionSha256Result = false ]; then
|
|
||||||
echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
|
|
||||||
echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# unzip and move
|
|
||||||
if command -v unzip >/dev/null; then
|
|
||||||
unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
|
|
||||||
else
|
|
||||||
tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
|
|
||||||
fi
|
|
||||||
printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url"
|
|
||||||
mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
|
|
||||||
|
|
||||||
clean || :
|
|
||||||
exec_maven "$@"
|
|
||||||
149
afanasev_dmitry_lab_3/melon/mvnw.cmd
vendored
149
afanasev_dmitry_lab_3/melon/mvnw.cmd
vendored
@ -1,149 +0,0 @@
|
|||||||
<# : batch portion
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
@REM Licensed to the Apache Software Foundation (ASF) under one
|
|
||||||
@REM or more contributor license agreements. See the NOTICE file
|
|
||||||
@REM distributed with this work for additional information
|
|
||||||
@REM regarding copyright ownership. The ASF licenses this file
|
|
||||||
@REM to you under the Apache License, Version 2.0 (the
|
|
||||||
@REM "License"); you may not use this file except in compliance
|
|
||||||
@REM with the License. You may obtain a copy of the License at
|
|
||||||
@REM
|
|
||||||
@REM http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
@REM
|
|
||||||
@REM Unless required by applicable law or agreed to in writing,
|
|
||||||
@REM software distributed under the License is distributed on an
|
|
||||||
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
@REM KIND, either express or implied. See the License for the
|
|
||||||
@REM specific language governing permissions and limitations
|
|
||||||
@REM under the License.
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
@REM Apache Maven Wrapper startup batch script, version 3.3.2
|
|
||||||
@REM
|
|
||||||
@REM Optional ENV vars
|
|
||||||
@REM MVNW_REPOURL - repo url base for downloading maven distribution
|
|
||||||
@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
|
|
||||||
@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
|
|
||||||
@SET __MVNW_CMD__=
|
|
||||||
@SET __MVNW_ERROR__=
|
|
||||||
@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
|
|
||||||
@SET PSModulePath=
|
|
||||||
@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
|
|
||||||
IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
|
|
||||||
)
|
|
||||||
@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
|
|
||||||
@SET __MVNW_PSMODULEP_SAVE=
|
|
||||||
@SET __MVNW_ARG0_NAME__=
|
|
||||||
@SET MVNW_USERNAME=
|
|
||||||
@SET MVNW_PASSWORD=
|
|
||||||
@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*)
|
|
||||||
@echo Cannot start maven from wrapper >&2 && exit /b 1
|
|
||||||
@GOTO :EOF
|
|
||||||
: end batch / begin powershell #>
|
|
||||||
|
|
||||||
$ErrorActionPreference = "Stop"
|
|
||||||
if ($env:MVNW_VERBOSE -eq "true") {
|
|
||||||
$VerbosePreference = "Continue"
|
|
||||||
}
|
|
||||||
|
|
||||||
# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
|
|
||||||
$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
|
|
||||||
if (!$distributionUrl) {
|
|
||||||
Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
|
|
||||||
}
|
|
||||||
|
|
||||||
switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
|
|
||||||
"maven-mvnd-*" {
|
|
||||||
$USE_MVND = $true
|
|
||||||
$distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
|
|
||||||
$MVN_CMD = "mvnd.cmd"
|
|
||||||
break
|
|
||||||
}
|
|
||||||
default {
|
|
||||||
$USE_MVND = $false
|
|
||||||
$MVN_CMD = $script -replace '^mvnw','mvn'
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# apply MVNW_REPOURL and calculate MAVEN_HOME
|
|
||||||
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
|
|
||||||
if ($env:MVNW_REPOURL) {
|
|
||||||
$MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" }
|
|
||||||
$distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')"
|
|
||||||
}
|
|
||||||
$distributionUrlName = $distributionUrl -replace '^.*/',''
|
|
||||||
$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
|
|
||||||
$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
|
|
||||||
if ($env:MAVEN_USER_HOME) {
|
|
||||||
$MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain"
|
|
||||||
}
|
|
||||||
$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
|
|
||||||
$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
|
|
||||||
|
|
||||||
if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
|
|
||||||
Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
|
|
||||||
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
|
|
||||||
exit $?
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
|
|
||||||
Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
|
|
||||||
}
|
|
||||||
|
|
||||||
# prepare tmp dir
|
|
||||||
$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
|
|
||||||
$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
|
|
||||||
$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
|
|
||||||
trap {
|
|
||||||
if ($TMP_DOWNLOAD_DIR.Exists) {
|
|
||||||
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
|
|
||||||
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
|
|
||||||
|
|
||||||
# Download and Install Apache Maven
|
|
||||||
Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
|
|
||||||
Write-Verbose "Downloading from: $distributionUrl"
|
|
||||||
Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
|
|
||||||
|
|
||||||
$webclient = New-Object System.Net.WebClient
|
|
||||||
if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
|
|
||||||
$webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
|
|
||||||
}
|
|
||||||
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
|
|
||||||
$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
|
|
||||||
|
|
||||||
# If specified, validate the SHA-256 sum of the Maven distribution zip file
|
|
||||||
$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
|
|
||||||
if ($distributionSha256Sum) {
|
|
||||||
if ($USE_MVND) {
|
|
||||||
Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
|
|
||||||
}
|
|
||||||
Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
|
|
||||||
if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
|
|
||||||
Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# unzip and move
|
|
||||||
Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
|
|
||||||
Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null
|
|
||||||
try {
|
|
||||||
Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
|
|
||||||
} catch {
|
|
||||||
if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
|
|
||||||
Write-Error "fail to move MAVEN_HOME"
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
|
|
||||||
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
|
|
||||||
}
|
|
||||||
|
|
||||||
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
|
|
||||||
@ -1,71 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<parent>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-parent</artifactId>
|
|
||||||
<version>3.3.5</version>
|
|
||||||
<relativePath/> <!-- lookup parent from repository -->
|
|
||||||
</parent>
|
|
||||||
<groupId>ru.ulstu</groupId>
|
|
||||||
<artifactId>melon</artifactId>
|
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
|
||||||
<name>melon</name>
|
|
||||||
<description>Demo project for Spring Boot</description>
|
|
||||||
<url/>
|
|
||||||
<licenses>
|
|
||||||
<license/>
|
|
||||||
</licenses>
|
|
||||||
<developers>
|
|
||||||
<developer/>
|
|
||||||
</developers>
|
|
||||||
<scm>
|
|
||||||
<connection/>
|
|
||||||
<developerConnection/>
|
|
||||||
<tag/>
|
|
||||||
<url/>
|
|
||||||
</scm>
|
|
||||||
<properties>
|
|
||||||
<java.version>17</java.version>
|
|
||||||
</properties>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.projectlombok</groupId>
|
|
||||||
<artifactId>lombok</artifactId>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springdoc</groupId>
|
|
||||||
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
|
|
||||||
<version>2.5.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-test</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
<excludes>
|
|
||||||
<exclude>
|
|
||||||
<groupId>org.projectlombok</groupId>
|
|
||||||
<artifactId>lombok</artifactId>
|
|
||||||
</exclude>
|
|
||||||
</excludes>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
package ru.ulstu.melon;
|
|
||||||
|
|
||||||
import org.springframework.boot.SpringApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
||||||
|
|
||||||
@SpringBootApplication
|
|
||||||
public class MelonApplication {
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
SpringApplication.run(MelonApplication.class, args);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
package ru.ulstu.melon.config;
|
|
||||||
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.web.client.RestTemplate;
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
public class RestTemplateConfig {
|
|
||||||
@Bean
|
|
||||||
public RestTemplate restTemplate() {
|
|
||||||
return new RestTemplate();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,54 +0,0 @@
|
|||||||
package ru.ulstu.melon.controller;
|
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PutMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
import ru.ulstu.melon.dto.CreateMelonDto;
|
|
||||||
import ru.ulstu.melon.dto.MelonDto;
|
|
||||||
import ru.ulstu.melon.dto.UpdateMelonDto;
|
|
||||||
import ru.ulstu.melon.model.Melon;
|
|
||||||
import ru.ulstu.melon.service.MelonService;
|
|
||||||
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
@RestController
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
@RequestMapping("/melon")
|
|
||||||
public class MelonController {
|
|
||||||
private final MelonService melonService;
|
|
||||||
|
|
||||||
@GetMapping
|
|
||||||
public ResponseEntity<Collection<Melon>> get() {
|
|
||||||
return new ResponseEntity<>(melonService.get(), HttpStatus.OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/{id}")
|
|
||||||
public ResponseEntity<MelonDto> get(@PathVariable UUID id) {
|
|
||||||
return new ResponseEntity<>(melonService.get(id), HttpStatus.OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping
|
|
||||||
public ResponseEntity<MelonDto> add(@RequestBody CreateMelonDto dto) {
|
|
||||||
return new ResponseEntity<>(melonService.add(dto), HttpStatus.OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
@PutMapping("/{id}")
|
|
||||||
public ResponseEntity<MelonDto> update(@PathVariable UUID id, @RequestBody UpdateMelonDto dto) {
|
|
||||||
return new ResponseEntity<>(melonService.update(id, dto), HttpStatus.OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
@DeleteMapping("/{id}")
|
|
||||||
public ResponseEntity<Void> delete(@PathVariable UUID id) {
|
|
||||||
melonService.delete(id);
|
|
||||||
return new ResponseEntity<>(HttpStatus.OK);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
package ru.ulstu.melon.dto;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Getter;
|
|
||||||
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
@AllArgsConstructor
|
|
||||||
@Getter
|
|
||||||
public class CreateMelonDto {
|
|
||||||
private Boolean isRipe;
|
|
||||||
private Double weight;
|
|
||||||
private UUID waterMelonId;
|
|
||||||
}
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
package ru.ulstu.melon.dto;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.Setter;
|
|
||||||
import ru.ulstu.melon.model.Melon;
|
|
||||||
import ru.ulstu.melon.model.Water;
|
|
||||||
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
@AllArgsConstructor
|
|
||||||
@Getter
|
|
||||||
@Setter
|
|
||||||
public class MelonDto {
|
|
||||||
private UUID id;
|
|
||||||
private Boolean isRipe;
|
|
||||||
private Double weight;
|
|
||||||
private UUID waterMelonId;
|
|
||||||
private WaterDto waterMelon;
|
|
||||||
|
|
||||||
public MelonDto(Melon melon, Water water) {
|
|
||||||
this.id = melon.getId();
|
|
||||||
this.isRipe = melon.getIsRipe();
|
|
||||||
this.weight = melon.getWeight();
|
|
||||||
this.waterMelonId = melon.getWaterMelonId();
|
|
||||||
this.waterMelon = new WaterDto(water);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
package ru.ulstu.melon.dto;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Getter;
|
|
||||||
|
|
||||||
@AllArgsConstructor
|
|
||||||
@Getter
|
|
||||||
public class UpdateMelonDto {
|
|
||||||
private Boolean isRipe;
|
|
||||||
private Double weight;
|
|
||||||
}
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
package ru.ulstu.melon.dto;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.Setter;
|
|
||||||
import ru.ulstu.melon.model.Water;
|
|
||||||
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
@Getter
|
|
||||||
@Setter
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class WaterDto {
|
|
||||||
private UUID id;
|
|
||||||
private Boolean isSweetBottom;
|
|
||||||
private Double volume;
|
|
||||||
|
|
||||||
public WaterDto(Water water) {
|
|
||||||
this.id = water.getId();
|
|
||||||
this.isSweetBottom = water.getIsSweetBottom();
|
|
||||||
this.volume = water.getVolume();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
package ru.ulstu.melon.model;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
import lombok.Setter;
|
|
||||||
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
@AllArgsConstructor
|
|
||||||
@NoArgsConstructor
|
|
||||||
@Getter
|
|
||||||
@Setter
|
|
||||||
public class Melon {
|
|
||||||
private UUID id;
|
|
||||||
private Boolean isRipe;
|
|
||||||
private Double weight;
|
|
||||||
private UUID waterMelonId;
|
|
||||||
}
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
package ru.ulstu.melon.model;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
@AllArgsConstructor
|
|
||||||
@NoArgsConstructor
|
|
||||||
@Getter
|
|
||||||
public class Water {
|
|
||||||
private UUID id;
|
|
||||||
private Boolean isSweetBottom;
|
|
||||||
private Double volume;
|
|
||||||
private List<Melon> waterMelons;
|
|
||||||
}
|
|
||||||
@ -1,88 +0,0 @@
|
|||||||
package ru.ulstu.melon.service;
|
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import org.springframework.web.client.RestClientException;
|
|
||||||
import org.springframework.web.client.RestTemplate;
|
|
||||||
import org.springframework.web.server.ResponseStatusException;
|
|
||||||
import ru.ulstu.melon.dto.CreateMelonDto;
|
|
||||||
import ru.ulstu.melon.dto.MelonDto;
|
|
||||||
import ru.ulstu.melon.dto.UpdateMelonDto;
|
|
||||||
import ru.ulstu.melon.model.Melon;
|
|
||||||
import ru.ulstu.melon.model.Water;
|
|
||||||
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
@Service
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
public class MelonService {
|
|
||||||
private final Map<UUID, Melon> melons = new HashMap<>();
|
|
||||||
private final RestTemplate restTemplate;
|
|
||||||
private static final String WATER_SERVICE_PATH = "http://nginx/water/water/";
|
|
||||||
|
|
||||||
public Collection<Melon> get() {
|
|
||||||
return melons.values();
|
|
||||||
}
|
|
||||||
|
|
||||||
public MelonDto get(UUID id) {
|
|
||||||
if (!melons.containsKey(id)) {
|
|
||||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Melon not found");
|
|
||||||
}
|
|
||||||
final Melon melon = melons.get(id);
|
|
||||||
return new MelonDto(melon, getWater(melon.getWaterMelonId()));
|
|
||||||
}
|
|
||||||
|
|
||||||
public MelonDto add(CreateMelonDto dto) {
|
|
||||||
Melon melon = new Melon(UUID.randomUUID(),
|
|
||||||
dto.getIsRipe(),
|
|
||||||
dto.getWeight(),
|
|
||||||
dto.getWaterMelonId());
|
|
||||||
melons.put(melon.getId(), melon);
|
|
||||||
Water water;
|
|
||||||
try {
|
|
||||||
String baseUrl = WATER_SERVICE_PATH + melon.getWaterMelonId() + "/addMelon";
|
|
||||||
water = restTemplate.postForObject(
|
|
||||||
baseUrl,
|
|
||||||
melon,
|
|
||||||
Water.class
|
|
||||||
);
|
|
||||||
} catch (RestClientException e) {
|
|
||||||
throw new RuntimeException("Failed to add melon to waterMelons: " + e.getMessage(), e);
|
|
||||||
}
|
|
||||||
return new MelonDto(melon, water);
|
|
||||||
}
|
|
||||||
|
|
||||||
public MelonDto update(UUID id, UpdateMelonDto dto) {
|
|
||||||
if (!melons.containsKey(id)) {
|
|
||||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Melon not found");
|
|
||||||
}
|
|
||||||
Melon melon = melons.get(id);
|
|
||||||
if (dto.getWeight() != null)
|
|
||||||
melon.setWeight(dto.getWeight());
|
|
||||||
if (dto.getIsRipe() != null)
|
|
||||||
melon.setIsRipe(dto.getIsRipe());
|
|
||||||
return new MelonDto(melon, getWater(melon.getWaterMelonId()));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void delete(UUID id) {
|
|
||||||
if (!melons.containsKey(id)) {
|
|
||||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Melon not found");
|
|
||||||
}
|
|
||||||
melons.remove(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Water getWater(UUID id) {
|
|
||||||
Water water;
|
|
||||||
try {
|
|
||||||
String baseUrl = WATER_SERVICE_PATH + id;
|
|
||||||
water = restTemplate.getForEntity(baseUrl, Water.class).getBody();
|
|
||||||
} catch (RestClientException e) {
|
|
||||||
throw new RuntimeException("Failed get waterMelon for melon: " + e.getMessage());
|
|
||||||
}
|
|
||||||
return water;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1 +0,0 @@
|
|||||||
spring.application.name=melon
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
package ru.ulstu.melon;
|
|
||||||
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
|
||||||
|
|
||||||
@SpringBootTest
|
|
||||||
class MelonApplicationTests {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void contextLoads() {
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
events {
|
|
||||||
worker_connections 1024;
|
|
||||||
}
|
|
||||||
|
|
||||||
http {
|
|
||||||
server {
|
|
||||||
listen 80;
|
|
||||||
listen [::]:80;
|
|
||||||
server_name localhost;
|
|
||||||
|
|
||||||
location /melon/ {
|
|
||||||
proxy_pass http://melon:8080/;
|
|
||||||
}
|
|
||||||
|
|
||||||
location /water/ {
|
|
||||||
proxy_pass http://water:8081/;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
2
afanasev_dmitry_lab_3/water/.gitattributes
vendored
2
afanasev_dmitry_lab_3/water/.gitattributes
vendored
@ -1,2 +0,0 @@
|
|||||||
/mvnw text eol=lf
|
|
||||||
*.cmd text eol=crlf
|
|
||||||
33
afanasev_dmitry_lab_3/water/.gitignore
vendored
33
afanasev_dmitry_lab_3/water/.gitignore
vendored
@ -1,33 +0,0 @@
|
|||||||
HELP.md
|
|
||||||
target/
|
|
||||||
!.mvn/wrapper/maven-wrapper.jar
|
|
||||||
!**/src/main/**/target/
|
|
||||||
!**/src/test/**/target/
|
|
||||||
|
|
||||||
### STS ###
|
|
||||||
.apt_generated
|
|
||||||
.classpath
|
|
||||||
.factorypath
|
|
||||||
.project
|
|
||||||
.settings
|
|
||||||
.springBeans
|
|
||||||
.sts4-cache
|
|
||||||
|
|
||||||
### IntelliJ IDEA ###
|
|
||||||
.idea
|
|
||||||
*.iws
|
|
||||||
*.iml
|
|
||||||
*.ipr
|
|
||||||
|
|
||||||
### NetBeans ###
|
|
||||||
/nbproject/private/
|
|
||||||
/nbbuild/
|
|
||||||
/dist/
|
|
||||||
/nbdist/
|
|
||||||
/.nb-gradle/
|
|
||||||
build/
|
|
||||||
!**/src/main/**/build/
|
|
||||||
!**/src/test/**/build/
|
|
||||||
|
|
||||||
### VS Code ###
|
|
||||||
.vscode/
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
# Licensed to the Apache Software Foundation (ASF) under one
|
|
||||||
# or more contributor license agreements. See the NOTICE file
|
|
||||||
# distributed with this work for additional information
|
|
||||||
# regarding copyright ownership. The ASF licenses this file
|
|
||||||
# to you under the Apache License, Version 2.0 (the
|
|
||||||
# "License"); you may not use this file except in compliance
|
|
||||||
# with the License. You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing,
|
|
||||||
# software distributed under the License is distributed on an
|
|
||||||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
# KIND, either express or implied. See the License for the
|
|
||||||
# specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
wrapperVersion=3.3.2
|
|
||||||
distributionType=only-script
|
|
||||||
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
FROM bellsoft/liberica-openjdk-alpine:17.0.8
|
|
||||||
ADD target/water-0.0.1-SNAPSHOT.jar /app/
|
|
||||||
CMD ["java", "-Xmx200m", "-jar", "/app/water-0.0.1-SNAPSHOT.jar"]
|
|
||||||
WORKDIR /app
|
|
||||||
259
afanasev_dmitry_lab_3/water/mvnw
vendored
259
afanasev_dmitry_lab_3/water/mvnw
vendored
@ -1,259 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
# Licensed to the Apache Software Foundation (ASF) under one
|
|
||||||
# or more contributor license agreements. See the NOTICE file
|
|
||||||
# distributed with this work for additional information
|
|
||||||
# regarding copyright ownership. The ASF licenses this file
|
|
||||||
# to you under the Apache License, Version 2.0 (the
|
|
||||||
# "License"); you may not use this file except in compliance
|
|
||||||
# with the License. You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing,
|
|
||||||
# software distributed under the License is distributed on an
|
|
||||||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
# KIND, either express or implied. See the License for the
|
|
||||||
# specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
# Apache Maven Wrapper startup batch script, version 3.3.2
|
|
||||||
#
|
|
||||||
# Optional ENV vars
|
|
||||||
# -----------------
|
|
||||||
# JAVA_HOME - location of a JDK home dir, required when download maven via java source
|
|
||||||
# MVNW_REPOURL - repo url base for downloading maven distribution
|
|
||||||
# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
|
|
||||||
# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
set -euf
|
|
||||||
[ "${MVNW_VERBOSE-}" != debug ] || set -x
|
|
||||||
|
|
||||||
# OS specific support.
|
|
||||||
native_path() { printf %s\\n "$1"; }
|
|
||||||
case "$(uname)" in
|
|
||||||
CYGWIN* | MINGW*)
|
|
||||||
[ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
|
|
||||||
native_path() { cygpath --path --windows "$1"; }
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# set JAVACMD and JAVACCMD
|
|
||||||
set_java_home() {
|
|
||||||
# For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
|
|
||||||
if [ -n "${JAVA_HOME-}" ]; then
|
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ]; then
|
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
|
||||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
|
||||||
JAVACCMD="$JAVA_HOME/jre/sh/javac"
|
|
||||||
else
|
|
||||||
JAVACMD="$JAVA_HOME/bin/java"
|
|
||||||
JAVACCMD="$JAVA_HOME/bin/javac"
|
|
||||||
|
|
||||||
if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
|
|
||||||
echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
|
|
||||||
echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
JAVACMD="$(
|
|
||||||
'set' +e
|
|
||||||
'unset' -f command 2>/dev/null
|
|
||||||
'command' -v java
|
|
||||||
)" || :
|
|
||||||
JAVACCMD="$(
|
|
||||||
'set' +e
|
|
||||||
'unset' -f command 2>/dev/null
|
|
||||||
'command' -v javac
|
|
||||||
)" || :
|
|
||||||
|
|
||||||
if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
|
|
||||||
echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# hash string like Java String::hashCode
|
|
||||||
hash_string() {
|
|
||||||
str="${1:-}" h=0
|
|
||||||
while [ -n "$str" ]; do
|
|
||||||
char="${str%"${str#?}"}"
|
|
||||||
h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
|
|
||||||
str="${str#?}"
|
|
||||||
done
|
|
||||||
printf %x\\n $h
|
|
||||||
}
|
|
||||||
|
|
||||||
verbose() { :; }
|
|
||||||
[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
|
|
||||||
|
|
||||||
die() {
|
|
||||||
printf %s\\n "$1" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
trim() {
|
|
||||||
# MWRAPPER-139:
|
|
||||||
# Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
|
|
||||||
# Needed for removing poorly interpreted newline sequences when running in more
|
|
||||||
# exotic environments such as mingw bash on Windows.
|
|
||||||
printf "%s" "${1}" | tr -d '[:space:]'
|
|
||||||
}
|
|
||||||
|
|
||||||
# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
|
|
||||||
while IFS="=" read -r key value; do
|
|
||||||
case "${key-}" in
|
|
||||||
distributionUrl) distributionUrl=$(trim "${value-}") ;;
|
|
||||||
distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
|
|
||||||
esac
|
|
||||||
done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
|
|
||||||
[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
|
|
||||||
|
|
||||||
case "${distributionUrl##*/}" in
|
|
||||||
maven-mvnd-*bin.*)
|
|
||||||
MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
|
|
||||||
case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
|
|
||||||
*AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
|
|
||||||
:Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
|
|
||||||
:Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
|
|
||||||
:Linux*x86_64*) distributionPlatform=linux-amd64 ;;
|
|
||||||
*)
|
|
||||||
echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
|
|
||||||
distributionPlatform=linux-amd64
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
|
|
||||||
;;
|
|
||||||
maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
|
|
||||||
*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# apply MVNW_REPOURL and calculate MAVEN_HOME
|
|
||||||
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
|
|
||||||
[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
|
|
||||||
distributionUrlName="${distributionUrl##*/}"
|
|
||||||
distributionUrlNameMain="${distributionUrlName%.*}"
|
|
||||||
distributionUrlNameMain="${distributionUrlNameMain%-bin}"
|
|
||||||
MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
|
|
||||||
MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
|
|
||||||
|
|
||||||
exec_maven() {
|
|
||||||
unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
|
|
||||||
exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
|
|
||||||
}
|
|
||||||
|
|
||||||
if [ -d "$MAVEN_HOME" ]; then
|
|
||||||
verbose "found existing MAVEN_HOME at $MAVEN_HOME"
|
|
||||||
exec_maven "$@"
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "${distributionUrl-}" in
|
|
||||||
*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
|
|
||||||
*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# prepare tmp dir
|
|
||||||
if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
|
|
||||||
clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
|
|
||||||
trap clean HUP INT TERM EXIT
|
|
||||||
else
|
|
||||||
die "cannot create temp dir"
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir -p -- "${MAVEN_HOME%/*}"
|
|
||||||
|
|
||||||
# Download and Install Apache Maven
|
|
||||||
verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
|
|
||||||
verbose "Downloading from: $distributionUrl"
|
|
||||||
verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
|
|
||||||
|
|
||||||
# select .zip or .tar.gz
|
|
||||||
if ! command -v unzip >/dev/null; then
|
|
||||||
distributionUrl="${distributionUrl%.zip}.tar.gz"
|
|
||||||
distributionUrlName="${distributionUrl##*/}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# verbose opt
|
|
||||||
__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
|
|
||||||
[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
|
|
||||||
|
|
||||||
# normalize http auth
|
|
||||||
case "${MVNW_PASSWORD:+has-password}" in
|
|
||||||
'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
|
|
||||||
has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
|
|
||||||
verbose "Found wget ... using wget"
|
|
||||||
wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
|
|
||||||
elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
|
|
||||||
verbose "Found curl ... using curl"
|
|
||||||
curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
|
|
||||||
elif set_java_home; then
|
|
||||||
verbose "Falling back to use Java to download"
|
|
||||||
javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
|
|
||||||
targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
|
|
||||||
cat >"$javaSource" <<-END
|
|
||||||
public class Downloader extends java.net.Authenticator
|
|
||||||
{
|
|
||||||
protected java.net.PasswordAuthentication getPasswordAuthentication()
|
|
||||||
{
|
|
||||||
return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
|
|
||||||
}
|
|
||||||
public static void main( String[] args ) throws Exception
|
|
||||||
{
|
|
||||||
setDefault( new Downloader() );
|
|
||||||
java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
END
|
|
||||||
# For Cygwin/MinGW, switch paths to Windows format before running javac and java
|
|
||||||
verbose " - Compiling Downloader.java ..."
|
|
||||||
"$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
|
|
||||||
verbose " - Running Downloader.java ..."
|
|
||||||
"$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If specified, validate the SHA-256 sum of the Maven distribution zip file
|
|
||||||
if [ -n "${distributionSha256Sum-}" ]; then
|
|
||||||
distributionSha256Result=false
|
|
||||||
if [ "$MVN_CMD" = mvnd.sh ]; then
|
|
||||||
echo "Checksum validation is not supported for maven-mvnd." >&2
|
|
||||||
echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
|
|
||||||
exit 1
|
|
||||||
elif command -v sha256sum >/dev/null; then
|
|
||||||
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then
|
|
||||||
distributionSha256Result=true
|
|
||||||
fi
|
|
||||||
elif command -v shasum >/dev/null; then
|
|
||||||
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
|
|
||||||
distributionSha256Result=true
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
|
|
||||||
echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
if [ $distributionSha256Result = false ]; then
|
|
||||||
echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
|
|
||||||
echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# unzip and move
|
|
||||||
if command -v unzip >/dev/null; then
|
|
||||||
unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
|
|
||||||
else
|
|
||||||
tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
|
|
||||||
fi
|
|
||||||
printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url"
|
|
||||||
mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
|
|
||||||
|
|
||||||
clean || :
|
|
||||||
exec_maven "$@"
|
|
||||||
149
afanasev_dmitry_lab_3/water/mvnw.cmd
vendored
149
afanasev_dmitry_lab_3/water/mvnw.cmd
vendored
@ -1,149 +0,0 @@
|
|||||||
<# : batch portion
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
@REM Licensed to the Apache Software Foundation (ASF) under one
|
|
||||||
@REM or more contributor license agreements. See the NOTICE file
|
|
||||||
@REM distributed with this work for additional information
|
|
||||||
@REM regarding copyright ownership. The ASF licenses this file
|
|
||||||
@REM to you under the Apache License, Version 2.0 (the
|
|
||||||
@REM "License"); you may not use this file except in compliance
|
|
||||||
@REM with the License. You may obtain a copy of the License at
|
|
||||||
@REM
|
|
||||||
@REM http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
@REM
|
|
||||||
@REM Unless required by applicable law or agreed to in writing,
|
|
||||||
@REM software distributed under the License is distributed on an
|
|
||||||
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
@REM KIND, either express or implied. See the License for the
|
|
||||||
@REM specific language governing permissions and limitations
|
|
||||||
@REM under the License.
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
@REM Apache Maven Wrapper startup batch script, version 3.3.2
|
|
||||||
@REM
|
|
||||||
@REM Optional ENV vars
|
|
||||||
@REM MVNW_REPOURL - repo url base for downloading maven distribution
|
|
||||||
@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
|
|
||||||
@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
|
|
||||||
@SET __MVNW_CMD__=
|
|
||||||
@SET __MVNW_ERROR__=
|
|
||||||
@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
|
|
||||||
@SET PSModulePath=
|
|
||||||
@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
|
|
||||||
IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
|
|
||||||
)
|
|
||||||
@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
|
|
||||||
@SET __MVNW_PSMODULEP_SAVE=
|
|
||||||
@SET __MVNW_ARG0_NAME__=
|
|
||||||
@SET MVNW_USERNAME=
|
|
||||||
@SET MVNW_PASSWORD=
|
|
||||||
@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*)
|
|
||||||
@echo Cannot start maven from wrapper >&2 && exit /b 1
|
|
||||||
@GOTO :EOF
|
|
||||||
: end batch / begin powershell #>
|
|
||||||
|
|
||||||
$ErrorActionPreference = "Stop"
|
|
||||||
if ($env:MVNW_VERBOSE -eq "true") {
|
|
||||||
$VerbosePreference = "Continue"
|
|
||||||
}
|
|
||||||
|
|
||||||
# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
|
|
||||||
$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
|
|
||||||
if (!$distributionUrl) {
|
|
||||||
Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
|
|
||||||
}
|
|
||||||
|
|
||||||
switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
|
|
||||||
"maven-mvnd-*" {
|
|
||||||
$USE_MVND = $true
|
|
||||||
$distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
|
|
||||||
$MVN_CMD = "mvnd.cmd"
|
|
||||||
break
|
|
||||||
}
|
|
||||||
default {
|
|
||||||
$USE_MVND = $false
|
|
||||||
$MVN_CMD = $script -replace '^mvnw','mvn'
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# apply MVNW_REPOURL and calculate MAVEN_HOME
|
|
||||||
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
|
|
||||||
if ($env:MVNW_REPOURL) {
|
|
||||||
$MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" }
|
|
||||||
$distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')"
|
|
||||||
}
|
|
||||||
$distributionUrlName = $distributionUrl -replace '^.*/',''
|
|
||||||
$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
|
|
||||||
$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
|
|
||||||
if ($env:MAVEN_USER_HOME) {
|
|
||||||
$MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain"
|
|
||||||
}
|
|
||||||
$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
|
|
||||||
$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
|
|
||||||
|
|
||||||
if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
|
|
||||||
Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
|
|
||||||
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
|
|
||||||
exit $?
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
|
|
||||||
Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
|
|
||||||
}
|
|
||||||
|
|
||||||
# prepare tmp dir
|
|
||||||
$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
|
|
||||||
$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
|
|
||||||
$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
|
|
||||||
trap {
|
|
||||||
if ($TMP_DOWNLOAD_DIR.Exists) {
|
|
||||||
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
|
|
||||||
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
|
|
||||||
|
|
||||||
# Download and Install Apache Maven
|
|
||||||
Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
|
|
||||||
Write-Verbose "Downloading from: $distributionUrl"
|
|
||||||
Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
|
|
||||||
|
|
||||||
$webclient = New-Object System.Net.WebClient
|
|
||||||
if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
|
|
||||||
$webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
|
|
||||||
}
|
|
||||||
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
|
|
||||||
$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
|
|
||||||
|
|
||||||
# If specified, validate the SHA-256 sum of the Maven distribution zip file
|
|
||||||
$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
|
|
||||||
if ($distributionSha256Sum) {
|
|
||||||
if ($USE_MVND) {
|
|
||||||
Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
|
|
||||||
}
|
|
||||||
Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
|
|
||||||
if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
|
|
||||||
Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# unzip and move
|
|
||||||
Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
|
|
||||||
Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null
|
|
||||||
try {
|
|
||||||
Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
|
|
||||||
} catch {
|
|
||||||
if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
|
|
||||||
Write-Error "fail to move MAVEN_HOME"
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
|
|
||||||
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
|
|
||||||
}
|
|
||||||
|
|
||||||
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
|
|
||||||
@ -1,71 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<parent>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-parent</artifactId>
|
|
||||||
<version>3.3.5</version>
|
|
||||||
<relativePath/> <!-- lookup parent from repository -->
|
|
||||||
</parent>
|
|
||||||
<groupId>ru.ulstu</groupId>
|
|
||||||
<artifactId>water</artifactId>
|
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
|
||||||
<name>water</name>
|
|
||||||
<description>Demo project for Spring Boot</description>
|
|
||||||
<url/>
|
|
||||||
<licenses>
|
|
||||||
<license/>
|
|
||||||
</licenses>
|
|
||||||
<developers>
|
|
||||||
<developer/>
|
|
||||||
</developers>
|
|
||||||
<scm>
|
|
||||||
<connection/>
|
|
||||||
<developerConnection/>
|
|
||||||
<tag/>
|
|
||||||
<url/>
|
|
||||||
</scm>
|
|
||||||
<properties>
|
|
||||||
<java.version>17</java.version>
|
|
||||||
</properties>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.projectlombok</groupId>
|
|
||||||
<artifactId>lombok</artifactId>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springdoc</groupId>
|
|
||||||
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
|
|
||||||
<version>2.5.0</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-test</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
<excludes>
|
|
||||||
<exclude>
|
|
||||||
<groupId>org.projectlombok</groupId>
|
|
||||||
<artifactId>lombok</artifactId>
|
|
||||||
</exclude>
|
|
||||||
</excludes>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
package ru.ulstu.water;
|
|
||||||
|
|
||||||
import org.springframework.boot.SpringApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
||||||
|
|
||||||
@SpringBootApplication
|
|
||||||
public class WaterApplication {
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
SpringApplication.run(WaterApplication.class, args);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,58 +0,0 @@
|
|||||||
package ru.ulstu.water.controller;
|
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PutMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
import ru.ulstu.water.dto.WaterDto;
|
|
||||||
import ru.ulstu.water.model.Melon;
|
|
||||||
import ru.ulstu.water.model.Water;
|
|
||||||
import ru.ulstu.water.service.WaterService;
|
|
||||||
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
@RestController
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
@RequestMapping("/water")
|
|
||||||
public class WaterController {
|
|
||||||
private final WaterService waterService;
|
|
||||||
|
|
||||||
@GetMapping
|
|
||||||
public ResponseEntity<Collection<Water>> get() {
|
|
||||||
return new ResponseEntity<>(waterService.get(), HttpStatus.OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/{id}")
|
|
||||||
public ResponseEntity<Water> get(@PathVariable UUID id) {
|
|
||||||
return new ResponseEntity<>(waterService.get(id), HttpStatus.OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping
|
|
||||||
public ResponseEntity<Water> add(@RequestBody WaterDto dto) {
|
|
||||||
return new ResponseEntity<>(waterService.add(dto), HttpStatus.OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
@PutMapping("/{id}")
|
|
||||||
public ResponseEntity<Water> update(@PathVariable UUID id, @RequestBody WaterDto dto) {
|
|
||||||
return new ResponseEntity<>(waterService.update(id, dto), HttpStatus.OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
@DeleteMapping("/{id}")
|
|
||||||
public ResponseEntity<Void> delete(@PathVariable UUID id) {
|
|
||||||
waterService.delete(id);
|
|
||||||
return new ResponseEntity<>(HttpStatus.OK);
|
|
||||||
}
|
|
||||||
|
|
||||||
@PostMapping("/{id}/addMelon")
|
|
||||||
public ResponseEntity<Water> addMelon(@PathVariable UUID id, @RequestBody Melon melon) {
|
|
||||||
return new ResponseEntity<>(waterService.addMelon(id, melon), HttpStatus.OK);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
package ru.ulstu.water.dto;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Getter;
|
|
||||||
|
|
||||||
@AllArgsConstructor
|
|
||||||
@Getter
|
|
||||||
public class WaterDto {
|
|
||||||
private Boolean isSweetBottom;
|
|
||||||
private Double volume;
|
|
||||||
}
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
package ru.ulstu.water.model;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
import lombok.Setter;
|
|
||||||
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
@AllArgsConstructor
|
|
||||||
@NoArgsConstructor
|
|
||||||
@Getter
|
|
||||||
@Setter
|
|
||||||
public class Melon {
|
|
||||||
private UUID id;
|
|
||||||
private Boolean isRipe;
|
|
||||||
private Double weight;
|
|
||||||
private UUID waterMelonId;
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
package ru.ulstu.water.model;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
import lombok.Setter;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
@AllArgsConstructor
|
|
||||||
@NoArgsConstructor
|
|
||||||
@Getter
|
|
||||||
@Setter
|
|
||||||
public class Water {
|
|
||||||
private UUID id;
|
|
||||||
private Boolean isSweetBottom;
|
|
||||||
private Double volume;
|
|
||||||
private List<Melon> waterMelons;
|
|
||||||
}
|
|
||||||
@ -1,64 +0,0 @@
|
|||||||
package ru.ulstu.water.service;
|
|
||||||
|
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import org.springframework.web.server.ResponseStatusException;
|
|
||||||
import ru.ulstu.water.dto.WaterDto;
|
|
||||||
import ru.ulstu.water.model.Melon;
|
|
||||||
import ru.ulstu.water.model.Water;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
@Service
|
|
||||||
public class WaterService {
|
|
||||||
private final Map<UUID, Water> waters = new HashMap<>();
|
|
||||||
|
|
||||||
public Collection<Water> get() {
|
|
||||||
return waters.values();
|
|
||||||
}
|
|
||||||
|
|
||||||
public Water get(UUID id) {
|
|
||||||
if (!waters.containsKey(id)) {
|
|
||||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Water not found");
|
|
||||||
}
|
|
||||||
return waters.get(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Water add(WaterDto dto) {
|
|
||||||
Water water = new Water(UUID.randomUUID(),
|
|
||||||
dto.getIsSweetBottom(),
|
|
||||||
dto.getVolume(),
|
|
||||||
new ArrayList<>());
|
|
||||||
waters.put(water.getId(), water);
|
|
||||||
return water;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Water update(UUID id, WaterDto dto) {
|
|
||||||
Water water = waters.get(id);
|
|
||||||
if (dto.getIsSweetBottom() != null)
|
|
||||||
water.setIsSweetBottom(dto.getIsSweetBottom());
|
|
||||||
if (dto.getVolume() != null)
|
|
||||||
water.setVolume(dto.getVolume());
|
|
||||||
return water;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void delete(UUID id) {
|
|
||||||
if (!waters.containsKey(id)) {
|
|
||||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Water not found");
|
|
||||||
}
|
|
||||||
waters.remove(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Water addMelon(UUID id, Melon melon) {
|
|
||||||
if (!waters.containsKey(id)) {
|
|
||||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Water not found");
|
|
||||||
}
|
|
||||||
final Water water = waters.get(id);
|
|
||||||
water.getWaterMelons().add(melon);
|
|
||||||
return water;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
spring.application.name=water
|
|
||||||
server.port=8081
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
package ru.ulstu.water;
|
|
||||||
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
|
||||||
|
|
||||||
@SpringBootTest
|
|
||||||
class WaterApplicationTests {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void contextLoads() {
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
# Лабораторная работа 1 - Знакомство с Docker и Docker Compose
|
|
||||||
## ПИбд-42 || Алейкин Артем
|
|
||||||
|
|
||||||
### Описание
|
|
||||||
В данной лабораторной работе мы разворачиваем три популярных сервиса — MediaWiki и Redmine — с использованием Docker Compose. Каждый сервис работает в своем контейнере и использует общую базу данных PostgreSQL для хранения данных. Мы также настраиваем проброс портов для доступа к веб-интерфейсам сервисов и используем Docker volumes для сохранения данных вне контейнеров.
|
|
||||||
|
|
||||||
### Цель проекта
|
|
||||||
изучение современных технологий контейнеризации
|
|
||||||
|
|
||||||
### Шаги для запуска:
|
|
||||||
1. Клонирование репозитория:
|
|
||||||
```
|
|
||||||
git clone <ссылка-на-репозиторий>
|
|
||||||
cd <папка репозитория>
|
|
||||||
```
|
|
||||||
|
|
||||||
2. Запуск контейнеров:
|
|
||||||
```
|
|
||||||
docker-compose up -d
|
|
||||||
```
|
|
||||||
|
|
||||||
3. После запуска должны быть доступны следующие контейнеры:
|
|
||||||
|
|
||||||
MediaWiki: http://localhost:8080
|
|
||||||
Redmine: http://localhost:8081
|
|
||||||
|
|
||||||
4. Чтобы остановить контейнеры:
|
|
||||||
```
|
|
||||||
docker-compose down
|
|
||||||
```
|
|
||||||
|
|
||||||
Видео демонстрации работы: https://vk.com/video248424990_456239601?list=ln-sCRa9IIiV1VpInn2d1
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
services:
|
|
||||||
mediawiki:
|
|
||||||
image: mediawiki
|
|
||||||
container_name: mediawiki
|
|
||||||
ports:
|
|
||||||
- "8080:80" # Пробрасываем порт 8080 на хост для доступа к MediaWiki
|
|
||||||
volumes:
|
|
||||||
- mediawiki_data:/var/www/html/images # Создаем volume для хранения данных MediaWiki
|
|
||||||
environment:
|
|
||||||
- MEDIAWIKI_DB_HOST=db
|
|
||||||
- MEDIAWIKI_DB_NAME=mediawiki
|
|
||||||
- MEDIAWIKI_DB_USER=root
|
|
||||||
- MEDIAWIKI_DB_PASSWORD=example
|
|
||||||
depends_on:
|
|
||||||
- db
|
|
||||||
|
|
||||||
redmine:
|
|
||||||
image: redmine
|
|
||||||
container_name: redmine
|
|
||||||
ports:
|
|
||||||
- "8081:3000" # Пробрасываем порт 8081 на хост для доступа к Redmine
|
|
||||||
volumes:
|
|
||||||
- redmine_data:/usr/src/redmine/files # Создаем volume для хранения данных Redmine
|
|
||||||
environment:
|
|
||||||
- REDMINE_DB_POSTGRESQL=db
|
|
||||||
- REDMINE_DB_DATABASE=redmine
|
|
||||||
- REDMINE_DB_USERNAME=root
|
|
||||||
- REDMINE_DB_PASSWORD=example
|
|
||||||
depends_on:
|
|
||||||
- db
|
|
||||||
|
|
||||||
db:
|
|
||||||
image: postgres:latest
|
|
||||||
container_name: db
|
|
||||||
environment:
|
|
||||||
POSTGRES_USER: postgres
|
|
||||||
POSTGRES_PASSWORD: example
|
|
||||||
POSTGRES_DB: postgres
|
|
||||||
volumes:
|
|
||||||
- db_data:/var/lib/postgresql # Volume для базы данных
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
mediawiki_data: # volume для MediaWiki
|
|
||||||
redmine_data: # volume для Redmine
|
|
||||||
db_data: # volume для базы данных
|
|
||||||
@ -1,48 +0,0 @@
|
|||||||
## Отчет по Docker Compose конфигурации
|
|
||||||
|
|
||||||
### Краткое описание:
|
|
||||||
|
|
||||||
Данная конфигурация Docker Compose запускает набор сервисов, необходимых для работы WordPress и MediaWiki. Она включает в себя:
|
|
||||||
|
|
||||||
- **WordPress:** веб-сервис для блогов и CMS
|
|
||||||
- **MySQL:** база данных для хранения данных WordPress
|
|
||||||
- **RabbitMQ:** брокер сообщений для потенциального использования в будущем
|
|
||||||
- **MediaWiki:** вики-движок для создания и редактирования вики-страниц
|
|
||||||
|
|
||||||
### Запуск лабораторной работы:
|
|
||||||
|
|
||||||
1. Установить Docker и Docker Compose.
|
|
||||||
2. Сохранить конфигурацию в файл docker-compose.yml.
|
|
||||||
3. Запустить команду docker-compose up --build
|
|
||||||
|
|
||||||
### Используемые технологии:
|
|
||||||
|
|
||||||
- **Docker Compose:** инструмент для определения и запуска многоконтейнерных приложений.
|
|
||||||
- **Docker:** платформа для создания, развертывания и запуска контейнеров.
|
|
||||||
- **WordPress:** популярная платформа для создания блогов и CMS.
|
|
||||||
- **MySQL:** популярная система управления базами данных.
|
|
||||||
- **RabbitMQ:** брокер сообщений, используемый для асинхронного обмена сообщениями.
|
|
||||||
- **MediaWiki:** свободное программное обеспечение для создания и редактирования вики-страниц.
|
|
||||||
|
|
||||||
### Функциональность:
|
|
||||||
|
|
||||||
Конфигурация запускает следующие сервисы:
|
|
||||||
|
|
||||||
- **WordPress:** работает на порту 8080, доступен по адресу http://localhost:8080.
|
|
||||||
- **MySQL:** предоставляет базу данных для WordPress и MediaWiki.
|
|
||||||
- **RabbitMQ:** работает на порту 5672, доступен по адресу http://localhost:15672 для управления.
|
|
||||||
- **MediaWiki:** работает на порту 8081, доступен по адресу http://localhost:8081.
|
|
||||||
|
|
||||||
### Дополнительные сведения
|
|
||||||
|
|
||||||
- **Volumes**: используются для хранения данных сервисов, чтобы они не терялись при перезапуске контейнеров.
|
|
||||||
- **Depends_on**: указывает на зависимость между сервисами, например, WordPress зависит от MySQL.
|
|
||||||
- **Restart policy**: определяет, как сервисы будут перезапускаться после сбоя.
|
|
||||||
|
|
||||||
### Видео
|
|
||||||
|
|
||||||
https://vk.com/video/@artamonovat?z=video212084908_456239356%2Fpl_212084908_-2
|
|
||||||
|
|
||||||
### Заключение:
|
|
||||||
|
|
||||||
Данная конфигурация Docker Compose обеспечивает простой и удобный способ запуска и управления несколькими сервисами, связанными с WordPress и MediaWiki. Она позволяет разработчикам легко развертывать и управлять приложениями в изолированной среде.
|
|
||||||
@ -1,61 +0,0 @@
|
|||||||
version: '3.7'
|
|
||||||
|
|
||||||
services:
|
|
||||||
wordpress:
|
|
||||||
image: wordpress:latest
|
|
||||||
ports:
|
|
||||||
- "8080:80"
|
|
||||||
volumes:
|
|
||||||
- wordpress_data:/var/www/html
|
|
||||||
environment:
|
|
||||||
WORDPRESS_DB_HOST: db
|
|
||||||
WORDPRESS_DB_NAME: wordpress
|
|
||||||
WORDPRESS_DB_USER: wordpress
|
|
||||||
WORDPRESS_DB_PASSWORD: password
|
|
||||||
depends_on:
|
|
||||||
- db
|
|
||||||
restart: unless-stopped
|
|
||||||
|
|
||||||
db:
|
|
||||||
image: mysql:latest
|
|
||||||
volumes:
|
|
||||||
- db_data:/var/lib/mysql
|
|
||||||
environment:
|
|
||||||
MYSQL_DATABASE: wordpress
|
|
||||||
MYSQL_USER: wordpress
|
|
||||||
MYSQL_PASSWORD: dbpassword
|
|
||||||
MYSQL_ROOT_PASSWORD: rootpassword
|
|
||||||
restart: unless-stopped
|
|
||||||
|
|
||||||
rabbitmq:
|
|
||||||
image: rabbitmq:3-management
|
|
||||||
ports:
|
|
||||||
- "5672:5672"
|
|
||||||
- "15672:15672"
|
|
||||||
volumes:
|
|
||||||
- rabbitmq_data:/var/lib/rabbitmq
|
|
||||||
environment:
|
|
||||||
RABBITMQ_DEFAULT_USER: guest
|
|
||||||
RABBITMQ_DEFAULT_PASS: password
|
|
||||||
restart: unless-stopped
|
|
||||||
|
|
||||||
mediawiki:
|
|
||||||
image: mediawiki:latest
|
|
||||||
ports:
|
|
||||||
- "8081:80"
|
|
||||||
volumes:
|
|
||||||
- mediawiki_data:/var/www/html
|
|
||||||
environment:
|
|
||||||
MW_DB_SERVER: db
|
|
||||||
MW_DB_NAME: mediawiki
|
|
||||||
MW_DB_USER: mediawiki
|
|
||||||
MW_DB_PASSWORD: mediawiki_password
|
|
||||||
depends_on:
|
|
||||||
- db
|
|
||||||
restart: unless-stopped
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
wordpress_data:
|
|
||||||
db_data:
|
|
||||||
rabbitmq_data:
|
|
||||||
mediawiki_data:
|
|
||||||
5
artamonova_tatyana_lab_2/.gitignore
vendored
5
artamonova_tatyana_lab_2/.gitignore
vendored
@ -1,5 +0,0 @@
|
|||||||
*.pyc
|
|
||||||
__pycache__
|
|
||||||
*.egg-info
|
|
||||||
*.dist-info
|
|
||||||
.DS_Store
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
## Лабораторная работа №2
|
|
||||||
### Выполнила Артамонова Татьяна ПИбд-42
|
|
||||||
|
|
||||||
**Вариант 1: Программа 4 - Количество символов в именах файлов из каталога /var/data**
|
|
||||||
|
|
||||||
- Формирует файл /var/result/data1.txt так, что каждая строка файла - количество символов в именах файлов из каталога /var/data.
|
|
||||||
|
|
||||||
**Вариант 2: Программа 3 - Количество чисел в последовательности**
|
|
||||||
|
|
||||||
- Ищет набольшее число из файла /var/result/data1.txt и сохраняет количество таких чисел из последовательности в /var/result/data2.txt.
|
|
||||||
|
|
||||||
**Структура проекта:**
|
|
||||||
|
|
||||||
1. В папках worker-1, worker-2 лежат выполняемые файлы .py и Dockerfile-ы с необходимым набором инструкций.
|
|
||||||
2. В папке data лежат файлы, длину имен которых нужно посчитать.
|
|
||||||
3. В папке result лежат файлы с результатами выполнения программ. data1.txt - результат выполнения main1.py (worker-1), data2.txt - результат выполнения main2.py (worker-2). Данные в data2 рассчитываются из данных data1.
|
|
||||||
4. Файл .gitignore - для указания, какие файлы отслеживать, а какие - нет.
|
|
||||||
5. docker-compose.yml - для определения и управления контейнерами Docker.
|
|
||||||
|
|
||||||
**Команда для запуска** - docker-compose up --build
|
|
||||||
|
|
||||||
**Ссылка на видео:** https://vk.com/artamonovat?z=video212084908_456239357%2Fvideos212084908%2Fpl_212084908_-2
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
services:
|
|
||||||
worker-1:
|
|
||||||
build:
|
|
||||||
context: ./worker-1
|
|
||||||
volumes:
|
|
||||||
- ./worker-1:/app
|
|
||||||
- ./data:/var/data
|
|
||||||
- ./result:/var/result
|
|
||||||
depends_on:
|
|
||||||
- worker-2
|
|
||||||
|
|
||||||
worker-2:
|
|
||||||
build:
|
|
||||||
context: ./worker-2
|
|
||||||
volumes:
|
|
||||||
- ./worker-2:/app
|
|
||||||
- ./data:/var/data
|
|
||||||
- ./result:/var/result
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
data:
|
|
||||||
result:
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
15
|
|
||||||
18
|
|
||||||
18
|
|
||||||
@ -1 +0,0 @@
|
|||||||
2
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
# Используем образ Python 3.10-slim как основу для нашего контейнера.
|
|
||||||
# slim-версия образа более компактная, что делает контейнер меньше.
|
|
||||||
FROM python:3.10-slim
|
|
||||||
|
|
||||||
# Устанавливаем рабочую директорию в контейнере как /app.
|
|
||||||
# Все последующие команды будут выполняться в этой директории.
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Копируем файл main1.py из текущей директории в директорию /app в контейнере.
|
|
||||||
COPY main1.py .
|
|
||||||
|
|
||||||
# Определяем команду, которая будет выполняться при запуске контейнера.
|
|
||||||
# В данном случае запускается Python-скрипт main1.py.
|
|
||||||
CMD ["python", "main1.py"]
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
import os
|
|
||||||
import glob
|
|
||||||
|
|
||||||
# Формирует файл data1.txt так, что каждая строка файла - кол-во символов в именах файла из каталога /data
|
|
||||||
def main():
|
|
||||||
data_dir = "/var/data"
|
|
||||||
result_file = "/var/result/data1.txt"
|
|
||||||
|
|
||||||
result_dir = os.path.dirname(result_file)
|
|
||||||
if not os.path.exists(result_dir):
|
|
||||||
os.makedirs(result_dir)
|
|
||||||
|
|
||||||
files = glob.glob(os.path.join(data_dir, '*'))
|
|
||||||
|
|
||||||
with open(result_file, 'w') as f:
|
|
||||||
for file in files:
|
|
||||||
filename = os.path.basename(file)
|
|
||||||
f.write(f"{len(filename)}\n")
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
# Используем образ Python 3.10-slim как основу для нашего контейнера.
|
|
||||||
# slim-версия образа более компактная, что делает контейнер меньше.
|
|
||||||
FROM python:3.10-slim
|
|
||||||
|
|
||||||
# Устанавливаем рабочую директорию в контейнере как /app.
|
|
||||||
# Все последующие команды будут выполняться в этой директории.
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Копируем файл main2.py из текущей директории в директорию /app в контейнере.
|
|
||||||
COPY main2.py .
|
|
||||||
|
|
||||||
# Определяем команду, которая будет выполняться при запуске контейнера.
|
|
||||||
# В данном случае запускается Python-скрипт main2.py.
|
|
||||||
CMD ["python", "main2.py"]
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
import os
|
|
||||||
|
|
||||||
# Ищет наибольшее число из файла data1.txt и сохраняет количество таких чисел из последовательности в data2.txt
|
|
||||||
def main():
|
|
||||||
data_file_path = "/var/result/data1.txt"
|
|
||||||
result_file_path = "/var/result/data2.txt"
|
|
||||||
|
|
||||||
if not os.path.exists(data_file_path):
|
|
||||||
data_dir = os.path.dirname(data_file_path)
|
|
||||||
|
|
||||||
if not os.path.exists(result_file_path):
|
|
||||||
result_dir = os.path.dirname(result_file_path)
|
|
||||||
|
|
||||||
with open(data_file_path, 'r') as f:
|
|
||||||
numbers = [int(x.strip()) for x in f.read().splitlines()]
|
|
||||||
|
|
||||||
max_number = max(numbers)
|
|
||||||
count = numbers.count(max_number)
|
|
||||||
|
|
||||||
with open(result_file_path, 'w') as f:
|
|
||||||
f.write(str(count))
|
|
||||||
|
|
||||||
print(f"Количество наибольших чисел: {count}")
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
services:
|
|
||||||
vacancies-service:
|
|
||||||
build: ./vacancy-service
|
|
||||||
ports:
|
|
||||||
- "5000:5000"
|
|
||||||
resumes-service:
|
|
||||||
build: ./resume-service
|
|
||||||
ports:
|
|
||||||
- "5001:5001"
|
|
||||||
gateway:
|
|
||||||
image: nginx:latest
|
|
||||||
ports:
|
|
||||||
- "80:80"
|
|
||||||
volumes:
|
|
||||||
- ./nginx.conf:/etc/nginx/conf.d/default.conf
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
upstream vacancies {
|
|
||||||
server vacancies-service:5000;
|
|
||||||
}
|
|
||||||
|
|
||||||
upstream resumes {
|
|
||||||
server resumes-service:5001;
|
|
||||||
}
|
|
||||||
|
|
||||||
server {
|
|
||||||
listen 80;
|
|
||||||
|
|
||||||
location /vacancies {
|
|
||||||
proxy_pass http://vacancies;
|
|
||||||
}
|
|
||||||
|
|
||||||
location /resumes {
|
|
||||||
proxy_pass http://resumes;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
## Лабораторная работа №3 ПИбд-42 Артамоновой Татьяны
|
|
||||||
|
|
||||||
### Цель:
|
|
||||||
* Реализовать два микросервиса, которые взаимодействуют друг с другом через синхронный обмен сообщениями (HTTP-запросы). Для доступа к микросервисам используется шлюз Nginx, реализованный с помощью Docker Compose.
|
|
||||||
|
|
||||||
### Технологии:
|
|
||||||
|
|
||||||
* Python: Язык программирования для реализации микросервисов.
|
|
||||||
* Flask: Фреймворк Python для создания веб-приложений, использован для создания REST API микросервисов.
|
|
||||||
* requests: Библиотека Python для отправки HTTP-запросов, использован для синхронного обмена сообщениями между микросервисами.
|
|
||||||
* flask_cors: Расширение Flask, которое позволяет микросервисам получать доступ к данным из других доменов.
|
|
||||||
* Docker: Технология контейнеризации для упаковки и запуска микросервисов.
|
|
||||||
* Docker Compose: Инструмент для определения и управления многоконтейнерными приложениями, использован для запуска микросервисов и шлюза Nginx.
|
|
||||||
* Nginx: Сетевой прокси-сервер, использован как шлюз для доступа к микросервисам.
|
|
||||||
|
|
||||||
### Функциональность:
|
|
||||||
|
|
||||||
#### Микросервис vacancies-service:
|
|
||||||
* Реализует CRUD операции для вакансий (GET, POST, PUT, DELETE).
|
|
||||||
* Сохраняет данные о вакансиях в памяти (в словаре vacancies).
|
|
||||||
* Получает информацию о резюме из микросервиса resumes-service через HTTP-запрос.
|
|
||||||
* Включает информацию о резюме в ответ JSON для вакансии.
|
|
||||||
#### Микросервис resumes-service:
|
|
||||||
* Реализует CRUD операции для резюме (GET, POST, PUT, DELETE).
|
|
||||||
* Сохраняет данные о резюме в памяти (в словаре resumes).
|
|
||||||
#### Шлюз Nginx:
|
|
||||||
* Перенаправляет HTTP-запросы на соответствующие микросервисы.
|
|
||||||
* Предоставляет единую точку входа для доступа к микросервисам.
|
|
||||||
|
|
||||||
### Запуск программы:
|
|
||||||
|
|
||||||
* Запуск команды docker-compose up -d
|
|
||||||
|
|
||||||
### Ссылка на видео:
|
|
||||||
https://vk.com/artamonovat?z=video212084908_456239358%2Fvideos212084908%2Fpl_212084908_-2
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
FROM python:3.9
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
COPY requirements.txt .
|
|
||||||
|
|
||||||
RUN pip install -r requirements.txt
|
|
||||||
|
|
||||||
COPY . .
|
|
||||||
|
|
||||||
CMD ["python", "resume.py"]
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
flask
|
|
||||||
requests
|
|
||||||
flask_cors
|
|
||||||
@ -1,79 +0,0 @@
|
|||||||
import uuid
|
|
||||||
import json
|
|
||||||
from flask import Flask, request, jsonify
|
|
||||||
from flask_cors import CORS
|
|
||||||
|
|
||||||
|
|
||||||
class Resume:
|
|
||||||
def __init__(self, uuid, full_name, skills, experience, phone, email):
|
|
||||||
self.uuid = uuid
|
|
||||||
self.full_name = full_name
|
|
||||||
self.skills = skills
|
|
||||||
self.experience = experience
|
|
||||||
self.phone = phone
|
|
||||||
self.email = email
|
|
||||||
|
|
||||||
|
|
||||||
app = Flask(__name__)
|
|
||||||
CORS(app)
|
|
||||||
|
|
||||||
resumes = {}
|
|
||||||
|
|
||||||
|
|
||||||
@app.route("/resumes", methods=["GET"])
|
|
||||||
def get_resumes():
|
|
||||||
return jsonify([resume.__dict__ for resume in resumes.values()])
|
|
||||||
|
|
||||||
|
|
||||||
@app.route("/resumes/<resume_uuid>", methods=["GET"])
|
|
||||||
def get_resume(resume_uuid):
|
|
||||||
resume = resumes.get(resume_uuid)
|
|
||||||
if resume:
|
|
||||||
return jsonify(resume.__dict__)
|
|
||||||
else:
|
|
||||||
return jsonify({"error": "Resume not found"}), 404
|
|
||||||
|
|
||||||
|
|
||||||
@app.route("/resumes", methods=["POST"])
|
|
||||||
def create_resume():
|
|
||||||
data = request.get_json()
|
|
||||||
resume_uuid = str(uuid.uuid4())
|
|
||||||
resume = Resume(
|
|
||||||
resume_uuid,
|
|
||||||
data["full_name"],
|
|
||||||
data["skills"],
|
|
||||||
data["experience"],
|
|
||||||
data["phone"],
|
|
||||||
data["email"],
|
|
||||||
)
|
|
||||||
resumes[resume_uuid] = resume
|
|
||||||
return jsonify(resume.__dict__), 201
|
|
||||||
|
|
||||||
|
|
||||||
@app.route("/resumes/<resume_uuid>", methods=["PUT"])
|
|
||||||
def update_resume(resume_uuid):
|
|
||||||
resume = resumes.get(resume_uuid)
|
|
||||||
if resume:
|
|
||||||
data = request.get_json()
|
|
||||||
resume.full_name = data.get("full_name", resume.full_name)
|
|
||||||
resume.skills = data.get("skills", resume.skills)
|
|
||||||
resume.experience = data.get("experience", resume.experience)
|
|
||||||
resume.phone = data.get("phone", resume.phone)
|
|
||||||
resume.email = data.get("email", resume.email)
|
|
||||||
return jsonify(resume.__dict__)
|
|
||||||
else:
|
|
||||||
return jsonify({"error": "Resume not found"}), 404
|
|
||||||
|
|
||||||
|
|
||||||
@app.route("/resumes/<resume_uuid>", methods=["DELETE"])
|
|
||||||
def delete_resume(resume_uuid):
|
|
||||||
resume = resumes.get(resume_uuid)
|
|
||||||
if resume:
|
|
||||||
del resumes[resume_uuid]
|
|
||||||
return "", 200
|
|
||||||
else:
|
|
||||||
return jsonify({"error": "Resume not found"}), 404
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
app.run(debug=True, host="0.0.0.0", port=5001)
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
FROM python:3.9
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
COPY requirements.txt .
|
|
||||||
|
|
||||||
RUN pip install -r requirements.txt
|
|
||||||
|
|
||||||
COPY . .
|
|
||||||
|
|
||||||
CMD ["python", "vacancy.py"]
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
flask
|
|
||||||
requests
|
|
||||||
flask_cors
|
|
||||||
@ -1,124 +0,0 @@
|
|||||||
import uuid
|
|
||||||
import json
|
|
||||||
from flask import Flask, request, jsonify
|
|
||||||
from flask_cors import CORS
|
|
||||||
import requests
|
|
||||||
from requests.adapters import HTTPAdapter
|
|
||||||
from requests.packages.urllib3.util.retry import Retry
|
|
||||||
|
|
||||||
class Vacancy:
|
|
||||||
def __init__(self, uuid, title, company, description, salary, resume_uuid):
|
|
||||||
self.uuid = uuid
|
|
||||||
self.title = title
|
|
||||||
self.company = company
|
|
||||||
self.description = description
|
|
||||||
self.salary = salary
|
|
||||||
self.resume_uuid = resume_uuid
|
|
||||||
self.resume_info = None
|
|
||||||
|
|
||||||
def to_dict(self):
|
|
||||||
if self.resume_info:
|
|
||||||
return {
|
|
||||||
"uuid": self.uuid,
|
|
||||||
"title": self.title,
|
|
||||||
"company": self.company,
|
|
||||||
"description": self.description,
|
|
||||||
"salary": self.salary,
|
|
||||||
"resume_uuid": self.resume_uuid,
|
|
||||||
"resume_info": self.resume_info
|
|
||||||
}
|
|
||||||
else:
|
|
||||||
return {
|
|
||||||
"uuid": self.uuid,
|
|
||||||
"title": self.title,
|
|
||||||
"company": self.company,
|
|
||||||
"description": self.description,
|
|
||||||
"salary": self.salary,
|
|
||||||
"resume_uuid": self.resume_uuid
|
|
||||||
}
|
|
||||||
|
|
||||||
app = Flask(__name__)
|
|
||||||
CORS(app)
|
|
||||||
|
|
||||||
vacancies = {}
|
|
||||||
|
|
||||||
@app.route("/vacancies", methods=["GET"])
|
|
||||||
def get_vacancies():
|
|
||||||
return jsonify([vacancy.to_dict() for vacancy in vacancies.values()])
|
|
||||||
|
|
||||||
@app.route("/vacancies/<vacancy_uuid>", methods=["GET"])
|
|
||||||
def get_vacancy(vacancy_uuid):
|
|
||||||
vacancy = vacancies.get(vacancy_uuid)
|
|
||||||
if vacancy:
|
|
||||||
if not vacancy.resume_info:
|
|
||||||
vacancy.resume_info = get_resume_info(vacancy.resume_uuid)
|
|
||||||
return jsonify(vacancy.to_dict())
|
|
||||||
else:
|
|
||||||
return jsonify({"error": "Vacancy not found"}), 404
|
|
||||||
|
|
||||||
@app.route("/vacancies", methods=["POST"])
|
|
||||||
def create_vacancy():
|
|
||||||
data = request.get_json()
|
|
||||||
vacancy_uuid = str(uuid.uuid4())
|
|
||||||
vacancy = Vacancy(
|
|
||||||
vacancy_uuid,
|
|
||||||
data["title"],
|
|
||||||
data["company"],
|
|
||||||
data["description"],
|
|
||||||
data["salary"],
|
|
||||||
data["resume_uuid"],
|
|
||||||
)
|
|
||||||
vacancies[vacancy_uuid] = vacancy
|
|
||||||
vacancy.resume_info = get_resume_info(vacancy.resume_uuid)
|
|
||||||
return jsonify(vacancy.to_dict()), 201
|
|
||||||
|
|
||||||
@app.route("/vacancies/<vacancy_uuid>", methods=["PUT"])
|
|
||||||
def update_vacancy(vacancy_uuid):
|
|
||||||
vacancy = vacancies.get(vacancy_uuid)
|
|
||||||
if vacancy:
|
|
||||||
data = request.get_json()
|
|
||||||
vacancy.title = data.get("title", vacancy.title)
|
|
||||||
vacancy.company = data.get("company", vacancy.company)
|
|
||||||
vacancy.description = data.get("description", vacancy.description)
|
|
||||||
vacancy.salary = data.get("salary", vacancy.salary)
|
|
||||||
vacancy.resume_uuid = data.get("resume_uuid", vacancy.resume_uuid)
|
|
||||||
vacancy.resume_info = get_resume_info(vacancy.resume_uuid)
|
|
||||||
return jsonify(vacancy.to_dict())
|
|
||||||
else:
|
|
||||||
return jsonify({"error": "Vacancy not found"}), 404
|
|
||||||
|
|
||||||
@app.route("/vacancies/<vacancy_uuid>", methods=["DELETE"])
|
|
||||||
def delete_vacancy(vacancy_uuid):
|
|
||||||
vacancy = vacancies.get(vacancy_uuid)
|
|
||||||
if vacancy:
|
|
||||||
del vacancies[vacancy_uuid]
|
|
||||||
return "", 200
|
|
||||||
else:
|
|
||||||
return jsonify({"error": "Vacancy not found"}), 404
|
|
||||||
|
|
||||||
def get_resume_info(resume_uuid):
|
|
||||||
url = f'http://resumes-service:5001/resumes/{resume_uuid}'
|
|
||||||
|
|
||||||
# Настройка retry механизма
|
|
||||||
retries = Retry(
|
|
||||||
total=3, # Максимальное количество повторов
|
|
||||||
status_forcelist=[429, 500, 502, 503, 504], # Коды статуса, для которых нужно повторить запрос
|
|
||||||
backoff_factor=0.3, # Время ожидания перед повторной попыткой
|
|
||||||
)
|
|
||||||
adapter = HTTPAdapter(max_retries=retries)
|
|
||||||
http = requests.Session()
|
|
||||||
http.mount("https://", adapter)
|
|
||||||
http.mount("http://", adapter)
|
|
||||||
|
|
||||||
try:
|
|
||||||
response = http.get(url)
|
|
||||||
if response.status_code == 200:
|
|
||||||
return response.json()
|
|
||||||
else:
|
|
||||||
return None
|
|
||||||
except requests.exceptions.RequestException as e:
|
|
||||||
print(f"Ошибка при запросе к resumes-service: {e}")
|
|
||||||
return None
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
app.run(debug=True, host="0.0.0.0", port=5000)
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
import pika
|
|
||||||
import json
|
|
||||||
import time
|
|
||||||
|
|
||||||
credentials = pika.PlainCredentials('guest', 'guest')
|
|
||||||
connection = pika.BlockingConnection(
|
|
||||||
pika.ConnectionParameters(host='localhost', credentials=credentials))
|
|
||||||
channel = connection.channel()
|
|
||||||
|
|
||||||
channel.queue_declare(queue='order_queue_1')
|
|
||||||
|
|
||||||
channel.queue_bind(exchange='order_events', queue='order_queue_1')
|
|
||||||
|
|
||||||
def callback(ch, method, properties, body):
|
|
||||||
event = json.loads(body.decode('utf-8'))
|
|
||||||
print(f'Получено событие (очередь 1): {event}')
|
|
||||||
print(f'Обработка заказа {event["order_id"]}...')
|
|
||||||
time.sleep(2)
|
|
||||||
|
|
||||||
channel.basic_consume(queue='order_queue_1', on_message_callback=callback, auto_ack=True)
|
|
||||||
|
|
||||||
print('Ожидание сообщений (очередь 1)...')
|
|
||||||
channel.start_consuming()
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
import pika
|
|
||||||
import json
|
|
||||||
import time
|
|
||||||
|
|
||||||
credentials = pika.PlainCredentials('guest', 'guest')
|
|
||||||
connection = pika.BlockingConnection(
|
|
||||||
pika.ConnectionParameters(host='localhost', credentials=credentials))
|
|
||||||
channel = connection.channel()
|
|
||||||
|
|
||||||
channel.queue_declare(queue='order_queue_2')
|
|
||||||
|
|
||||||
channel.queue_bind(exchange='order_events', queue='order_queue_2')
|
|
||||||
|
|
||||||
def callback(ch, method, properties, body):
|
|
||||||
event = json.loads(body.decode('utf-8'))
|
|
||||||
print(f'Получено событие (очередь 2): {event}')
|
|
||||||
print(f'Обработка заказа {event["order_id"]} завершена.')
|
|
||||||
|
|
||||||
channel.basic_consume(queue='order_queue_2', on_message_callback=callback, auto_ack=True)
|
|
||||||
|
|
||||||
print('Ожидание сообщений (очередь 2)...')
|
|
||||||
channel.start_consuming()
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
import pika
|
|
||||||
import json
|
|
||||||
import time
|
|
||||||
import random
|
|
||||||
|
|
||||||
credentials = pika.PlainCredentials('guest', 'guest')
|
|
||||||
connection = pika.BlockingConnection(
|
|
||||||
pika.ConnectionParameters(host='localhost', credentials=credentials))
|
|
||||||
channel = connection.channel()
|
|
||||||
|
|
||||||
channel.exchange_declare(exchange='order_events', exchange_type='fanout')
|
|
||||||
|
|
||||||
while True:
|
|
||||||
event = {
|
|
||||||
'event_type': 'order_created',
|
|
||||||
'order_id': random.randint(1000, 9999),
|
|
||||||
'customer_name': f'Клиент {random.randint(1, 100)}',
|
|
||||||
'product_name': f'Товар {random.randint(1, 10)}',
|
|
||||||
'quantity': random.randint(1, 10),
|
|
||||||
'timestamp': time.time()
|
|
||||||
}
|
|
||||||
|
|
||||||
channel.basic_publish(
|
|
||||||
exchange='order_events',
|
|
||||||
routing_key='',
|
|
||||||
body=json.dumps(event)
|
|
||||||
)
|
|
||||||
print(f'Опубликовано событие: {event}')
|
|
||||||
time.sleep(1)
|
|
||||||
|
|
||||||
connection.close()
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 44 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 28 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 46 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 44 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 89 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 125 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 109 KiB |
@ -1,26 +0,0 @@
|
|||||||
## Лабораторная работа №4 ПИбд-42 Артамонова Татьяна
|
|
||||||
|
|
||||||
### Прохождение туториала
|
|
||||||
1. 
|
|
||||||
2. 
|
|
||||||
3. 
|
|
||||||
|
|
||||||
### Запуск приложений и анализ скорости обработки
|
|
||||||
|
|
||||||
1. Запуск Publisher, Consumer 1 и Consumer 2.
|
|
||||||
* Consumer 1: Очередь order_queue_1 будет иметь некоторое количество сообщений, так как Consumer 1 обрабатывает сообщения с задержкой в 2 секунды.
|
|
||||||
* Consumer 2: Очередь order_queue_2 будет практически пустой, так как Consumer 2 обрабатывает сообщения моментально.
|
|
||||||
|
|
||||||
2. Запуск нескольких копий Consumer 1
|
|
||||||
* Очередь order_queue_1 будет иметь меньше сообщений, так как 3 Consumer-а обрабатывают сообщения быстрее, чем 1 Consumer.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
### Видео
|
|
||||||
https://vk.com/video/@artamonovat?section=upload&z=video212084908_456239359
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
import pika, sys, os
|
|
||||||
|
|
||||||
def main():
|
|
||||||
connection = pika.BlockingConnection(pika.ConnectionParameters(host='localhost'))
|
|
||||||
channel = connection.channel()
|
|
||||||
|
|
||||||
channel.queue_declare(queue='hello')
|
|
||||||
|
|
||||||
def callback(ch, method, properties, body):
|
|
||||||
print(f" [x] Received {body}")
|
|
||||||
|
|
||||||
channel.basic_consume(queue='hello', on_message_callback=callback, auto_ack=True)
|
|
||||||
|
|
||||||
print(' [*] Waiting for messages. To exit press CTRL+C')
|
|
||||||
channel.start_consuming()
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
try:
|
|
||||||
main()
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
print('Interrupted')
|
|
||||||
try:
|
|
||||||
sys.exit(0)
|
|
||||||
except SystemExit:
|
|
||||||
os._exit(0)
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
import pika
|
|
||||||
|
|
||||||
connection = pika.BlockingConnection(
|
|
||||||
pika.ConnectionParameters(host='localhost'))
|
|
||||||
channel = connection.channel()
|
|
||||||
|
|
||||||
channel.queue_declare(queue='hello')
|
|
||||||
|
|
||||||
channel.basic_publish(exchange='', routing_key='hello', body='Hello World!')
|
|
||||||
print(" [x] Sent 'Hello World!'")
|
|
||||||
connection.close()
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
import pika
|
|
||||||
import sys
|
|
||||||
|
|
||||||
connection = pika.BlockingConnection(
|
|
||||||
pika.ConnectionParameters(host='localhost'))
|
|
||||||
channel = connection.channel()
|
|
||||||
|
|
||||||
channel.queue_declare(queue='task_queue', durable=True)
|
|
||||||
|
|
||||||
message = ' '.join(sys.argv[1:]) or "Hello World!"
|
|
||||||
channel.basic_publish(
|
|
||||||
exchange='',
|
|
||||||
routing_key='task_queue',
|
|
||||||
body=message,
|
|
||||||
properties=pika.BasicProperties(
|
|
||||||
delivery_mode=pika.DeliveryMode.Persistent
|
|
||||||
))
|
|
||||||
print(f" [x] Sent {message}")
|
|
||||||
connection.close()
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
import pika
|
|
||||||
import time
|
|
||||||
|
|
||||||
connection = pika.BlockingConnection(
|
|
||||||
pika.ConnectionParameters(host='localhost'))
|
|
||||||
channel = connection.channel()
|
|
||||||
|
|
||||||
channel.queue_declare(queue='task_queue', durable=True)
|
|
||||||
print(' [*] Waiting for messages. To exit press CTRL+C')
|
|
||||||
|
|
||||||
|
|
||||||
def callback(ch, method, properties, body):
|
|
||||||
print(f" [x] Received {body.decode()}")
|
|
||||||
time.sleep(body.count(b'.'))
|
|
||||||
print(" [x] Done")
|
|
||||||
ch.basic_ack(delivery_tag=method.delivery_tag)
|
|
||||||
|
|
||||||
|
|
||||||
channel.basic_qos(prefetch_count=1)
|
|
||||||
channel.basic_consume(queue='task_queue', on_message_callback=callback)
|
|
||||||
|
|
||||||
channel.start_consuming()
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
import pika
|
|
||||||
import sys
|
|
||||||
|
|
||||||
connection = pika.BlockingConnection(
|
|
||||||
pika.ConnectionParameters(host='localhost'))
|
|
||||||
channel = connection.channel()
|
|
||||||
|
|
||||||
channel.exchange_declare(exchange='logs', exchange_type='fanout')
|
|
||||||
|
|
||||||
message = ' '.join(sys.argv[1:]) or "info: Hello World!"
|
|
||||||
channel.basic_publish(exchange='logs', routing_key='', body=message)
|
|
||||||
print(f" [x] Sent {message}")
|
|
||||||
connection.close()
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
import pika
|
|
||||||
|
|
||||||
connection = pika.BlockingConnection(
|
|
||||||
pika.ConnectionParameters(host='localhost'))
|
|
||||||
channel = connection.channel()
|
|
||||||
|
|
||||||
channel.exchange_declare(exchange='logs', exchange_type='fanout')
|
|
||||||
|
|
||||||
result = channel.queue_declare(queue='', exclusive=True)
|
|
||||||
queue_name = result.method.queue
|
|
||||||
|
|
||||||
channel.queue_bind(exchange='logs', queue=queue_name)
|
|
||||||
|
|
||||||
print(' [*] Waiting for logs. To exit press 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()
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
**/.classpath
|
|
||||||
**/.dockerignore
|
|
||||||
**/.env
|
|
||||||
**/.git
|
|
||||||
**/.gitignore
|
|
||||||
**/.project
|
|
||||||
**/.settings
|
|
||||||
**/.toolstarget
|
|
||||||
**/.vs
|
|
||||||
**/.vscode
|
|
||||||
**/*.*proj.user
|
|
||||||
**/*.dbmdl
|
|
||||||
**/*.jfm
|
|
||||||
**/azds.yaml
|
|
||||||
**/bin
|
|
||||||
**/charts
|
|
||||||
**/docker-compose*
|
|
||||||
**/Dockerfile*
|
|
||||||
**/node_modules
|
|
||||||
**/npm-debug.log
|
|
||||||
**/obj
|
|
||||||
**/secrets.dev.yaml
|
|
||||||
**/values.dev.yaml
|
|
||||||
LICENSE
|
|
||||||
README.md
|
|
||||||
!**/.gitignore
|
|
||||||
!.git/HEAD
|
|
||||||
!.git/config
|
|
||||||
!.git/packed-refs
|
|
||||||
!.git/refs/heads/**
|
|
||||||
484
balakhonov_danila_lab_3/ApiRestaurant/.gitignore
vendored
484
balakhonov_danila_lab_3/ApiRestaurant/.gitignore
vendored
@ -1,484 +0,0 @@
|
|||||||
## 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
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
|
||||||
<UserSecretsId>9589d6f5-875c-4d7d-8e68-37a2077e80be</UserSecretsId>
|
|
||||||
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
|
||||||
<DockerfileContext>.</DockerfileContext>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.10" />
|
|
||||||
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
|
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
@ApiRestaurant_HostAddress = http://localhost:5089
|
|
||||||
|
|
||||||
GET {{ApiRestaurant_HostAddress}}/weatherforecast/
|
|
||||||
Accept: application/json
|
|
||||||
|
|
||||||
###
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
|
||||||
# Visual Studio Version 17
|
|
||||||
VisualStudioVersion = 17.11.35222.181
|
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiRestaurant", "ApiRestaurant.csproj", "{6E19ADDC-7351-4145-9C49-B0CC87BD1206}"
|
|
||||||
EndProject
|
|
||||||
Global
|
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
|
||||||
Debug|Any CPU = Debug|Any CPU
|
|
||||||
Release|Any CPU = Release|Any CPU
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
|
||||||
{6E19ADDC-7351-4145-9C49-B0CC87BD1206}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{6E19ADDC-7351-4145-9C49-B0CC87BD1206}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{6E19ADDC-7351-4145-9C49-B0CC87BD1206}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{6E19ADDC-7351-4145-9C49-B0CC87BD1206}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
|
||||||
HideSolutionNode = FALSE
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
|
||||||
SolutionGuid = {C62DE3C6-63AA-4075-9729-9F5ECD4E7B51}
|
|
||||||
EndGlobalSection
|
|
||||||
EndGlobal
|
|
||||||
@ -1,59 +0,0 @@
|
|||||||
using ApiRestaurant.Models;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
|
|
||||||
namespace ApiRestaurant.Controllers;
|
|
||||||
|
|
||||||
[Route("api/[controller]")]
|
|
||||||
[ApiController]
|
|
||||||
public class RestaurantController : ControllerBase
|
|
||||||
{
|
|
||||||
private RestaurantContext _context;
|
|
||||||
public RestaurantController(RestaurantContext context)
|
|
||||||
{
|
|
||||||
_context = context;
|
|
||||||
}
|
|
||||||
|
|
||||||
[HttpGet]
|
|
||||||
public Task<List<Restaurant>> GetAll() {
|
|
||||||
return _context.Restaurants.ToListAsync();
|
|
||||||
}
|
|
||||||
|
|
||||||
[HttpGet("{id}")]
|
|
||||||
public async Task<ActionResult<Restaurant?>> GetOne(Guid id) {
|
|
||||||
var restaurant = await _context.Restaurants.FindAsync(id);
|
|
||||||
if (restaurant == null) return NotFound($"Restourant with [id: '{id}'] not found");
|
|
||||||
var waiters = await WaiterApiClient.GetAllForRestaurant(id);
|
|
||||||
restaurant.Waiters = waiters;
|
|
||||||
return restaurant;
|
|
||||||
}
|
|
||||||
|
|
||||||
[HttpPost]
|
|
||||||
public ActionResult<Restaurant> Create(RestaurantDTO restaurant) {
|
|
||||||
var newRestaurant = new Restaurant { Name = restaurant.Name };
|
|
||||||
var res = _context.Restaurants.Add(newRestaurant);
|
|
||||||
_context.SaveChanges();
|
|
||||||
return res.Entity;
|
|
||||||
}
|
|
||||||
|
|
||||||
[HttpPut("{id}")]
|
|
||||||
public ActionResult<Restaurant> Update(Guid id, RestaurantDTO restaurant) {
|
|
||||||
var oldRestaurant = _context.Restaurants.FirstOrDefault(r => r.Id == id);
|
|
||||||
if (oldRestaurant == null) return NotFound();
|
|
||||||
oldRestaurant.Name = restaurant.Name;
|
|
||||||
var res = _context.Restaurants.Update(oldRestaurant);
|
|
||||||
_context.SaveChangesAsync();
|
|
||||||
return res.Entity;
|
|
||||||
}
|
|
||||||
|
|
||||||
[HttpDelete]
|
|
||||||
public ActionResult Delete(Guid id) {
|
|
||||||
var restaurant = _context.Restaurants.FirstOrDefault(r => r.Id == id);
|
|
||||||
if (restaurant is null) return NotFound();
|
|
||||||
_context.Restaurants.Remove(restaurant);
|
|
||||||
_context.SaveChangesAsync();
|
|
||||||
return Ok();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public record RestaurantDTO(string Name);
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
# См. статью по ссылке https://aka.ms/customizecontainer, чтобы узнать как настроить контейнер отладки и как Visual Studio использует этот Dockerfile для создания образов для ускорения отладки.
|
|
||||||
|
|
||||||
# Этот этап используется при запуске из VS в быстром режиме (по умолчанию для конфигурации отладки)
|
|
||||||
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
|
|
||||||
USER app
|
|
||||||
WORKDIR /app
|
|
||||||
EXPOSE 8080
|
|
||||||
EXPOSE 8081
|
|
||||||
|
|
||||||
|
|
||||||
# Этот этап используется для сборки проекта службы
|
|
||||||
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
|
|
||||||
ARG BUILD_CONFIGURATION=Release
|
|
||||||
WORKDIR /src
|
|
||||||
COPY ["ApiRestaurant.csproj", "."]
|
|
||||||
RUN dotnet restore "./ApiRestaurant.csproj"
|
|
||||||
COPY . .
|
|
||||||
WORKDIR "/src/."
|
|
||||||
RUN dotnet build "./ApiRestaurant.csproj" -c $BUILD_CONFIGURATION -o /app/build
|
|
||||||
|
|
||||||
# Этот этап используется для публикации проекта службы, который будет скопирован на последний этап
|
|
||||||
FROM build AS publish
|
|
||||||
ARG BUILD_CONFIGURATION=Release
|
|
||||||
RUN dotnet publish "./ApiRestaurant.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
|
|
||||||
|
|
||||||
# Этот этап используется в рабочей среде или при запуске из VS в обычном режиме (по умолчанию, когда конфигурация отладки не используется)
|
|
||||||
FROM base AS final
|
|
||||||
WORKDIR /app
|
|
||||||
COPY --from=publish /app/publish .
|
|
||||||
ENTRYPOINT ["dotnet", "ApiRestaurant.dll"]
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user