diff --git a/README.md b/README.md index b86fd4d..f099f74 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,15 @@ # teh +Группа микросервисов (docker контейнеров) для автоматизации процессов, +связанных с учетом обучений -группа микросервисов, для автоматизации деятельности отдела технологического сопровождения обучения \ No newline at end of file +# base +контейнер с работающей СУБД postgres + +# face +Предоставляет пользователю web-интерфейс, для работы с реестром обученных + +# source +Предоставляет пользователю api, для работы с базой данных + +# storage +Предоставляет пользователю api, для работы с файловой системой \ No newline at end of file diff --git a/face/.gitignore b/face/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/face/.gitignore @@ -0,0 +1,33 @@ +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/ diff --git a/face/.mvn/wrapper/maven-wrapper.properties b/face/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..d58dfb7 --- /dev/null +++ b/face/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# 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 diff --git a/face/docker-compose.yaml b/face/docker-compose.yaml new file mode 100644 index 0000000..cb78c8b --- /dev/null +++ b/face/docker-compose.yaml @@ -0,0 +1,20 @@ +version: "3.7" +services: + face: + container_name: "face" + hostname: "face" + build: + context: ../face + dockerfile: dockerfile + image: "face" + command: ["java","-jar","/app/face/face-0.1.jar"] + ports: + - 83:8383 + restart: unless-stopped + networks: + - teh-net +networks: + teh-net: + name: teh-net + external: true + driver: bridge \ No newline at end of file diff --git a/face/dockerfile b/face/dockerfile new file mode 100644 index 0000000..ee71fdf --- /dev/null +++ b/face/dockerfile @@ -0,0 +1,5 @@ +FROM openjdk:17-jdk-alpine +RUN apk update +RUN apk upgrade +COPY target/face-0.1.jar /app/face/face-0.1.jar +WORKDIR /app/face diff --git a/face/logs/app.log b/face/logs/app.log new file mode 100644 index 0000000..e69de29 diff --git a/face/mvnw b/face/mvnw new file mode 100644 index 0000000..19529dd --- /dev/null +++ b/face/mvnw @@ -0,0 +1,259 @@ +#!/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-,maven-mvnd--}/ +[ -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 "$@" diff --git a/face/mvnw.cmd b/face/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/face/mvnw.cmd @@ -0,0 +1,149 @@ +<# : 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-,maven-mvnd--}/ +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" diff --git a/face/pom.xml b/face/pom.xml new file mode 100644 index 0000000..f714780 --- /dev/null +++ b/face/pom.xml @@ -0,0 +1,94 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.3.4 + + + gsp.technologies + face + 0.1 + face + микросервис, предоставляющий графический интерфейс, для работы с реестром обученных + + + + + + + + + + + + + + + 17 + + + + org.projectlombok + lombok + true + + + ch.qos.logback + logback-classic + + + + ch.qos.logback.contrib + logback-json-classic + 0.1.5 + + + ch.qos.logback.contrib + logback-jackson + 0.1.5 + + + com.fasterxml.jackson.core + jackson-databind + + + + org.springframework.boot + spring-boot-starter-webflux + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/face/run.ps1 b/face/run.ps1 new file mode 100644 index 0000000..322a5b1 --- /dev/null +++ b/face/run.ps1 @@ -0,0 +1,23 @@ +$container_name = "face" +$image_name = "face" +$build_name = "face" +$code_location = "C:\Users\devuser\Documents\code\teh\face" + +# Остановить и удалить существующий контейнер +docker stop $container_name +docker rm $container_name + +# Удалить существующий образ +docker rmi $image_name + +# Перейти в каталог с проектом +Set-Location $code_location + +# Собрать jar с помощью Maven +mvn clean package + +# Запустить контейнер с помощью docker-compose +docker-compose up + +# Пауза скрипта +Pause \ No newline at end of file diff --git a/face/src/main/java/gsp/technologies/face/FaceApplication.java b/face/src/main/java/gsp/technologies/face/FaceApplication.java new file mode 100644 index 0000000..b0e3384 --- /dev/null +++ b/face/src/main/java/gsp/technologies/face/FaceApplication.java @@ -0,0 +1,13 @@ +package gsp.technologies.face; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class FaceApplication { + + public static void main(String[] args) { + SpringApplication.run(FaceApplication.class, args); + } + +} diff --git a/face/src/main/java/gsp/technologies/face/controllers/Hello.java b/face/src/main/java/gsp/technologies/face/controllers/Hello.java new file mode 100644 index 0000000..6473385 --- /dev/null +++ b/face/src/main/java/gsp/technologies/face/controllers/Hello.java @@ -0,0 +1,19 @@ +package gsp.technologies.face.controllers; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +public class Hello { + + /** + * Hello-page + * - описание сервиса + * + * @return String, name of the template + */ + @GetMapping("/hello") + public String hello(){ + return "hello"; + } +} diff --git a/face/src/main/java/gsp/technologies/face/controllers/mainframe/MainframeController.java b/face/src/main/java/gsp/technologies/face/controllers/mainframe/MainframeController.java new file mode 100644 index 0000000..7f729f7 --- /dev/null +++ b/face/src/main/java/gsp/technologies/face/controllers/mainframe/MainframeController.java @@ -0,0 +1,13 @@ +package gsp.technologies.face.controllers.mainframe; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +public class MainframeController { + + @GetMapping("/mainframe") + public String mainframe(){ + return "mainframe"; + } +} diff --git a/face/src/main/java/gsp/technologies/face/logger/Try.java b/face/src/main/java/gsp/technologies/face/logger/Try.java new file mode 100644 index 0000000..9c287dc --- /dev/null +++ b/face/src/main/java/gsp/technologies/face/logger/Try.java @@ -0,0 +1,20 @@ +package gsp.technologies.face.logger; + +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; + +public class Try { + private static final Logger console = LoggerFactory.getLogger(Try.class); + // private static final Logger file = LoggerFactory.getLogger("gsp.technologies.face"); + + + public static void main(String[] args) { + System.out.println("Логирование ..."); + // file.trace("вход в метод .."); + console.debug("Получен запрос 198.12.34.56"); + console.info("Пользователь авторизовался: john"); + console.warn("Подключение к серверу потеряно. Повторная попытка..."); + console.error("Ошибка записи в файл: myFile.txt"); + } + +} diff --git a/face/src/main/resources/application.yaml b/face/src/main/resources/application.yaml new file mode 100644 index 0000000..94eddc6 --- /dev/null +++ b/face/src/main/resources/application.yaml @@ -0,0 +1,22 @@ +spring: + application: + name: face + servlet: + multipart: + max-file-size: 50MB + max-request-size: 50MB + mvc: + hiddenmethod: + filter: + enabled: true + format: + date: yyyy-MM-dd + date-time: yyyy-MM-dd HH:mm:ss + time: HH:mm:ss +server: + port: 8383 + max-http-request-header-size: 50MB + tomcat: + max-swallow-size: 50MB + max-http-form-post-size: 50MB + maxParameterCount: 10000 \ No newline at end of file diff --git a/face/src/main/resources/logback.xml b/face/src/main/resources/logback.xml new file mode 100644 index 0000000..3a2ca14 --- /dev/null +++ b/face/src/main/resources/logback.xml @@ -0,0 +1,38 @@ + + + + + + + UTF-8 + + yyyy-MM-dd'T'HH:mm:ss.SSSX + Etc/UTC + + true + + + + + + + + + + + + + diff --git a/face/src/main/resources/static/content/md/hello.md b/face/src/main/resources/static/content/md/hello.md new file mode 100644 index 0000000..5c249e9 --- /dev/null +++ b/face/src/main/resources/static/content/md/hello.md @@ -0,0 +1,35 @@ +# teh-face + +# view + +## [GET# /document/list](http://localhost:83/document/list) +Получение из базы данных сведений о документах, размещенных в файловом хранилище. +Передача списка в представление для пользователя. +Возврат пользователю шаблона списка документов для работы пользователя с документами. + +## /storage + +## /storage/upload +* Отправка файла в хранилище и сведений о нем в базу +* - добавление метаданных файла в базу +* - получение id файла +* - отправка файла с новым именем в хранилище +* Возвращение ползователю обновленной страницы списка файлов + + +## /storage/delete/{name} +Метод не корректно дублирует /document/delete/{id} +Удаление файла из файлового хранилища. Сведения о файле в базе данных сохраняются +* TODO: Add deletion of the record from the database +* TODO: Wrap the operation in a transaction + +## /document/delete/{id} +Удаление файла из файлового хранилища. +Удаление сведений о файле из базы данных. +Направление пользователя на страницу работы со списком файлов. + +## POST# /document/upload +Загрузка файла на сервер + +## /document/view-xlsx/{id} +Просмотр xlsx-файла \ No newline at end of file diff --git a/face/src/main/resources/static/content/md/mainframe.md b/face/src/main/resources/static/content/md/mainframe.md new file mode 100644 index 0000000..c7e4897 --- /dev/null +++ b/face/src/main/resources/static/content/md/mainframe.md @@ -0,0 +1,5 @@ +# mainframe.md +Форма предоставляет пользователю доступ ко всему функционалу платформы +- ссылка на страницу работы с файлами (загрузка, проверка файлов) +- ссылка на страницу работы с данными базы (редактирование данных, формирование отчетов) +- \ No newline at end of file diff --git a/face/src/main/resources/templates/hello.html b/face/src/main/resources/templates/hello.html new file mode 100644 index 0000000..e7cbcdc --- /dev/null +++ b/face/src/main/resources/templates/hello.html @@ -0,0 +1,14 @@ + + + + + + teh-face-hello + + + + + + + \ No newline at end of file diff --git a/face/src/main/resources/templates/mainframe.html b/face/src/main/resources/templates/mainframe.html new file mode 100644 index 0000000..79cde0d --- /dev/null +++ b/face/src/main/resources/templates/mainframe.html @@ -0,0 +1,36 @@ + + + + + + teh-mainframe + + + + + +
+

teh-mainframe

+
+ +
+
+ +
+
+ +
+ + + \ No newline at end of file diff --git a/face/src/test/java/gsp/technologies/face/FaceApplicationTests.java b/face/src/test/java/gsp/technologies/face/FaceApplicationTests.java new file mode 100644 index 0000000..ae7b9b1 --- /dev/null +++ b/face/src/test/java/gsp/technologies/face/FaceApplicationTests.java @@ -0,0 +1,13 @@ +package gsp.technologies.face; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class FaceApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/source/.gitignore b/source/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/source/.gitignore @@ -0,0 +1,33 @@ +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/ diff --git a/source/.mvn/wrapper/maven-wrapper.properties b/source/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..d58dfb7 --- /dev/null +++ b/source/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# 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 diff --git a/source/mvnw b/source/mvnw new file mode 100644 index 0000000..19529dd --- /dev/null +++ b/source/mvnw @@ -0,0 +1,259 @@ +#!/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-,maven-mvnd--}/ +[ -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 "$@" diff --git a/source/mvnw.cmd b/source/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/source/mvnw.cmd @@ -0,0 +1,149 @@ +<# : 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-,maven-mvnd--}/ +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" diff --git a/source/pom.xml b/source/pom.xml new file mode 100644 index 0000000..b9fb17d --- /dev/null +++ b/source/pom.xml @@ -0,0 +1,76 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.3.4 + + + gsp.technologies + source + 0.0.1-SNAPSHOT + source + Demo project for Spring Boot + + + + + + + + + + + + + + + 17 + + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-web + + + + org.postgresql + postgresql + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/source/src/main/java/gsp/technologies/source/SourceApplication.java b/source/src/main/java/gsp/technologies/source/SourceApplication.java new file mode 100644 index 0000000..5294ebc --- /dev/null +++ b/source/src/main/java/gsp/technologies/source/SourceApplication.java @@ -0,0 +1,13 @@ +package gsp.technologies.source; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SourceApplication { + + public static void main(String[] args) { + SpringApplication.run(SourceApplication.class, args); + } + +} diff --git a/source/src/main/resources/application.properties b/source/src/main/resources/application.properties new file mode 100644 index 0000000..97f565a --- /dev/null +++ b/source/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=source diff --git a/source/src/test/java/gsp/technologies/source/SourceApplicationTests.java b/source/src/test/java/gsp/technologies/source/SourceApplicationTests.java new file mode 100644 index 0000000..9578093 --- /dev/null +++ b/source/src/test/java/gsp/technologies/source/SourceApplicationTests.java @@ -0,0 +1,13 @@ +package gsp.technologies.source; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class SourceApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/storage/pom.xml b/storage/pom.xml index b5f81e6..abda027 100644 --- a/storage/pom.xml +++ b/storage/pom.xml @@ -43,6 +43,10 @@ org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-webflux + org.springframework.boot spring-boot-starter-data-jpa diff --git a/storage/src/main/java/gsp/technologies/storage/config/WebClientConfig.java b/storage/src/main/java/gsp/technologies/storage/config/WebClientConfig.java new file mode 100644 index 0000000..1a43b4f --- /dev/null +++ b/storage/src/main/java/gsp/technologies/storage/config/WebClientConfig.java @@ -0,0 +1,22 @@ +package gsp.technologies.storage.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.reactive.function.client.ExchangeStrategies; +import org.springframework.web.reactive.function.client.WebClient; +@Configuration +public class WebClientConfig { + @Bean + WebClient webClient() { + final int maxInMemorySize = 1000 * 1024 * 1024; // 1000MB + final ExchangeStrategies exchangeStrategies = ExchangeStrategies.builder() + .codecs(configurer -> configurer.defaultCodecs().maxInMemorySize(maxInMemorySize)) + .build(); + WebClient webClient = WebClient.builder() + .exchangeStrategies(exchangeStrategies) + // .baseUrl("http://resource-service-api:8181") + .build(); + return webClient; + } + +} \ No newline at end of file diff --git a/storage/src/main/java/gsp/technologies/storage/controllers/hello/api/ApiController.java b/storage/src/main/java/gsp/technologies/storage/controllers/hello/api/ApiController.java index f513363..e25e18c 100644 --- a/storage/src/main/java/gsp/technologies/storage/controllers/hello/api/ApiController.java +++ b/storage/src/main/java/gsp/technologies/storage/controllers/hello/api/ApiController.java @@ -4,6 +4,9 @@ import java.io.IOException; import java.nio.file.Path; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.Resource; +import org.springframework.http.HttpHeaders; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -12,6 +15,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; import gsp.technologies.storage.models.FileMetadata; import gsp.technologies.storage.services.FileService; @@ -34,12 +38,38 @@ public class ApiController { Path p = fs.root(); return fs.listFiles(p); } - // Метод для загрузки на сервер файлов в указанную директорию + // Метод получения корневой директории + @GetMapping("/root") + public @ResponseBody + String root() { + return fs.root().toString(); + } + + /** + * Метод для загрузки на сервер файлов в указанную директорию + * @param filename + * @param content + * @return + * @throws IOException + */ @PostMapping("/files/{filename}") public @ResponseBody - String uploadFile(@PathVariable String filename, @RequestParam byte[] content) throws IOException { + String uploadFile(@PathVariable String filename, @RequestParam (name = "content") byte[] content) throws IOException { + System.out.println("ApiController#uploadFile() ---> OK"); return fs.uploadFile(filename, content); } + + @PostMapping( + path = "/files", + consumes = {"multipart/form-data"}) + public @ResponseBody + String store(@RequestParam("files") MultipartFile[] files) { + System.out.println("ApiController#uploadFile() ---> OK"); + return fs.store(files); + } + + + // Метод для удаления файлов @DeleteMapping("/files/{filename}") public @ResponseBody @@ -52,6 +82,18 @@ public class ApiController { byte[] getFile(@PathVariable String filename) { return fs.getFile(filename); } + + /** + * Скачивание файла с сервера + */ + @GetMapping("/files/download") + public ResponseEntity download(@RequestParam(name = "filename") String filename) { + Resource resource = fs.loadAsResource(filename); + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, + "attachment; filename=\"" + resource.getFilename() + "\"") + .body(resource); + } /** * Создание нового файла с уникальным именем в указанной директории @@ -63,7 +105,7 @@ public class ApiController { * @param content содержимое нового файла * @return имя созданного файла */ - @PostMapping("/files") + @PostMapping("/files/create") public @ResponseBody String createFile(@RequestParam String path, @RequestParam String name, @RequestParam byte[] content) { return fs.createFile(path, name, content); @@ -90,5 +132,7 @@ public class ApiController { void deleteDir(@PathVariable String name) { fs.deleteDirectory(name); } + + } diff --git a/storage/src/main/java/gsp/technologies/storage/controllers/hello/face/FaceController.java b/storage/src/main/java/gsp/technologies/storage/controllers/hello/face/FaceController.java index 88ea5a5..08e2d2b 100644 --- a/storage/src/main/java/gsp/technologies/storage/controllers/hello/face/FaceController.java +++ b/storage/src/main/java/gsp/technologies/storage/controllers/hello/face/FaceController.java @@ -1,5 +1,7 @@ package gsp.technologies.storage.controllers.hello.face; +import java.io.IOException; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; import org.springframework.http.HttpHeaders; @@ -12,19 +14,23 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.servlet.ModelAndView; -import gsp.technologies.storage.services.FileService; +import gsp.technologies.storage.services.RemoteFilesService; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @Controller @RequestMapping("/face/v1") public class FaceController { - private final FileService fs; - + private final RemoteFilesService fs; + @Autowired - public FaceController(FileService fs) { + public FaceController(RemoteFilesService fs) { this.fs = fs; } - + /** * Возвращает форму для загрузки файлов на сервер * @@ -43,28 +49,44 @@ public class FaceController { * @return перенаправляет пользователя на страницу загрузки файлов */ @PostMapping("/upload") - public String uploadFile(@RequestParam("file") MultipartFile file) { + public void uploadFile(@RequestParam("file") MultipartFile file) { + System.out.println("FaceController#uploadFile(): OK"); // Загрузка файлов на сервер и получение их метаданных try { - fs.uploadFile(file.getOriginalFilename(), file.getBytes()); - + fs.uploadFile(file); } catch (Exception e) { System.out.println("Error uploading file: " + e.getMessage()); } // Перенаправление пользователя на страницу загруженного файла - return "redirect:/face/v1/mainframe"; + // return "redirect:/face/v1/mainframe"; } @PostMapping("/upload-multiple-files") @ResponseBody - public String uploadMultipleFiles(@RequestParam("files") MultipartFile[] files) { - for (MultipartFile file : files) { - uploadFile(file); + public ModelAndView uploadMultipleFiles(HttpServletResponse response, @RequestParam("files") MultipartFile[] files) { + // for (MultipartFile file : files) { + // uploadFile(file); + // } + fs.upload(files); + try { + response.sendRedirect("/face/v1/mainframe"); + } catch (IOException e) { + // // TODO Auto-generated catch block + // e.printStackTrace(); + System.out.println("Error redirecting: " + e.getMessage()); } - return "redirect:/face/v1/mainframe"; + return null; + // return "redirect:/face/v1/mainframe"; } + // @PostMapping("/store") + + + + // @PostMapping("/store-multiple-files") + + @GetMapping("/download") @ResponseBody public ResponseEntity download(@RequestParam(name = "filename") String filename) { @@ -74,4 +96,11 @@ public class FaceController { "attachment; filename=\"" + resource.getFilename() + "\"") .body(resource); } + + @GetMapping("/files/delete") + @ResponseBody + public String delete(@RequestParam(name = "filename") String filename) { + fs.deleteFile(filename); + return "redirect:/mainframe"; + } } \ No newline at end of file diff --git a/storage/src/main/java/gsp/technologies/storage/models/FileMetadata.java b/storage/src/main/java/gsp/technologies/storage/models/FileMetadata.java index 319f76b..33a9fa3 100644 --- a/storage/src/main/java/gsp/technologies/storage/models/FileMetadata.java +++ b/storage/src/main/java/gsp/technologies/storage/models/FileMetadata.java @@ -176,17 +176,17 @@ public class FileMetadata { * Получение родительской директории.Если текущий объект является директорией, возвращает путь к родительской директории. * @return метаданные родительской директории */ - public FileMetadata getParent() { - if (path == null || path.isEmpty()) { - return null; - } + // public FileMetadata getParent() { + // if (path == null || path.isEmpty()) { + // return null; + // } - int lastSlashIndex = path.lastIndexOf('/'); - if (lastSlashIndex == -1) { - return null; - } - return new FileMetadata(path.substring(0, lastSlashIndex)); - } + // int lastSlashIndex = path.lastIndexOf('/'); + // if (lastSlashIndex == -1) { + // return null; + // } + // return new FileMetadata(path.substring(0, lastSlashIndex)); + // } /** * Возвращает список дочерних файлов и директорий в текущей директории. @@ -196,17 +196,19 @@ public class FileMetadata { */ public List getChildren() { List children = Collections.emptyList(); - if (path != null && !path.isEmpty()) { + if (path != null + && !path.isEmpty() + && path != "") { try { Path dirPath = Paths.get(path); // Размещаем каждый файл в директории в качестве объекта FileMetadata - //и собераем их в список + // и собераем их в список children = Files.list(dirPath) .map(p -> new FileMetadata(p.toString())) .collect(Collectors.toList()); } catch (IOException e) { - System.out.println("Error reading directory: " + e.getMessage()); - System.out.println("Path: " + path); + // System.out.println("Error reading directory: " + e.getMessage()); + // System.out.println("Path: " + path); } } return children; diff --git a/storage/src/main/java/gsp/technologies/storage/services/FileService.java b/storage/src/main/java/gsp/technologies/storage/services/FileService.java index 47c2d9f..73181b7 100644 --- a/storage/src/main/java/gsp/technologies/storage/services/FileService.java +++ b/storage/src/main/java/gsp/technologies/storage/services/FileService.java @@ -4,6 +4,7 @@ import java.nio.file.Path; import java.util.List; import org.springframework.core.io.Resource; +import org.springframework.web.multipart.MultipartFile; import gsp.technologies.storage.models.FileMetadata; @@ -21,4 +22,5 @@ public interface FileService { public Path root(); void init(); Resource loadAsResource(String filename); + String store(MultipartFile[] files); } \ No newline at end of file diff --git a/storage/src/main/java/gsp/technologies/storage/services/FileServiceImpl.java b/storage/src/main/java/gsp/technologies/storage/services/FileServiceImpl.java index 51f74e8..3a2828b 100644 --- a/storage/src/main/java/gsp/technologies/storage/services/FileServiceImpl.java +++ b/storage/src/main/java/gsp/technologies/storage/services/FileServiceImpl.java @@ -3,16 +3,20 @@ package gsp.technologies.storage.services; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.net.MalformedURLException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; +import java.util.ArrayList; import java.util.Comparator; import java.util.List; import org.springframework.core.io.Resource; import org.springframework.core.io.UrlResource; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; import gsp.technologies.storage.config.StorageConfig; import gsp.technologies.storage.models.FileMetadata; @@ -74,6 +78,7 @@ public class FileServiceImpl implements FileService { */ @Override public String uploadFile(String filename, byte[] content) { + System.out.println("services.FileServiceImpl ----> uploadFile() ---> OK"); try { File file = new File(storageLocation + "/" + filename); if (file.exists()) { @@ -209,11 +214,12 @@ public class FileServiceImpl implements FileService { Path file = load(filename); Resource resource = new UrlResource(file.toUri()); if (resource.exists() || resource.isReadable()) { - return resource; + return resource; } else { - // throw new FileNotFoundException( + // throw new Exception( // "Could not read file: " + filename); + System.err.println("Could not read file: " + filename); } } catch (MalformedURLException e) { @@ -225,4 +231,25 @@ public class FileServiceImpl implements FileService { private Path load(String filename) { return storageLocation.resolve(filename); } + + public String store(MultipartFile file) { + try (InputStream inputStream = file.getInputStream()) { + Files.copy(inputStream, root().resolve(file.getOriginalFilename()), + StandardCopyOption.REPLACE_EXISTING); + } + catch (IOException e) { + System.out.println("Не удалось сохранить файл " + file.getOriginalFilename()); + } + return file.getOriginalFilename(); + } + + @Override + public String store(MultipartFile[] files) { + List names = new ArrayList<>(); + for (MultipartFile file : files) { + names.add(store(file)); + } + return String.join(",", names); + } + } \ No newline at end of file diff --git a/storage/src/main/java/gsp/technologies/storage/services/RemoteFilesService.java b/storage/src/main/java/gsp/technologies/storage/services/RemoteFilesService.java new file mode 100644 index 0000000..7a9527b --- /dev/null +++ b/storage/src/main/java/gsp/technologies/storage/services/RemoteFilesService.java @@ -0,0 +1,119 @@ +package gsp.technologies.storage.services; + +import java.io.IOException; +import java.net.URI; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.Resource; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.reactive.function.client.WebClient; +import org.springframework.web.util.UriBuilder; +import org.springframework.web.util.UriComponents; +import org.springframework.web.util.UriComponentsBuilder; + +import gsp.technologies.storage.models.FileMetadata; +import reactor.core.publisher.Mono; + +/** + * Реализация интерфейса FileService, для доступа к http api + */ +@Service +public class RemoteFilesService { + String rootURL = "http://storage:8282/api/v1/root"; + String filesURL = "http://storage:8282/api/v1/files"; + // String fileUploadURL = "http://storage:8282/api/v1/files"; + private final WebClient client; + + @Autowired + public RemoteFilesService(WebClient client) { + this.client = client; + } + + public String root() { + String root = client.get() + .uri(rootURL) + .retrieve() + .bodyToMono(String.class) + .block(); + // System.out.println("root: " + root); + + return root; + } + + public List listFiles(String location) { + return client.get() + .uri(filesURL) + .retrieve() + .bodyToMono(List.class) + .block(); + } + + // public void uploadFile(String originalFilename, byte[] bytes) { + // System.out.println("originalFilename: " + originalFilename); + // System.out.println("bytes.length: " + bytes.length); + // client.post() + // .uri(filesURL + "/" + originalFilename) + // .body(Mono.just(bytes), byte[].class) + // .retrieve() + // .toBodilessEntity() + // .block(); + // } + + public void uploadFile(MultipartFile file) { + System.out.println("RemoteFilesService#uploadFile(): OK"); + UriComponents uriComponents; + try { + uriComponents = UriComponentsBuilder + .newInstance() + .scheme("http") + .host("storage") + .port(8282) + .path("api/v1/files" + "/" + file.getOriginalFilename()) + .queryParam("content", Mono.just(file.getBytes())).build(); + } catch (IOException e) { + System.out.println("RemoteFilesService#uploadFile(): " + e.getMessage()); + return; + } + URI uri = uriComponents.toUri(); + client.post() + .uri(uri) + .retrieve() + .toBodilessEntity() + .block(); + } + + public void upload(MultipartFile[] files) { + System.out.println("RemoteFilesService#upload(): OK"); + UriComponents uriComponents; + uriComponents = UriComponentsBuilder + .newInstance() + .scheme("http") + .host("storage") + .port(8282) + .path("api/v1/files") + .queryParam("files", Mono.just(files)).build(); + + URI uri = uriComponents.toUri(); + client.post() + .uri(uri) + .header("content-type","multipart/form-data") + .retrieve() + .toBodilessEntity() + .block(); + + } + + public Resource loadAsResource(String filename) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'loadAsResource'"); + } + + public void deleteFile(String filename) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'deleteFile'"); + } + + +} diff --git a/storage/src/main/resources/templates/mainframe.html b/storage/src/main/resources/templates/mainframe.html index 934f251..75d82d9 100644 --- a/storage/src/main/resources/templates/mainframe.html +++ b/storage/src/main/resources/templates/mainframe.html @@ -11,11 +11,11 @@
-
+ @@ -27,7 +27,7 @@

Files (tree):

- +
- + +
@@ -36,10 +36,11 @@ open - download"> + download -