Compare commits

..

No commits in common. 'f4cdd5c007e937d97e32a70c25554c1525b149a7' and '8ac7b9056b02bc63616f7e0e4ac3194128ce2814' have entirely different histories.

  1. 14
      .vscode/launch.json
  2. 7
      README.md
  3. 20
      base/clear.ps1
  4. 9
      base/scripts/init-database.sh
  5. 2
      main/.gitattributes
  6. 33
      main/.gitignore
  7. 19
      main/.mvn/wrapper/maven-wrapper.properties
  8. 259
      main/mvnw
  9. 149
      main/mvnw.cmd
  10. 97
      main/pom.xml
  11. 13
      main/src/main/java/gsp/technologies/main/MainApplication.java
  12. 29
      main/src/main/java/gsp/technologies/main/controllers/AuthController.java
  13. 53
      main/src/main/java/gsp/technologies/main/controllers/MainframeController.java
  14. 6
      main/src/main/resources/application.yaml
  15. 16
      main/src/main/resources/static/content/md/hello.md
  16. 21
      main/src/main/resources/templates/auth.html
  17. 10
      main/src/main/resources/templates/fragments/code.html
  18. 13
      main/src/main/resources/templates/fragments/common/footer.html
  19. 9
      main/src/main/resources/templates/fragments/common/header.html
  20. 70
      main/src/main/resources/templates/fragments/controls.html
  21. 9
      main/src/main/resources/templates/fragments/hello.html
  22. 25
      main/src/main/resources/templates/mainframe.html
  23. 13
      main/src/test/java/gsp/technologies/main/MainApplicationTests.java
  24. 20
      moodle/SETUP.md
  25. 1
      moodle/distro/moodle
  26. 92
      moodle/install.ps1

14
.vscode/launch.json vendored

@ -1,14 +0,0 @@
{
"configurations": [
{
"type": "java",
"name": "Spring Boot-MainApplication<main>",
"request": "launch",
"cwd": "${workspaceFolder}",
"mainClass": "gsp.technologies.main.MainApplication",
"projectName": "main",
"args": "",
"envFile": "${workspaceFolder}/.env"
}
]
}

7
README.md

@ -5,7 +5,6 @@
## Серисы ## Серисы
### вспомогательные: ### вспомогательные:
base - СУБД base - СУБД
moodle - платформа LMS moodle
source - api для работы с СУБД source - api для работы с СУБД
storage - api для работы с файловой системой storage - api для работы с файловой системой
auth - авторизация пользователей (для администрирования или просмотра результатов) auth - авторизация пользователей (для администрирования или просмотра результатов)
@ -14,14 +13,12 @@ proxy - nginx, для ограничения доступа к сервисам
cron - обновление данных moodle cron - обновление данных moodle
### целевые: ### целевые:
main - страница входа в систему (переход к moodle или к самописному сервису)
hello - описание платформы
quiz - прохождение теста/опроса quiz - прохождение теста/опроса
learn - просмотр контента learn - просмотр контента
moodle -
admin - администрирование платформы admin - администрирование платформы
results - предоставление результатов results - предоставление результатов
moodle -
nginx -
## тома ## тома
exam-base exam-base

20
base/clear.ps1

@ -1,20 +0,0 @@
$container_name = "exam-base"
$image_name = "exam-base"
$build_name = "exam-base"
$code_location = "C:\Users\devuser\Documents\code\exam\base"
# тома
$exam_base = "exam-base"
$exam_prebase = "exam-prebase"
# Остановить и удалить существующий контейнер
docker stop $container_name
docker rm $container_name
# Удалить существующий образ
docker rmi $image_name
# удалить тома
docker volume rm $exam_base
docker volume rm $exam_prebase
docker builder prune --force

9
base/scripts/init-database.sh

@ -1,16 +1,9 @@
#!/bin/bash #!/bin/bash
set -e set -e
# подключаемся от пользователя exam к базе exam # создаем необходимые базы данных
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
CREATE USER moodle WITH PASSWORD 'moodle'; CREATE USER moodle WITH PASSWORD 'moodle';
CREATE DATABASE moodle; CREATE DATABASE moodle;
GRANT ALL PRIVILEGES ON DATABASE moodle TO moodle; GRANT ALL PRIVILEGES ON DATABASE moodle TO moodle;
EOSQL EOSQL
# \c moodle
# подключаемся от пользователя exam к базе moodle
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "moodle" <<-EOSQL
GRANT ALL PRIVILEGES ON SCHEMA public TO moodle;
EOSQL

2
main/.gitattributes vendored

@ -1,2 +0,0 @@
/mvnw text eol=lf
*.cmd text eol=crlf

33
main/.gitignore vendored

@ -1,33 +0,0 @@
HELP.md
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/
### VS Code ###
.vscode/

19
main/.mvn/wrapper/maven-wrapper.properties vendored

@ -1,19 +0,0 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

259
main/mvnw vendored

@ -1,259 +0,0 @@
#!/bin/sh
# ----------------------------------------------------------------------------
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# Apache Maven Wrapper startup batch script, version 3.3.2
#
# Optional ENV vars
# -----------------
# JAVA_HOME - location of a JDK home dir, required when download maven via java source
# MVNW_REPOURL - repo url base for downloading maven distribution
# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
# ----------------------------------------------------------------------------
set -euf
[ "${MVNW_VERBOSE-}" != debug ] || set -x
# OS specific support.
native_path() { printf %s\\n "$1"; }
case "$(uname)" in
CYGWIN* | MINGW*)
[ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
native_path() { cygpath --path --windows "$1"; }
;;
esac
# set JAVACMD and JAVACCMD
set_java_home() {
# For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
if [ -n "${JAVA_HOME-}" ]; then
if [ -x "$JAVA_HOME/jre/sh/java" ]; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
JAVACCMD="$JAVA_HOME/jre/sh/javac"
else
JAVACMD="$JAVA_HOME/bin/java"
JAVACCMD="$JAVA_HOME/bin/javac"
if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
return 1
fi
fi
else
JAVACMD="$(
'set' +e
'unset' -f command 2>/dev/null
'command' -v java
)" || :
JAVACCMD="$(
'set' +e
'unset' -f command 2>/dev/null
'command' -v javac
)" || :
if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
return 1
fi
fi
}
# hash string like Java String::hashCode
hash_string() {
str="${1:-}" h=0
while [ -n "$str" ]; do
char="${str%"${str#?}"}"
h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
str="${str#?}"
done
printf %x\\n $h
}
verbose() { :; }
[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
die() {
printf %s\\n "$1" >&2
exit 1
}
trim() {
# MWRAPPER-139:
# Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
# Needed for removing poorly interpreted newline sequences when running in more
# exotic environments such as mingw bash on Windows.
printf "%s" "${1}" | tr -d '[:space:]'
}
# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
while IFS="=" read -r key value; do
case "${key-}" in
distributionUrl) distributionUrl=$(trim "${value-}") ;;
distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
esac
done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
case "${distributionUrl##*/}" in
maven-mvnd-*bin.*)
MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
*AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
:Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
:Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
:Linux*x86_64*) distributionPlatform=linux-amd64 ;;
*)
echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
distributionPlatform=linux-amd64
;;
esac
distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
;;
maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
esac
# apply MVNW_REPOURL and calculate MAVEN_HOME
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
distributionUrlName="${distributionUrl##*/}"
distributionUrlNameMain="${distributionUrlName%.*}"
distributionUrlNameMain="${distributionUrlNameMain%-bin}"
MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
exec_maven() {
unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
}
if [ -d "$MAVEN_HOME" ]; then
verbose "found existing MAVEN_HOME at $MAVEN_HOME"
exec_maven "$@"
fi
case "${distributionUrl-}" in
*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
esac
# prepare tmp dir
if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
trap clean HUP INT TERM EXIT
else
die "cannot create temp dir"
fi
mkdir -p -- "${MAVEN_HOME%/*}"
# Download and Install Apache Maven
verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
verbose "Downloading from: $distributionUrl"
verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
# select .zip or .tar.gz
if ! command -v unzip >/dev/null; then
distributionUrl="${distributionUrl%.zip}.tar.gz"
distributionUrlName="${distributionUrl##*/}"
fi
# verbose opt
__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
# normalize http auth
case "${MVNW_PASSWORD:+has-password}" in
'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
esac
if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
verbose "Found wget ... using wget"
wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
verbose "Found curl ... using curl"
curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
elif set_java_home; then
verbose "Falling back to use Java to download"
javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
cat >"$javaSource" <<-END
public class Downloader extends java.net.Authenticator
{
protected java.net.PasswordAuthentication getPasswordAuthentication()
{
return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
}
public static void main( String[] args ) throws Exception
{
setDefault( new Downloader() );
java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
}
}
END
# For Cygwin/MinGW, switch paths to Windows format before running javac and java
verbose " - Compiling Downloader.java ..."
"$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
verbose " - Running Downloader.java ..."
"$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
fi
# If specified, validate the SHA-256 sum of the Maven distribution zip file
if [ -n "${distributionSha256Sum-}" ]; then
distributionSha256Result=false
if [ "$MVN_CMD" = mvnd.sh ]; then
echo "Checksum validation is not supported for maven-mvnd." >&2
echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
exit 1
elif command -v sha256sum >/dev/null; then
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then
distributionSha256Result=true
fi
elif command -v shasum >/dev/null; then
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
distributionSha256Result=true
fi
else
echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
exit 1
fi
if [ $distributionSha256Result = false ]; then
echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
exit 1
fi
fi
# unzip and move
if command -v unzip >/dev/null; then
unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
else
tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
fi
printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url"
mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
clean || :
exec_maven "$@"

149
main/mvnw.cmd vendored

@ -1,149 +0,0 @@
<# : batch portion
@REM ----------------------------------------------------------------------------
@REM Licensed to the Apache Software Foundation (ASF) under one
@REM or more contributor license agreements. See the NOTICE file
@REM distributed with this work for additional information
@REM regarding copyright ownership. The ASF licenses this file
@REM to you under the Apache License, Version 2.0 (the
@REM "License"); you may not use this file except in compliance
@REM with the License. You may obtain a copy of the License at
@REM
@REM http://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@REM KIND, either express or implied. See the License for the
@REM specific language governing permissions and limitations
@REM under the License.
@REM ----------------------------------------------------------------------------
@REM ----------------------------------------------------------------------------
@REM Apache Maven Wrapper startup batch script, version 3.3.2
@REM
@REM Optional ENV vars
@REM MVNW_REPOURL - repo url base for downloading maven distribution
@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output
@REM ----------------------------------------------------------------------------
@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
@SET __MVNW_CMD__=
@SET __MVNW_ERROR__=
@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
@SET PSModulePath=
@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
)
@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
@SET __MVNW_PSMODULEP_SAVE=
@SET __MVNW_ARG0_NAME__=
@SET MVNW_USERNAME=
@SET MVNW_PASSWORD=
@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*)
@echo Cannot start maven from wrapper >&2 && exit /b 1
@GOTO :EOF
: end batch / begin powershell #>
$ErrorActionPreference = "Stop"
if ($env:MVNW_VERBOSE -eq "true") {
$VerbosePreference = "Continue"
}
# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
if (!$distributionUrl) {
Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
}
switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
"maven-mvnd-*" {
$USE_MVND = $true
$distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
$MVN_CMD = "mvnd.cmd"
break
}
default {
$USE_MVND = $false
$MVN_CMD = $script -replace '^mvnw','mvn'
break
}
}
# apply MVNW_REPOURL and calculate MAVEN_HOME
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
if ($env:MVNW_REPOURL) {
$MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" }
$distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')"
}
$distributionUrlName = $distributionUrl -replace '^.*/',''
$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
if ($env:MAVEN_USER_HOME) {
$MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain"
}
$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
exit $?
}
if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
}
# prepare tmp dir
$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
trap {
if ($TMP_DOWNLOAD_DIR.Exists) {
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
}
}
New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
# Download and Install Apache Maven
Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
Write-Verbose "Downloading from: $distributionUrl"
Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
$webclient = New-Object System.Net.WebClient
if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
$webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
}
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
# If specified, validate the SHA-256 sum of the Maven distribution zip file
$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
if ($distributionSha256Sum) {
if ($USE_MVND) {
Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
}
Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
}
}
# unzip and move
Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null
try {
Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
} catch {
if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
Write-Error "fail to move MAVEN_HOME"
}
} finally {
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
}
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"

97
main/pom.xml

@ -1,97 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.0-M3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>gsp.technologies</groupId>
<artifactId>main</artifactId>
<version>0.1</version>
<name>main</name>
<description>main service for exam</description>
<url/>
<licenses>
<license/>
</licenses>
<developers>
<developer/>
</developers>
<scm>
<connection/>
<developerConnection/>
<tag/>
<url/>
</scm>
<properties>
<java.version>17</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project>

13
main/src/main/java/gsp/technologies/main/MainApplication.java

@ -1,13 +0,0 @@
package gsp.technologies.main;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class MainApplication {
public static void main(String[] args) {
SpringApplication.run(MainApplication.class, args);
}
}

29
main/src/main/java/gsp/technologies/main/controllers/AuthController.java

@ -1,29 +0,0 @@
package gsp.technologies.main.controllers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.context.request.RequestContextHolder;
/**
* Контроллер авторизации пользователя
*/
@Controller
@RequestMapping(path = "/auth")
public class AuthController {
private static final Logger log = LoggerFactory.getLogger(MainframeController.class);
@GetMapping("")
public String mainframe() {
log.info("GET /auth");
log.info("текущая сессия: {}", RequestContextHolder.currentRequestAttributes().getSessionId());
//сравнить номер сессии с имеющимися в базе
//при наличии вернуть порядковый номер существующей сессии (в 35-ричной системе счисления)
//при отсутствии внести новую запись в базу и вернуть ее порядковый номер
return "auth";
}
}

53
main/src/main/java/gsp/technologies/main/controllers/MainframeController.java

@ -1,53 +0,0 @@
package gsp.technologies.main.controllers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
/**
* Контроллер для главной страницы:
* - приветствие
* - пояснения
* - переход к учебному курсу moodle
* - переход к учебному курсу custom
*/
@Controller
@RequestMapping(path = "/mainframe")
public class MainframeController {
private static final Logger log = LoggerFactory.getLogger(MainframeController.class);
@GetMapping("")
public String mainframe() {
log.info("GET /mainframe");
log.info("текущая сессия: {}", RequestContextHolder.currentRequestAttributes().getSessionId());
//сравнить номер сессии с имеющимися в базе
//при наличии вернуть порядковый номер существующей сессии (в 35-ричной системе счисления)
//при отсутствии внести новую запись в базу и вернуть ее порядковый номер
return "mainframe";
}
@PostMapping("/moodle")
public String moodle(@RequestBody String entity) {
//TODO: process POST request
return entity;
}
@PostMapping("/exam")
public String exam(@RequestBody String entity) {
//TODO: process POST request
return entity;
}
}

6
main/src/main/resources/application.yaml

@ -1,6 +0,0 @@
spring:
application:
name: main
server:
port: 100

16
main/src/main/resources/static/content/md/hello.md

@ -1,16 +0,0 @@
# Учебный центр ООО "ГСП-Технологии"
Предлагаем Вам пройти оценку знаний по основным рабочим компетенциям.
# Порядок прохождения проверки знаний
Укажите пожалуйста наименование компании где Вы работаете и свою должность, чтобы мы могли сформировать набор необходимых для Вас курсов
**Нажав кнопку "перейти к курсу", Вы:**
* попадете на основную страницу курса, где сможете повторить необходимый материал;
* сможете перейти далее к проверке знаний.
# Мы не собираем и не храним Ваши персональные данные
**Для подтверждения прохождения необходимых тестов - Вам нужно запомнить цифры указанные в верхней части экрана.**
Они являются Вашим идентификатором в системе и по ним можно будет в последствии узнать результаты прохождения Вами курсов.
Этот код Вам будет необходим при заезде на вахту, для подтверждения готовности исполнять свои основные должностные обязанности.

21
main/src/main/resources/templates/auth.html

@ -1,21 +0,0 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>exam-auth</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>
<header>
<div th:insert="~{fragments/common/header :: to-mainframe}"></div>
<hr>
</header>
<body>
<div th:insert="~{fragments/controls :: auth}"></div>
</body>
<footer>
<div th:insert="~{fragments/common/footer :: copy}"></div>
</footer>
</html>

10
main/src/main/resources/templates/fragments/code.html

@ -1,10 +0,0 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<body>
<div th:fragment="main">
<hr>
CODE:
</div>
</body>
</html>

13
main/src/main/resources/templates/fragments/common/footer.html

@ -1,13 +0,0 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<body>
<div th:fragment="copy">
<hr>
<b>© 2024 ООО "ГСП-Технологии" : gsp.technologies.exam.main</b>
</div>
<div th:fragment="info">
<hr>
<zero-md th:src="@{/content/md/hello.md}"></zero-md>
</div>
</body>
</html>

9
main/src/main/resources/templates/fragments/common/header.html

@ -1,9 +0,0 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<body>
<div th:fragment="to-mainframe">
<a th:href="@{/mainframe}">На главную</a>
</div>
</body>
</html>

70
main/src/main/resources/templates/fragments/controls.html

@ -1,70 +0,0 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<body>
<div th:fragment="moodle">
<hr>
<!-- отправляем наименование компании и наименование должности
для перехода на целевой курс -->
<form th:action="@{/}" th:method="post">
<label for="company">Выбор компании</label>
<select>
<option value="1">ГСП-1</option>
<option value="2">ГСП-2</option>
<option value="3">ГСП-3</option>
<option value="4">ГСП-4</option>
</select>
<br>
<label for="profession">Выбор должности</label>
<select>
<option value="1">сварщик</option>
<option value="2">монтажник</option>
<option value="3">специалист ПТО</option>
<option value="4">дефектоскопист</option>
</select>
<br>
<input type="submit" value="Перейти к moodle">
</form>
</div>
<div th:fragment="exam">
<hr>
<p>Укажите данные для создания нового задания</p>
<!-- отправляем наименование компании и наименование должности
для перехода на целевой курс -->
<form th:action="@{/}" th:method="post">
<label for="company">компания: </label>
<select>
<option value="1">ГСП-1</option>
<option value="2">ГСП-2</option>
<option value="3">ГСП-3</option>
<option value="4">ГСП-4</option>
</select>
<br>
<label for="profession">должность: </label>
<select>
<option value="1">сварщик</option>
<option value="2">монтажник</option>
<option value="3">специалист ПТО</option>
<option value="4">дефектоскопист</option>
</select>
<br>
<input type="submit" value="Перейти к exam">
</form>
</div>
<div th:fragment="auth">
<!-- Отправляем запрос с параметром code
открываем существующую попытку -->
<form th:action="@{/auth}" th:method="post">
<label for="code">Если Вам нужно продолжить прохождение уже начатого курса - введите код попытки: </label>
<input type="text" id="code" name="code">
<input type="submit" value="Проверить код">
</form>
</div>
</body>
</html>

9
main/src/main/resources/templates/fragments/hello.html

@ -1,9 +0,0 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<body>
<div th:fragment="main">
<hr>
<zero-md th:src="@{/content/md/hello.md}"></zero-md>
</div>
</body>
</html>

25
main/src/main/resources/templates/mainframe.html

@ -1,25 +0,0 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>exam-main-hello</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>
<header>
</header>
<body>
<!-- переходим к сохраненной попытке -->
<div th:insert="~{fragments/controls :: auth}"></div>
<!-- пояснения, приветствие -->
<div th:insert="~{fragments/hello :: main}"></div>
<!-- создаем новую попытку -->
<div th:insert="~{fragments/controls :: exam}"></div>
</body>
<footer>
<!-- <div th:insert="~{fragments/common/footer :: info}"></div> -->
<div th:insert="~{fragments/common/footer :: copy}"></div>
</footer>
</html>

13
main/src/test/java/gsp/technologies/main/MainApplicationTests.java

@ -1,13 +0,0 @@
package gsp.technologies.main;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
class MainApplicationTests {
@Test
void contextLoads() {
}
}

20
moodle/SETUP.md

@ -4,26 +4,6 @@
.\run.ps1 .\run.ps1
.\install.ps1 .\install.ps1
language = en
Database host = exam-base
Database name = moodle
Database user = moodle
Database password = moodle
Tables prefix = mdl_
Unix socket =
Username = admin
new password = Aa1-1234
first name = Admin
Last name = User
Email address = admin@user.address
Full site name = exam
Short name for site = exam
Support email = support@user.address
после выполнения этих скриптов платформа развернута и готова к эксплуатации и подключению к ней сторонних сервисов после выполнения этих скриптов платформа развернута и готова к эксплуатации и подключению к ней сторонних сервисов
# порядок развертывания контйнера moodle # порядок развертывания контйнера moodle

1
moodle/distro/moodle

@ -0,0 +1 @@
Subproject commit 149a4779030de22fbe21bd70d35e1eea017d9ed4

92
moodle/install.ps1

@ -1,93 +1,13 @@
#!/bin/pwsh #!/bin/pwsh
# Set up Moodle in container # Set up Moodle in container
$lang = 'ru'
$wwwroot = 'http://localhost:90'
$dirroot = '/var/www/html'
$dataroot = '/var/moodledata'
$dbtype = 'pgsql' $adminUser = "admin"
$dbhost = 'exam-base' $adminPassword = "admin"
$dbname = 'moodle' $siteName = "exam"
$dbuser = 'moodle' $siteShort = "exam"
$dbpass = 'moodle' $lang = "ru"
$dbport = '5432'
# $dbsocket = ""
$dbprefix = 'mdl_'
$adminUser = 'admin' docker exec -it -u www-data moodle /usr/bin/php /var/www/html/admin/cli/install_database.php --agree-license --adminuser=$adminUser --adminpass=$adminPassword --fullname=$siteName --shortname=$siteShort --lang=$lang
$adminPassword = 'Aa1-2154'
$adminemail = 'admin@domain.ru'
$sapportemail = 'support@domain.ru'
$siteName = 'exam'
$siteShort = 'exam'
docker exec -it -u www-data moodle /usr/bin/php /var/www/html/admin/cli/install_database.php --agree-license --allow-unstable --non-interactive --lang=$lang --wwwroot=$wwwroot --dirroot=$dirroot --dataroot=$dataroot --dbtype=$dbtype --dbhost=$dbhost --dbname=$dbname --dbuser=$dbuser --dbpass=$dbpass --dbport=$dbport --prefix=$dbprefix --adminuser=$adminUser --adminpass=$adminPassword --fullname=$siteName --shortname=$siteShort --adminemail=$adminemail --supportemail=$sapportemail
# возможные преднастройки:
# --agree-license
# --allow-unstable
# --skip-database
# --non-interactive
# --lang=$lang
# --wwwroot=$wwwroot
# --dataroot=$dataroot
# --dbtype=$dbtype
# --dbhost=$dbhost
# --dbname=$dbname
# --dbuser=$dbuser
# --dbpass=$dbpass
# --dbport=$dbport
# --dbsocket=$dbsocket
# --prefix=$dbprefix
# --adminuser=$adminUser
# --adminpass=$adminPassword
# --fullname=$siteName
# --shortname=$siteShort
# --adminemail=$adminemail
# --supportemail=$sapportemail
# ручной запуск скрипта настройки клиента
# /usr/bin/php /var/www/html/install.php --agree-license --allow-unstable --non-interactive --lang=$lang --wwwroot=$wwwroot --dataroot=$dataroot --dbtype=$dbtype --dbhost=$dbhost --dbname=$dbname --dbuser=$dbuser --dbpass=$dbpass --dbport=$dbport --prefix=$dbprefix --adminuser=$adminUser --adminpass=$adminPassword --fullname=$siteName --shortname=$siteShort --adminemail=$adminemail --supportemail=$sapportemail
# install_database.php при запуске требует config.php, который генерируется при запуске скрипта - install.php
# docker exec -it -u www-data moodle /usr/bin/php /var/www/html/admin/cli/install_database.php --agree-license --adminuser=$adminUser --adminpass=$adminPassword --fullname=$siteName --shortname=$siteShort --lang=$lang
Write-Host "Admin account: $adminUser/$adminPassword" Write-Host "Admin account: $adminUser/$adminPassword"
# Options:
# --chmod=OCTAL-MODE Permissions of new directories created within dataroot.
# Default is 2777. You may want to change it to 2770
# or 2750 or 750. See chmod man page for details.
# --lang=CODE Installation and default site language.
# --wwwroot=URL Web address for the Moodle site,
# required in non-interactive mode.
# --dataroot=DIR Location of the moodle data folder,
# must not be web accessible. Default is moodledata
# in the parent directory.
# --dbtype=TYPE Database type. Default is mysqli
# --dbhost=HOST Database host. Default is localhost
# --dbname=NAME Database name. Default is moodle
# --dbuser=USERNAME Database user. Default is root
# --dbpass=PASSWORD Database password. Default is blank
# --dbport=NUMBER Use database port.
# --dbsocket=PATH Use database socket, 1 means default. Available for some databases only.
# --prefix=STRING Table prefix for above database tables. Default is mdl_
# --fullname=STRING The fullname of the site
# --shortname=STRING The shortname of the site
# --summary=STRING The summary to be displayed on the front page
# --adminuser=USERNAME Username for the moodle admin account. Default is admin
# --adminpass=PASSWORD Password for the moodle admin account,
# required in non-interactive mode.
# --adminemail=STRING Email address for the moodle admin account.
# --sitepreset=STRING Admin site preset to be applied during the installation process.
# --supportemail=STRING Email address for support and help.
# --upgradekey=STRING The upgrade key to be set in the config.php, leave empty to not set it.
# --non-interactive No interactive questions, installation fails if any
# problem encountered.
# --agree-license Indicates agreement with software license,
# required in non-interactive mode.
# --allow-unstable Install even if the version is not marked as stable yet,
# required in non-interactive mode.
# --skip-database Stop the installation before installing the database.
# -h, --help Print out this help
Loading…
Cancel
Save