diff --git a/.vscode/launch.json b/.vscode/launch.json index ac5d506..35210bf 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -37,6 +37,16 @@ "projectName": "explorer_rs", "args": "", "envFile": "${workspaceFolder}/.env" + }, + { + "type": "java", + "name": "Spring Boot-StorageRsApplication", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "ru.molokoin.storage_rs.StorageRsApplication", + "projectName": "storage_rs", + "args": "", + "envFile": "${workspaceFolder}/.env" } ] } \ No newline at end of file diff --git a/explorer_rs/.env b/explorer_rs/.env deleted file mode 100644 index edf21a4..0000000 --- a/explorer_rs/.env +++ /dev/null @@ -1 +0,0 @@ -DATA='/app/explorer_rs/uploads' \ No newline at end of file diff --git a/explorer_rs/.mvn/wrapper/maven-wrapper.jar b/explorer_rs/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index cb28b0e..0000000 Binary files a/explorer_rs/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/explorer_rs/.mvn/wrapper/maven-wrapper.properties b/explorer_rs/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index e70e7bc..0000000 --- a/explorer_rs/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,2 +0,0 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/explorer_rs/README.md b/explorer_rs/README.md deleted file mode 100644 index 53cf8ca..0000000 --- a/explorer_rs/README.md +++ /dev/null @@ -1,30 +0,0 @@ -# tech-services -# Общие положения -# Описание микросервисов -## resource-service-api -Хранение данных реестра обученных. -один документ об обучении соответствует одной записи в базе данных. - -## client-service-teachers -добавление записей по одному обучению -добавление записей пакетом -добавление не полных данных об обучении - -## explorer_rs -Сервис работы с файлами: -- загрузка файлов на сервер -- скачивание файлов с сервера -- просмотр списка файлов -- хранение сведений о файлах в базе данных -- представление данных xlsx файлов в json - -## postgres-service -СУБД postgres - -## eurika-service -## monitoring-service -## authorization-service -## registration-service - -# Развертывание платформы -Микросервисы располагаются в контейнерах docker \ No newline at end of file diff --git a/explorer_rs/docker-compose.yaml b/explorer_rs/docker-compose.yaml deleted file mode 100644 index 4789b2c..0000000 --- a/explorer_rs/docker-compose.yaml +++ /dev/null @@ -1,21 +0,0 @@ -version: "3.7" -services: - explorer_rs: - build: - context: ../explorer_rs - dockerfile: dockerfile - image: "explorer_rs" - command: ["java","-jar","/app/explorer_rs/explorer_rs-0.1.jar"] - ports: - - 82:8282 - restart: unless-stopped - volumes: - - data_explorer_rs:${DATA} -volumes: - data_explorer_rs: - external: true -networks: - default: - external: - name: tech_network - driver: bridge \ No newline at end of file diff --git a/explorer_rs/dockerfile b/explorer_rs/dockerfile deleted file mode 100644 index ca16553..0000000 --- a/explorer_rs/dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM openjdk:17-jdk-alpine -RUN apk update -RUN apk upgrade -COPY target/explorer_rs-0.1.jar /app/explorer_rs/explorer_rs-0.1.jar -WORKDIR /app/explorer_rs -# ENTRYPOINT ["java","-jar","/app/resource-service-api-0.1.jar"] -# docker image build -t resource-service-api:latest . -# docker run -d -p80:8181 resource-service-api:latest - -# Путь к загружаемым на сервер данным: -# /app/explorer_rs/uploads -# Нужно создать для него том, чтобы получить доступ к загружаемым на сервер данным \ No newline at end of file diff --git a/explorer_rs/mvnw b/explorer_rs/mvnw deleted file mode 100644 index 66df285..0000000 --- a/explorer_rs/mvnw +++ /dev/null @@ -1,308 +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 -# -# https://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.2.0 -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /usr/local/etc/mavenrc ] ; then - . /usr/local/etc/mavenrc - fi - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "$(uname)" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME - else - JAVA_HOME="/Library/Java/Home"; export JAVA_HOME - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=$(java-config --jre-home) - fi -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --unix "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --unix "$CLASSPATH") -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && - JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="$(which javac)" - if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=$(which readlink) - if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then - if $darwin ; then - javaHome="$(dirname "\"$javaExecutable\"")" - javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" - else - javaExecutable="$(readlink -f "\"$javaExecutable\"")" - fi - javaHome="$(dirname "\"$javaExecutable\"")" - javaHome=$(expr "$javaHome" : '\(.*\)/bin') - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - 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" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=$(cd "$wdir/.." || exit 1; pwd) - fi - # end of workaround - done - printf '%s' "$(cd "$basedir" || exit 1; pwd)" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - # Remove \r in case we run on Windows within Git Bash - # and check out the repository with auto CRLF management - # enabled. Otherwise, we may read lines that are delimited with - # \r\n and produce $'-Xarg\r' rather than -Xarg due to word - # splitting rules. - tr -s '\r\n' ' ' < "$1" - fi -} - -log() { - if [ "$MVNW_VERBOSE" = true ]; then - printf '%s\n' "$1" - fi -} - -BASE_DIR=$(find_maven_basedir "$(dirname "$0")") -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR -log "$MAVEN_PROJECTBASEDIR" - -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" -if [ -r "$wrapperJarPath" ]; then - log "Found $wrapperJarPath" -else - log "Couldn't find $wrapperJarPath, downloading it ..." - - if [ -n "$MVNW_REPOURL" ]; then - wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - else - wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - fi - while IFS="=" read -r key value; do - # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) - safeValue=$(echo "$value" | tr -d '\r') - case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; - esac - done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" - log "Downloading from: $wrapperUrl" - - if $cygwin; then - wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") - fi - - if command -v wget > /dev/null; then - log "Found wget ... using wget" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - log "Found curl ... using curl" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - else - curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - fi - else - log "Falling back to using Java to download" - javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" - javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaSource=$(cygpath --path --windows "$javaSource") - javaClass=$(cygpath --path --windows "$javaClass") - fi - if [ -e "$javaSource" ]; then - if [ ! -e "$javaClass" ]; then - log " - Compiling MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/javac" "$javaSource") - fi - if [ -e "$javaClass" ]; then - log " - Running MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -# If specified, validate the SHA-256 sum of the Maven wrapper jar file -wrapperSha256Sum="" -while IFS="=" read -r key value; do - case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; - esac -done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" -if [ -n "$wrapperSha256Sum" ]; then - wrapperSha256Result=false - if command -v sha256sum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then - wrapperSha256Result=true - fi - elif command -v shasum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then - wrapperSha256Result=true - fi - else - echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." - echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." - exit 1 - fi - if [ $wrapperSha256Result = false ]; then - echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 - echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 - echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 - exit 1 - fi -fi - -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --windows "$CLASSPATH") - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") -fi - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -# shellcheck disable=SC2086 # safe args -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/explorer_rs/mvnw.cmd b/explorer_rs/mvnw.cmd deleted file mode 100644 index 95ba6f5..0000000 --- a/explorer_rs/mvnw.cmd +++ /dev/null @@ -1,205 +0,0 @@ -@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 https://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.2.0 -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %WRAPPER_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file -SET WRAPPER_SHA_256_SUM="" -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B -) -IF NOT %WRAPPER_SHA_256_SUM%=="" ( - powershell -Command "&{"^ - "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ - "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ - " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ - " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ - " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ - " exit 1;"^ - "}"^ - "}" - if ERRORLEVEL 1 goto error -) - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% ^ - %JVM_CONFIG_MAVEN_PROPS% ^ - %MAVEN_OPTS% ^ - %MAVEN_DEBUG_OPTS% ^ - -classpath %WRAPPER_JAR% ^ - "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% diff --git a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/ExplorerRsApplication.java b/explorer_rs/src/main/java/ru/molokoin/explorer_rs/ExplorerRsApplication.java deleted file mode 100644 index 89b9a55..0000000 --- a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/ExplorerRsApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package ru.molokoin.explorer_rs; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class ExplorerRsApplication { - - public static void main(String[] args) { - SpringApplication.run(ExplorerRsApplication.class, args); - } - -} diff --git a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/controller/HelloController.java b/explorer_rs/src/main/java/ru/molokoin/explorer_rs/controller/HelloController.java deleted file mode 100644 index 8e789d8..0000000 --- a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/controller/HelloController.java +++ /dev/null @@ -1,12 +0,0 @@ -package ru.molokoin.explorer_rs.controller; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; - -@Controller -public class HelloController { - @GetMapping("/hello") - public String hello(){ - return "hello"; - } -} diff --git a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/controller/StorageController.java b/explorer_rs/src/main/java/ru/molokoin/explorer_rs/controller/StorageController.java deleted file mode 100644 index bf4d2c8..0000000 --- a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/controller/StorageController.java +++ /dev/null @@ -1,41 +0,0 @@ -package ru.molokoin.explorer_rs.controller; - -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import ru.molokoin.explorer_rs.service.StorageFace; -import ru.molokoin.explorer_rs.entity.Document;; - -/** - * Контроллер предоставляющий http-api - * для доступа к файлам хранилища данных - * - */ -@RestController -@RequestMapping(path = "/", consumes = {"*/*"}) -public class StorageController { - - @Autowired - private StorageFace storage; - - // public StorageController(StorageFace storage){ - // this.storage = storage; - // } - - /** - * Получение перечня документов размещенных в хранилище - * - перечень формируется на основании сканирования файловой системы - * @return - */ - @GetMapping(path = "/storage/list") - public ResponseEntity> listStorage(){ - return new ResponseEntity<>(storage.list(), HttpStatus.OK); - } -} diff --git a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/entity/Document.java b/explorer_rs/src/main/java/ru/molokoin/explorer_rs/entity/Document.java deleted file mode 100644 index 5ff3c4d..0000000 --- a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/entity/Document.java +++ /dev/null @@ -1,15 +0,0 @@ -package ru.molokoin.explorer_rs.entity; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@NoArgsConstructor -@AllArgsConstructor -@Data -public class Document extends Object{ - private String name;//наименование файла в файловой системе ({id}.{extension}) - private String path;//путь в файловой системе (root/{id}.{extension}) - private String extension;//расширение файла - private long size;//размер файла -} diff --git a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/entity/Record.java b/explorer_rs/src/main/java/ru/molokoin/explorer_rs/entity/Record.java deleted file mode 100644 index 225a506..0000000 --- a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/entity/Record.java +++ /dev/null @@ -1,56 +0,0 @@ -package ru.molokoin.explorer_rs.entity; - - -import java.util.Date; - -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@NoArgsConstructor -@AllArgsConstructor -@Entity -@Data -public class Record extends Document{ - @Id - @GeneratedValue(strategy=GenerationType.AUTO) - private long id; - private String name_origin;//оригинальное название загруженного файл - private String type;//тип загруженного документа (реестр, заявка, протокол ...) - private String author;//пользователь, оформивший запись - private Date berth;//дата и время создания записи - private String description;//Пояснения автора записи - - /** - * Конструктор без id - * @param name - * @param path - * @param extension - * @param size - * @param name_origin - * @param type - * @param author - * @param berth - * @param description - */ - public Record(String name, String path, String extension, long size, String name_origin, String type, String author, - Date berth, String description) { - super(name, path, extension, size); - this.name_origin = name_origin; - this.type = type; - this.author = author; - this.berth = berth; - this.description = description; - } - - public Record(Document document){ - setName(document.getName()); - setPath(document.getPath()); - setExtension(document.getExtension()); - setSize(document.getSize()); - } -} diff --git a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/exception/FileNotFoundException.java b/explorer_rs/src/main/java/ru/molokoin/explorer_rs/exception/FileNotFoundException.java deleted file mode 100644 index 8d0c341..0000000 --- a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/exception/FileNotFoundException.java +++ /dev/null @@ -1,15 +0,0 @@ -package ru.molokoin.explorer_rs.exception; - -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.ResponseStatus; - -@ResponseStatus(HttpStatus.NOT_FOUND) -public class FileNotFoundException extends StorageException{ - public FileNotFoundException(String message) { - super(message); - } - - public FileNotFoundException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/exception/StorageException.java b/explorer_rs/src/main/java/ru/molokoin/explorer_rs/exception/StorageException.java deleted file mode 100644 index 4e7624a..0000000 --- a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/exception/StorageException.java +++ /dev/null @@ -1,11 +0,0 @@ -package ru.molokoin.explorer_rs.exception; - -public class StorageException extends RuntimeException{ - public StorageException(String message) { - super(message); - } - - public StorageException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/repository/RecordFace.java b/explorer_rs/src/main/java/ru/molokoin/explorer_rs/repository/RecordFace.java deleted file mode 100644 index 09bcdcc..0000000 --- a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/repository/RecordFace.java +++ /dev/null @@ -1,12 +0,0 @@ -package ru.molokoin.explorer_rs.repository; - -import java.util.List; - -import org.springframework.data.repository.ListCrudRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface RecordFace extends ListCrudRepository{ - List findAll(); - Record findRecordById(long id); -} diff --git a/explorer_rs/src/main/resources/templates/listFiles.html b/explorer_rs/src/main/resources/templates/listFiles.html deleted file mode 100644 index 34cfa25..0000000 --- a/explorer_rs/src/main/resources/templates/listFiles.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - -

Spring Boot File Upload Example

- -
- -

Upload Single File:

-
-

- -
- -
- -

Upload Multiple Files:

-
-

- -
- -
- -

All Uploaded Files:

-
    -
  • - -
    • -
- - - \ No newline at end of file diff --git a/storage_rs/.env b/storage_rs/.env new file mode 100644 index 0000000..87685c0 --- /dev/null +++ b/storage_rs/.env @@ -0,0 +1 @@ +DATA='/app/storage_rs/uploads' \ No newline at end of file diff --git a/explorer_rs/.gitignore b/storage_rs/.gitignore similarity index 100% rename from explorer_rs/.gitignore rename to storage_rs/.gitignore diff --git a/storage_rs/.mvn/wrapper/maven-wrapper.properties b/storage_rs/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..aeccdfd --- /dev/null +++ b/storage_rs/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# 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 +# +# https://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.1 +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip diff --git a/storage_rs/docker-compose.yaml b/storage_rs/docker-compose.yaml new file mode 100644 index 0000000..4c0d0f1 --- /dev/null +++ b/storage_rs/docker-compose.yaml @@ -0,0 +1,18 @@ +version: "3.7" +services: + storage_rs: + build: + context: ../storage_rs + dockerfile: dockerfile + image: "storage_rs" + command: ["java","-jar","/app/storage_rs/storage_rs-0.0.1.jar"] + ports: + - 82:8282 + restart: unless-stopped + volumes: + - ./uploads:${DATA} +networks: + default: + external: + name: tech_network + driver: bridge \ No newline at end of file diff --git a/storage_rs/dockerfile b/storage_rs/dockerfile new file mode 100644 index 0000000..d4a6dd1 --- /dev/null +++ b/storage_rs/dockerfile @@ -0,0 +1,5 @@ +FROM openjdk:17-jdk-alpine +RUN apk update +RUN apk upgrade +COPY target/storage_rs-0.0.1.jar /app/storage_rs/storage_rs-0.0.1.jar +WORKDIR /app/storage_rs diff --git a/storage_rs/mvnw b/storage_rs/mvnw new file mode 100644 index 0000000..ba9212a --- /dev/null +++ b/storage_rs/mvnw @@ -0,0 +1,250 @@ +#!/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 +# +# https://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.1 +# +# 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 +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl="${value-}" ;; + distributionSha256Sum) distributionSha256Sum="${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_HOME="$HOME/.m2/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/storage_rs/mvnw.cmd b/storage_rs/mvnw.cmd new file mode 100644 index 0000000..406932d --- /dev/null +++ b/storage_rs/mvnw.cmd @@ -0,0 +1,146 @@ +<# : 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 https://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.1 +@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" +$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/explorer_rs/pom.xml b/storage_rs/pom.xml similarity index 81% rename from explorer_rs/pom.xml rename to storage_rs/pom.xml index f53f2d3..33ba70f 100644 --- a/explorer_rs/pom.xml +++ b/storage_rs/pom.xml @@ -5,21 +5,27 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 ru.molokoin - explorer_rs - 0.1 - explorer_rs - Demo project for Spring Boot + storage_rs + 0.0.1 + storage_rs + file-explorer api 17 + + org.projectlombok + lombok + true + org.springframework.boot - spring-boot-starter-data-jpa + spring-boot-configuration-processor + true org.springframework.boot @@ -29,17 +35,16 @@ org.springframework.boot spring-boot-starter-web - + + org.springframework.boot + spring-boot-starter-data-jpa + org.postgresql postgresql runtime - - org.projectlombok - lombok - true - + org.springframework.boot spring-boot-starter-test @@ -49,7 +54,14 @@ - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - ${tests.skip} - diff --git a/explorer_rs/src/main/docs/puml/erd-explorer-data.puml b/storage_rs/src/main/docs/puml/erd-explorer-data.puml similarity index 100% rename from explorer_rs/src/main/docs/puml/erd-explorer-data.puml rename to storage_rs/src/main/docs/puml/erd-explorer-data.puml diff --git a/storage_rs/src/main/java/ru/molokoin/storage_rs/StorageRsApplication.java b/storage_rs/src/main/java/ru/molokoin/storage_rs/StorageRsApplication.java new file mode 100644 index 0000000..febb44d --- /dev/null +++ b/storage_rs/src/main/java/ru/molokoin/storage_rs/StorageRsApplication.java @@ -0,0 +1,17 @@ +package ru.molokoin.storage_rs; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; + +import ru.molokoin.storage_rs.config.StorageConfiguration; + +@SpringBootApplication +@EnableConfigurationProperties(StorageConfiguration.class) +public class StorageRsApplication { + + public static void main(String[] args) { + SpringApplication.run(StorageRsApplication.class, args); + } + +} diff --git a/storage_rs/src/main/java/ru/molokoin/storage_rs/config/StorageConfiguration.java b/storage_rs/src/main/java/ru/molokoin/storage_rs/config/StorageConfiguration.java new file mode 100644 index 0000000..325b886 --- /dev/null +++ b/storage_rs/src/main/java/ru/molokoin/storage_rs/config/StorageConfiguration.java @@ -0,0 +1,26 @@ +package ru.molokoin.storage_rs.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * Класс конфигурации сервиса + * - извлекаем знчения параметров, установленных "application.yaml" + */ +@ConfigurationProperties(prefix = "storage") +public class StorageConfiguration { + private String location; + + /** + * @return the storageLocation + */ + public String getLocation() { + return location; + } + + /** + * @param location the storageLocation to set + */ + public void setLocation(String storageLocation) { + this.location = storageLocation; + } +} diff --git a/storage_rs/src/main/java/ru/molokoin/storage_rs/controller/ChohortController.java b/storage_rs/src/main/java/ru/molokoin/storage_rs/controller/ChohortController.java new file mode 100644 index 0000000..6ab3080 --- /dev/null +++ b/storage_rs/src/main/java/ru/molokoin/storage_rs/controller/ChohortController.java @@ -0,0 +1,5 @@ +package ru.molokoin.storage_rs.controller; + +public class ChohortController { + +} diff --git a/storage_rs/src/main/java/ru/molokoin/storage_rs/controller/HelloController.java b/storage_rs/src/main/java/ru/molokoin/storage_rs/controller/HelloController.java new file mode 100644 index 0000000..1d86526 --- /dev/null +++ b/storage_rs/src/main/java/ru/molokoin/storage_rs/controller/HelloController.java @@ -0,0 +1,44 @@ +package ru.molokoin.storage_rs.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +import ru.molokoin.storage_rs.model.Document; +import ru.molokoin.storage_rs.service.StorageServiceFace; + +/** + * контроллер, для отрабтки тестов, + * выводит страницу с информацией о сервисе пользователю + */ +@Controller +public class HelloController { + /** + * получаем в переменную root + * значение свойства storage.location + * из файла application.yaml + */ + private StorageServiceFace storage; + + /** + * Конструктор контроллера, дня инициализации объекта хранилища + * - передается интерфейс + * @param storage + */ + public HelloController(StorageServiceFace storage){ + this.storage = storage; + } + + @GetMapping("/hello") + public String hello(){ + System.out.println("storage_rs/hello-controller# " + "передача пользователю шаблона hello.html"); + System.out.println("storage_rs/hello-controller#(из config): " + storage.root()); + System.out.println("Загружено документов: " + storage.list().size()); + System.out.println("Перечень загруженных документов:"); + int i = 1; + for (Document doc : storage.list()) { + System.out.println("Document#" + i + ": " + doc.getPath() + "(size#" + doc.getSize() + ")"); + i++; + } + return "hello"; + } +} diff --git a/storage_rs/src/main/java/ru/molokoin/storage_rs/controller/StorageController.java b/storage_rs/src/main/java/ru/molokoin/storage_rs/controller/StorageController.java new file mode 100644 index 0000000..c4b733a --- /dev/null +++ b/storage_rs/src/main/java/ru/molokoin/storage_rs/controller/StorageController.java @@ -0,0 +1,65 @@ +package ru.molokoin.storage_rs.controller; + +import java.util.List; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.multipart.MultipartFile; + +import ru.molokoin.storage_rs.model.Document; +import ru.molokoin.storage_rs.service.StorageServiceFace; + +/** + * Контроллер для работы с файловой системой контейнера + * - получение + * - хранение + * - передача + * файлов пользователя/сторонего сервиса + */ +@Controller +public class StorageController { + /** + * получаем в переменную root + * значение свойства storage.location + * из файла application.yaml + */ + private StorageServiceFace storage; + + /** + * Конструктор контроллера, дня инициализации объекта хранилища + * - передается интерфейс + * @param storage + */ + public StorageController(StorageServiceFace storage){ + this.storage = storage; + } + + /** + * Отдаем пользователю страничку загрузки файлов на сервер + * @return + */ + @GetMapping("/upload") + public String uploadFace(){ + return "upload"; + } + + /** + * Загружаем файл пользователя и возвращаем список файлов на сервере + * @return + */ + @PostMapping("/upload") + public String upload(@RequestParam("file") MultipartFile file){ + storage.store(file); + return "list"; + } + + @GetMapping("/uploads") + public String list(Model model){ + model.addAttribute("documents", storage.list()); + return "list"; + } + +} diff --git a/storage_rs/src/main/java/ru/molokoin/storage_rs/model/Document.java b/storage_rs/src/main/java/ru/molokoin/storage_rs/model/Document.java new file mode 100644 index 0000000..c0d9c96 --- /dev/null +++ b/storage_rs/src/main/java/ru/molokoin/storage_rs/model/Document.java @@ -0,0 +1,79 @@ +package ru.molokoin.storage_rs.model; + +public class Document { + private String name;//наименование файла в файловой системе ({id}.{extension}) + private String path;//путь в файловой системе (root/{id}.{extension}) + private String extension;//расширение файла + private Long size;//размер файла + + + /** + * + */ + public Document() { + } + + + /** + * @param name + * @param path + * @param extension + * @param size + */ + public Document(String name, String path, String extension, long size) { + this.name = name; + this.path = path; + this.extension = extension; + this.size = size; + } + /** + * @return the name + */ + public String getName() { + return name; + } + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + /** + * @return the path + */ + public String getPath() { + return path; + } + /** + * @param path the path to set + */ + public void setPath(String path) { + this.path = path; + } + /** + * @return the extension + */ + public String getExtension() { + return extension; + } + /** + * @param extension the extension to set + */ + public void setExtension(String extension) { + this.extension = extension; + } + /** + * @return the size + */ + public long getSize() { + return size; + } + /** + * @param size the size to set + */ + public void setSize(Long size) { + this.size = size; + } + + +} diff --git a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/service/FileSystemStorage.java b/storage_rs/src/main/java/ru/molokoin/storage_rs/service/StorageService.java similarity index 51% rename from explorer_rs/src/main/java/ru/molokoin/explorer_rs/service/FileSystemStorage.java rename to storage_rs/src/main/java/ru/molokoin/storage_rs/service/StorageService.java index 3dba6b2..e995d22 100644 --- a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/service/FileSystemStorage.java +++ b/storage_rs/src/main/java/ru/molokoin/storage_rs/service/StorageService.java @@ -1,7 +1,8 @@ -package ru.molokoin.explorer_rs.service; +package ru.molokoin.storage_rs.service; import java.io.File; import java.io.IOException; +import java.nio.file.FileAlreadyExistsException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -10,48 +11,57 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; +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 jakarta.annotation.PostConstruct; -import ru.molokoin.explorer_rs.entity.Document; -import ru.molokoin.explorer_rs.exception.StorageException; +import ru.molokoin.storage_rs.config.StorageConfiguration; +import ru.molokoin.storage_rs.model.Document; -/** - * Класс доступа к данным файловой системы - */ @Service -public class FileSystemStorage implements StorageFace{ - /** - * Перенести в properties - */ - private final Path root = Paths.get("/app/explorer_rs/uploads") ; //путь к корню хранилища данных - - /** - * При запуске сервера создаем корневую директорию, - * для хранения данных приложения - */ - @PostConstruct +public class StorageService implements StorageServiceFace{ + private final Path storageLocation; + + @Autowired + public StorageService(StorageConfiguration config){ + this.storageLocation = Paths.get(config.getLocation()) + .toAbsolutePath().normalize(); + try { + Files.createDirectories(this.storageLocation); + } + catch (IOException e) { + System.out.println("########################################"); + System.out.println("Ошибка создания директории для хранения файлов: " + e.getMessage()); + e.printStackTrace(); + } + } + @Override + @PostConstruct public void init() { try { - Files.createDirectories(root); + Files.createDirectories(storageLocation); } catch (IOException e) { - throw new StorageException("Could not initialize storage location", e); + e.printStackTrace(); } + + } + + + @Override + public Path root(){ + return storageLocation; } - /** - * Получение перечня документов, размещенных в хранилище - * @throws IOException - */ @Override public List list() { List docs = new ArrayList<>(); /** * Получаем список файлов в директории root */ - String[] files = root.toFile().list(); + String[] files = root().toFile().list(); /** * извлекаем сведения о каждом файле для формирвоания сущности document @@ -68,12 +78,16 @@ public class FileSystemStorage implements StorageFace{ /** * Получаем размер файла + * Важно! когда у пользователя контейнера нет прав на файл - вызывается ошибка + * файлы, загруженные приложением ошибок вызывать не будут, + * только файлы перемещенные в том из операционной системы. */ long size = 0; try { - size = Files.size(Paths.get(file)); + Path p = Paths.get(file); + size = Files.size(p); } catch (IOException e) { - e.printStackTrace(); + System.out.println(e.getMessage() + " >>> Ошибка! не удалось определить размер файла!"); } doc.setSize(size); @@ -108,9 +122,15 @@ public class FileSystemStorage implements StorageFace{ } @Override - public boolean store(Resource resource) { - // TODO Auto-generated method stub - throw new UnsupportedOperationException("Unimplemented method 'store'"); + public void store(MultipartFile file) { + try { + Files.copy(file.getInputStream(), root().resolve(file.getOriginalFilename())); + } catch (Exception e) { + if (e instanceof FileAlreadyExistsException) { + throw new RuntimeException("A file of that name already exists."); + } + throw new RuntimeException(e.getMessage()); + } } @Override @@ -118,4 +138,5 @@ public class FileSystemStorage implements StorageFace{ // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'store'"); } + } diff --git a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/service/StorageFace.java b/storage_rs/src/main/java/ru/molokoin/storage_rs/service/StorageServiceFace.java similarity index 72% rename from explorer_rs/src/main/java/ru/molokoin/explorer_rs/service/StorageFace.java rename to storage_rs/src/main/java/ru/molokoin/storage_rs/service/StorageServiceFace.java index 188f8de..17e84b8 100644 --- a/explorer_rs/src/main/java/ru/molokoin/explorer_rs/service/StorageFace.java +++ b/storage_rs/src/main/java/ru/molokoin/storage_rs/service/StorageServiceFace.java @@ -1,28 +1,28 @@ -package ru.molokoin.explorer_rs.service; +package ru.molokoin.storage_rs.service; +import java.io.IOException; +import java.nio.file.Path; import java.util.List; import org.springframework.core.io.Resource; +import org.springframework.web.multipart.MultipartFile; -import ru.molokoin.explorer_rs.entity.Document; +import ru.molokoin.storage_rs.model.Document; - -/** - * Интерфейс для работы файловым хранилищем - * - инициализация пути к файловому хранилищу на хосте - * - получение списка файлов с хоста - * - получение файла по id - * - получениефайла по name - * - удаление файла - * - */ -public interface StorageFace { +public interface StorageServiceFace { /** * создание на хосте корневой директории, для файлового хранилища: * путь к корневой директории устанавливается конфигурацией сервера * properties - файлом + * @throws IOException + */ + void init(); + + /** + * Получение пути к корневой директории хранилища + * @return */ - public void init(); + Path root(); /** * Получение фактического списка файлов с хоста @@ -56,7 +56,7 @@ public interface StorageFace { * Сохранение файла в хранилище * @param resource */ - public boolean store(Resource resource); + public void store(MultipartFile file); /** * Сохранение группы ресурсов в хранилище @@ -64,4 +64,5 @@ public interface StorageFace { * @return */ public boolean store(List resources); + } diff --git a/storage_rs/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/storage_rs/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 0000000..a233e95 --- /dev/null +++ b/storage_rs/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,7 @@ +{"properties": [ + { + "name": "storage.location", + "type": "java.lang.String", + "description": "Путь корню файлового хранилища в контейнере с работающим микросервисом 'storage.location'" + } +]} \ No newline at end of file diff --git a/explorer_rs/src/main/resources/application.yaml b/storage_rs/src/main/resources/application.yaml similarity index 87% rename from explorer_rs/src/main/resources/application.yaml rename to storage_rs/src/main/resources/application.yaml index 088a7f4..4e26019 100644 --- a/explorer_rs/src/main/resources/application.yaml +++ b/storage_rs/src/main/resources/application.yaml @@ -1,8 +1,6 @@ -server: - port: 8282 spring: application: - name: explorer_rs + name: storage_rs jpa: hibernate: ddl-auto: update @@ -15,5 +13,7 @@ spring: multipart: max-file-size: 50MB max-request-size: 50MB -# storage: -# location: ./uploads \ No newline at end of file +server: + port: 8282 +storage: + location: ./uploads diff --git a/explorer_rs/src/main/resources/static/content/md/hello.md b/storage_rs/src/main/resources/static/content/md/hello.md similarity index 91% rename from explorer_rs/src/main/resources/static/content/md/hello.md rename to storage_rs/src/main/resources/static/content/md/hello.md index 605d985..1eb6690 100644 --- a/explorer_rs/src/main/resources/static/content/md/hello.md +++ b/storage_rs/src/main/resources/static/content/md/hello.md @@ -1,4 +1,4 @@ -# explorer_rs +# storage_rs Сервис работы с файлами: - загрузка файлов на сервер - скачивание файлов с сервера diff --git a/explorer_rs/src/main/resources/templates/hello.html b/storage_rs/src/main/resources/templates/hello.html similarity index 100% rename from explorer_rs/src/main/resources/templates/hello.html rename to storage_rs/src/main/resources/templates/hello.html diff --git a/storage_rs/src/main/resources/templates/list.html b/storage_rs/src/main/resources/templates/list.html new file mode 100644 index 0000000..3cd3162 --- /dev/null +++ b/storage_rs/src/main/resources/templates/list.html @@ -0,0 +1,66 @@ + + + + + Uploads + + + + + +
+

Uploads

+ menu : auth : Uploads +
+
+
+
+

Перечень файлов:

+
+ + + + + + + + + + + + + + + + + + + + +
namepathextensionsize +
+
+ +
+ +
+
+ + + + + + + + + +
+ +
+
+ + + \ No newline at end of file diff --git a/storage_rs/src/main/resources/templates/upload.html b/storage_rs/src/main/resources/templates/upload.html new file mode 100644 index 0000000..c630c22 --- /dev/null +++ b/storage_rs/src/main/resources/templates/upload.html @@ -0,0 +1,24 @@ + + + + + + + upload-page + + + + +
+
+ +
+ +
+
+ + +
+ + \ No newline at end of file diff --git a/explorer_rs/src/test/java/ru/molokoin/explorer_rs/ExplorerRsApplicationTests.java b/storage_rs/src/test/java/ru/molokoin/storage_rs/StorageRsApplicationTests.java similarity index 68% rename from explorer_rs/src/test/java/ru/molokoin/explorer_rs/ExplorerRsApplicationTests.java rename to storage_rs/src/test/java/ru/molokoin/storage_rs/StorageRsApplicationTests.java index 06a02d2..6b16047 100644 --- a/explorer_rs/src/test/java/ru/molokoin/explorer_rs/ExplorerRsApplicationTests.java +++ b/storage_rs/src/test/java/ru/molokoin/storage_rs/StorageRsApplicationTests.java @@ -1,10 +1,10 @@ -package ru.molokoin.explorer_rs; +package ru.molokoin.storage_rs; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class ExplorerRsApplicationTests { +class StorageRsApplicationTests { @Test void contextLoads() { diff --git a/storage_rs/uploads/1_ДИ.xlsx b/storage_rs/uploads/1_ДИ.xlsx new file mode 100644 index 0000000..3c9eca6 Binary files /dev/null and b/storage_rs/uploads/1_ДИ.xlsx differ diff --git a/storage_rs/uploads/2_ДОПОГ.xlsx b/storage_rs/uploads/2_ДОПОГ.xlsx new file mode 100644 index 0000000..e153fd4 Binary files /dev/null and b/storage_rs/uploads/2_ДОПОГ.xlsx differ diff --git a/storage_rs/uploads/3_Трудовые отношения.xlsx b/storage_rs/uploads/3_Трудовые отношения.xlsx new file mode 100644 index 0000000..496a4aa Binary files /dev/null and b/storage_rs/uploads/3_Трудовые отношения.xlsx differ diff --git a/storage_rs/uploads/4_Правила и нормы охраны труда.xlsx b/storage_rs/uploads/4_Правила и нормы охраны труда.xlsx new file mode 100644 index 0000000..d6fa243 Binary files /dev/null and b/storage_rs/uploads/4_Правила и нормы охраны труда.xlsx differ diff --git a/storage_rs/uploads/5_Общие нормативы и правила.xlsx b/storage_rs/uploads/5_Общие нормативы и правила.xlsx new file mode 100644 index 0000000..365bab1 Binary files /dev/null and b/storage_rs/uploads/5_Общие нормативы и правила.xlsx differ diff --git a/storage_rs/uploads/6_Ремонт и диагностика.xlsx b/storage_rs/uploads/6_Ремонт и диагностика.xlsx new file mode 100644 index 0000000..0b106ce Binary files /dev/null and b/storage_rs/uploads/6_Ремонт и диагностика.xlsx differ diff --git a/storage_rs/uploads/use_docker.pdf b/storage_rs/uploads/use_docker.pdf new file mode 100644 index 0000000..88d8049 Binary files /dev/null and b/storage_rs/uploads/use_docker.pdf differ diff --git a/storage_rs/uploads/Заявление для МП.docx b/storage_rs/uploads/Заявление для МП.docx new file mode 100644 index 0000000..8380ae0 Binary files /dev/null and b/storage_rs/uploads/Заявление для МП.docx differ diff --git a/storage_rs/uploads/тесты.zip b/storage_rs/uploads/тесты.zip new file mode 100644 index 0000000..d5c9d14 Binary files /dev/null and b/storage_rs/uploads/тесты.zip differ