esoe 6 months ago
parent
commit
a2152fcef1
  1. 10
      .vscode/launch.json
  2. 1
      explorer_rs/.env
  3. BIN
      explorer_rs/.mvn/wrapper/maven-wrapper.jar
  4. 2
      explorer_rs/.mvn/wrapper/maven-wrapper.properties
  5. 30
      explorer_rs/README.md
  6. 21
      explorer_rs/docker-compose.yaml
  7. 12
      explorer_rs/dockerfile
  8. 308
      explorer_rs/mvnw
  9. 205
      explorer_rs/mvnw.cmd
  10. 13
      explorer_rs/src/main/java/ru/molokoin/explorer_rs/ExplorerRsApplication.java
  11. 12
      explorer_rs/src/main/java/ru/molokoin/explorer_rs/controller/HelloController.java
  12. 41
      explorer_rs/src/main/java/ru/molokoin/explorer_rs/controller/StorageController.java
  13. 15
      explorer_rs/src/main/java/ru/molokoin/explorer_rs/entity/Document.java
  14. 56
      explorer_rs/src/main/java/ru/molokoin/explorer_rs/entity/Record.java
  15. 15
      explorer_rs/src/main/java/ru/molokoin/explorer_rs/exception/FileNotFoundException.java
  16. 11
      explorer_rs/src/main/java/ru/molokoin/explorer_rs/exception/StorageException.java
  17. 12
      explorer_rs/src/main/java/ru/molokoin/explorer_rs/repository/RecordFace.java
  18. 33
      explorer_rs/src/main/resources/templates/listFiles.html
  19. 1
      storage_rs/.env
  20. 0
      storage_rs/.gitignore
  21. 18
      storage_rs/.mvn/wrapper/maven-wrapper.properties
  22. 18
      storage_rs/docker-compose.yaml
  23. 5
      storage_rs/dockerfile
  24. 250
      storage_rs/mvnw
  25. 146
      storage_rs/mvnw.cmd
  26. 50
      storage_rs/pom.xml
  27. 0
      storage_rs/src/main/docs/puml/erd-explorer-data.puml
  28. 17
      storage_rs/src/main/java/ru/molokoin/storage_rs/StorageRsApplication.java
  29. 26
      storage_rs/src/main/java/ru/molokoin/storage_rs/config/StorageConfiguration.java
  30. 5
      storage_rs/src/main/java/ru/molokoin/storage_rs/controller/ChohortController.java
  31. 44
      storage_rs/src/main/java/ru/molokoin/storage_rs/controller/HelloController.java
  32. 65
      storage_rs/src/main/java/ru/molokoin/storage_rs/controller/StorageController.java
  33. 79
      storage_rs/src/main/java/ru/molokoin/storage_rs/model/Document.java
  34. 79
      storage_rs/src/main/java/ru/molokoin/storage_rs/service/StorageService.java
  35. 31
      storage_rs/src/main/java/ru/molokoin/storage_rs/service/StorageServiceFace.java
  36. 7
      storage_rs/src/main/resources/META-INF/additional-spring-configuration-metadata.json
  37. 10
      storage_rs/src/main/resources/application.yaml
  38. 2
      storage_rs/src/main/resources/static/content/md/hello.md
  39. 0
      storage_rs/src/main/resources/templates/hello.html
  40. 66
      storage_rs/src/main/resources/templates/list.html
  41. 24
      storage_rs/src/main/resources/templates/upload.html
  42. 4
      storage_rs/src/test/java/ru/molokoin/storage_rs/StorageRsApplicationTests.java
  43. BIN
      storage_rs/uploads/1_ДИ.xlsx
  44. BIN
      storage_rs/uploads/2_ДОПОГ.xlsx
  45. BIN
      storage_rs/uploads/3_Трудовые отношения.xlsx
  46. BIN
      storage_rs/uploads/4_Правила и нормы охраны труда.xlsx
  47. BIN
      storage_rs/uploads/5_Общие нормативы и правила.xlsx
  48. BIN
      storage_rs/uploads/6_Ремонт и диагностика.xlsx
  49. BIN
      storage_rs/uploads/use_docker.pdf
  50. BIN
      storage_rs/uploads/Заявление для МП.docx
  51. BIN
      storage_rs/uploads/тесты.zip

10
.vscode/launch.json vendored

@ -37,6 +37,16 @@ @@ -37,6 +37,16 @@
"projectName": "explorer_rs",
"args": "",
"envFile": "${workspaceFolder}/.env"
},
{
"type": "java",
"name": "Spring Boot-StorageRsApplication<storage_rs>",
"request": "launch",
"cwd": "${workspaceFolder}",
"mainClass": "ru.molokoin.storage_rs.StorageRsApplication",
"projectName": "storage_rs",
"args": "",
"envFile": "${workspaceFolder}/.env"
}
]
}

1
explorer_rs/.env

@ -1 +0,0 @@ @@ -1 +0,0 @@
DATA='/app/explorer_rs/uploads'

BIN
explorer_rs/.mvn/wrapper/maven-wrapper.jar vendored

Binary file not shown.

2
explorer_rs/.mvn/wrapper/maven-wrapper.properties vendored

@ -1,2 +0,0 @@ @@ -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

30
explorer_rs/README.md

@ -1,30 +0,0 @@ @@ -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

21
explorer_rs/docker-compose.yaml

@ -1,21 +0,0 @@ @@ -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

12
explorer_rs/dockerfile

@ -1,12 +0,0 @@ @@ -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
# Нужно создать для него том, чтобы получить доступ к загружаемым на сервер данным

308
explorer_rs/mvnw vendored

@ -1,308 +0,0 @@ @@ -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 "$@"

205
explorer_rs/mvnw.cmd vendored

@ -1,205 +0,0 @@ @@ -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%

13
explorer_rs/src/main/java/ru/molokoin/explorer_rs/ExplorerRsApplication.java

@ -1,13 +0,0 @@ @@ -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);
}
}

12
explorer_rs/src/main/java/ru/molokoin/explorer_rs/controller/HelloController.java

@ -1,12 +0,0 @@ @@ -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";
}
}

41
explorer_rs/src/main/java/ru/molokoin/explorer_rs/controller/StorageController.java

@ -1,41 +0,0 @@ @@ -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<List<Document>> listStorage(){
return new ResponseEntity<>(storage.list(), HttpStatus.OK);
}
}

15
explorer_rs/src/main/java/ru/molokoin/explorer_rs/entity/Document.java

@ -1,15 +0,0 @@ @@ -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;//размер файла
}

56
explorer_rs/src/main/java/ru/molokoin/explorer_rs/entity/Record.java

@ -1,56 +0,0 @@ @@ -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());
}
}

15
explorer_rs/src/main/java/ru/molokoin/explorer_rs/exception/FileNotFoundException.java

@ -1,15 +0,0 @@ @@ -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);
}
}

11
explorer_rs/src/main/java/ru/molokoin/explorer_rs/exception/StorageException.java

@ -1,11 +0,0 @@ @@ -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);
}
}

12
explorer_rs/src/main/java/ru/molokoin/explorer_rs/repository/RecordFace.java

@ -1,12 +0,0 @@ @@ -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<Record, Long>{
List<Record> findAll();
Record findRecordById(long id);
}

33
explorer_rs/src/main/resources/templates/listFiles.html

@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
<!doctype html>
<html lang="en" xmlns:th="http://www.thymeleaf.org">
<body>
<h1>Spring Boot File Upload Example</h1>
<hr/>
<h4>Upload Single File:</h4>
<form method="POST" enctype="multipart/form-data" th:action="@{/explorer_rs/upload-file}">
<input type="file" name="file"> <br/><br/>
<button type="submit">Submit</button>
</form>
<hr/>
<h4>Upload Multiple Files:</h4>
<form method="POST" enctype="multipart/form-data" th:action="@{/explorer_rs/upload-multiple-files}">
<input type="file" name="files" multiple> <br/><br/>
<button type="submit">Submit</button>
</form>
<hr/>
<h2>All Uploaded Files:</h2>
<ul>
<li th:each="file : ${files}">
<a th:href="${file}" target="_blank" th:text="${file}"></a>
</li>
</ul>
</body>
</html>

1
storage_rs/.env

@ -0,0 +1 @@ @@ -0,0 +1 @@
DATA='/app/storage_rs/uploads'

0
explorer_rs/.gitignore → storage_rs/.gitignore vendored

18
storage_rs/.mvn/wrapper/maven-wrapper.properties vendored

@ -0,0 +1,18 @@ @@ -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

18
storage_rs/docker-compose.yaml

@ -0,0 +1,18 @@ @@ -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

5
storage_rs/dockerfile

@ -0,0 +1,5 @@ @@ -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

250
storage_rs/mvnw vendored

@ -0,0 +1,250 @@ @@ -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-<version>,maven-mvnd-<version>-<platform>}/<hash>
[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
distributionUrlName="${distributionUrl##*/}"
distributionUrlNameMain="${distributionUrlName%.*}"
distributionUrlNameMain="${distributionUrlNameMain%-bin}"
MAVEN_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 "$@"

146
storage_rs/mvnw.cmd vendored

@ -0,0 +1,146 @@ @@ -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-<version>,maven-mvnd-<version>-<platform>}/<hash>
if ($env:MVNW_REPOURL) {
$MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" }
$distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')"
}
$distributionUrlName = $distributionUrl -replace '^.*/',''
$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
$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"

50
explorer_rs/pom.xml → storage_rs/pom.xml

@ -5,21 +5,27 @@ @@ -5,21 +5,27 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.5</version>
<version>3.3.0</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>ru.molokoin</groupId>
<artifactId>explorer_rs</artifactId>
<version>0.1</version>
<name>explorer_rs</name>
<description>Demo project for Spring Boot</description>
<artifactId>storage_rs</artifactId>
<version>0.0.1</version>
<name>storage_rs</name>
<description>file-explorer api</description>
<properties>
<java.version>17</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@ -29,17 +35,16 @@ @@ -29,17 +35,16 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
@ -49,7 +54,14 @@ @@ -49,7 +54,14 @@
<build>
<plugins>
<!-- <plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<proc>none</proc>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
@ -60,18 +72,6 @@ @@ -60,18 +72,6 @@
</exclude>
</excludes>
</configuration>
</plugin> -->
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<configuration>
<skipTests>${tests.skip}</skipTests>
</configuration>
</plugin>
</plugins>
</build>

0
explorer_rs/src/main/docs/puml/erd-explorer-data.puml → storage_rs/src/main/docs/puml/erd-explorer-data.puml

17
storage_rs/src/main/java/ru/molokoin/storage_rs/StorageRsApplication.java

@ -0,0 +1,17 @@ @@ -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);
}
}

26
storage_rs/src/main/java/ru/molokoin/storage_rs/config/StorageConfiguration.java

@ -0,0 +1,26 @@ @@ -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;
}
}

5
storage_rs/src/main/java/ru/molokoin/storage_rs/controller/ChohortController.java

@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
package ru.molokoin.storage_rs.controller;
public class ChohortController {
}

44
storage_rs/src/main/java/ru/molokoin/storage_rs/controller/HelloController.java

@ -0,0 +1,44 @@ @@ -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";
}
}

65
storage_rs/src/main/java/ru/molokoin/storage_rs/controller/StorageController.java

@ -0,0 +1,65 @@ @@ -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";
}
}

79
storage_rs/src/main/java/ru/molokoin/storage_rs/model/Document.java

@ -0,0 +1,79 @@ @@ -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;
}
}

79
explorer_rs/src/main/java/ru/molokoin/explorer_rs/service/FileSystemStorage.java → storage_rs/src/main/java/ru/molokoin/storage_rs/service/StorageService.java

@ -1,7 +1,8 @@ @@ -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; @@ -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<Document> list() {
List<Document> docs = new ArrayList<>();
/**
* Получаем список файлов в директории root
*/
String[] files = root.toFile().list();
String[] files = root().toFile().list();
/**
* извлекаем сведения о каждом файле для формирвоания сущности document
@ -68,12 +78,16 @@ public class FileSystemStorage implements StorageFace{ @@ -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{ @@ -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{ @@ -118,4 +138,5 @@ public class FileSystemStorage implements StorageFace{
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method 'store'");
}
}

31
explorer_rs/src/main/java/ru/molokoin/explorer_rs/service/StorageFace.java → storage_rs/src/main/java/ru/molokoin/storage_rs/service/StorageServiceFace.java

@ -1,28 +1,28 @@ @@ -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 { @@ -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 { @@ -64,4 +64,5 @@ public interface StorageFace {
* @return
*/
public boolean store(List<Resource> resources);
}

7
storage_rs/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
{"properties": [
{
"name": "storage.location",
"type": "java.lang.String",
"description": "Путь корню файлового хранилища в контейнере с работающим микросервисом 'storage.location'"
}
]}

10
explorer_rs/src/main/resources/application.yaml → storage_rs/src/main/resources/application.yaml

@ -1,8 +1,6 @@ @@ -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: @@ -15,5 +13,7 @@ spring:
multipart:
max-file-size: 50MB
max-request-size: 50MB
# storage:
# location: ./uploads
server:
port: 8282
storage:
location: ./uploads

2
explorer_rs/src/main/resources/static/content/md/hello.md → storage_rs/src/main/resources/static/content/md/hello.md

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
# explorer_rs
# storage_rs
Сервис работы с файлами:
- загрузка файлов на сервер
- скачивание файлов с сервера

0
explorer_rs/src/main/resources/templates/hello.html → storage_rs/src/main/resources/templates/hello.html

66
storage_rs/src/main/resources/templates/list.html

@ -0,0 +1,66 @@ @@ -0,0 +1,66 @@
<!DOCTYPE HTML>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
<title>Uploads</title>
<script src="https://cdn.jsdelivr.net/npm/@webcomponents/webcomponentsjs@2/webcomponents-loader.min.js"></script>
<script type="module" src="https://cdn.jsdelivr.net/gh/zerodevx/zero-md@1/src/zero-md.min.js"></script>
</head>
<body>
<header>
<h1>Uploads</h1>
menu : auth : Uploads
<br>
</header>
<main>
<div class="main-wraper">
<h2>Перечень файлов:</h2>
<form th:action="@{/uploads}" method="get" th:object="${doc}"></form>
<table>
<thead>
<tr>
<th>name</th>
<th>path</th>
<th>extension</th>
<th>size</th>
<th>
<form method="post" th:action="@{/upload}" enctype="multipart/form-data">
<div>
<input type="file" name="file">
</div>
<button type="submit">Upload File</button>
</form>
</th>
</tr>
</thead>
<tbody>
<tr th:each="doc: ${documents}">
<td>
<input type="text" id="name" name="name" th:value="${doc.name}" readonly />
</td>
<td>
<input type="text" id="path" name="path" th:value="${doc.path}" readonly />
</td>
<td>
<input type="text" id="extension" name="extension" th:value="${doc.extension}" readonly />
</td>
<td>
<input type="text" id="size" name="size" th:value="${doc.size}" readonly />
</td>
<td>
<!-- <form th:action="@{/student/delete/{id}(id=${stu.id})}" th:method="get">
<input type="submit" value="X"/>
</form> -->
</td>
</tr>
</tbody>
</table>
</table>
</div>
</main>
</body>
</html>

24
storage_rs/src/main/resources/templates/upload.html

@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:th="http://www.thymeleaf.org">
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>upload-page</title>
<script src="https://cdn.jsdelivr.net/npm/@webcomponents/webcomponentsjs@2/webcomponents-loader.min.js"></script>
<script type="module" src="https://cdn.jsdelivr.net/gh/zerodevx/zero-md@1/src/zero-md.min.js"></script>
</head>
<body>
<form method="post" th:action="@{/upload}" enctype="multipart/form-data">
<div>
<input type="file" name="file">
</div>
<button type="submit">Upload File</button>
</form>
<div class="list">
</div>
</body>
</html>

4
explorer_rs/src/test/java/ru/molokoin/explorer_rs/ExplorerRsApplicationTests.java → storage_rs/src/test/java/ru/molokoin/storage_rs/StorageRsApplicationTests.java

@ -1,10 +1,10 @@ @@ -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() {

BIN
storage_rs/uploads/1_ДИ.xlsx

Binary file not shown.

BIN
storage_rs/uploads/2_ДОПОГ.xlsx

Binary file not shown.

BIN
storage_rs/uploads/3_Трудовые отношения.xlsx

Binary file not shown.

BIN
storage_rs/uploads/4_Правила и нормы охраны труда.xlsx

Binary file not shown.

BIN
storage_rs/uploads/5_Общие нормативы и правила.xlsx

Binary file not shown.

BIN
storage_rs/uploads/6_Ремонт и диагностика.xlsx

Binary file not shown.

BIN
storage_rs/uploads/use_docker.pdf

Binary file not shown.

BIN
storage_rs/uploads/Заявление для МП.docx

Binary file not shown.

BIN
storage_rs/uploads/тесты.zip

Binary file not shown.
Loading…
Cancel
Save