From c7879f07a5717072cd12f284554d94cce8b93ba8 Mon Sep 17 00:00:00 2001 From: igor Date: Mon, 21 Oct 2024 21:06:00 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D1=8B=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 34 +++ .mvn/wrapper/maven-wrapper.properties | 19 ++ ccalm.properties | 50 ++++ geovizor.properties | 51 ++++ kz_istransit_dbms.properties | 36 +++ kz_mcp_dbms.properties | 43 +++ mvnw | 259 ++++++++++++++++++ mvnw.cmd | 149 ++++++++++ pom.xml | 123 +++++++++ src/main/java/dbms/DBMSRecords.java | 1 + src/main/java/dbms/DBMSTree.java | 1 + .../java/org/ccalm/dbms/DbmsApplication.java | 13 + .../java/org/ccalm/dbms/MainController.java | 38 +++ src/main/java/tctable | 1 + src/main/java/tools/DBTools.java | 1 + src/main/java/tools/EmailUtility.java | 1 + .../java/tools/PreparedStatementNamed.java | 1 + src/main/java/tools/Translation.java | 1 + src/main/java/tools/User.java | 1 + src/main/java/tools/XMLTools.java | 1 + src/main/resources/logback-spring.xml | 33 +++ .../geovizor/dbms/DbmsApplicationTests.java | 13 + transit.properties | 51 ++++ 23 files changed, 921 insertions(+) create mode 100644 .gitignore create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 ccalm.properties create mode 100644 geovizor.properties create mode 100644 kz_istransit_dbms.properties create mode 100644 kz_mcp_dbms.properties create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 120000 src/main/java/dbms/DBMSRecords.java create mode 120000 src/main/java/dbms/DBMSTree.java create mode 100644 src/main/java/org/ccalm/dbms/DbmsApplication.java create mode 100644 src/main/java/org/ccalm/dbms/MainController.java create mode 120000 src/main/java/tctable create mode 120000 src/main/java/tools/DBTools.java create mode 120000 src/main/java/tools/EmailUtility.java create mode 120000 src/main/java/tools/PreparedStatementNamed.java create mode 120000 src/main/java/tools/Translation.java create mode 120000 src/main/java/tools/User.java create mode 120000 src/main/java/tools/XMLTools.java create mode 100644 src/main/resources/logback-spring.xml create mode 100644 src/test/java/com/geovizor/dbms/DbmsApplicationTests.java create mode 100644 transit.properties diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..91ae67b --- /dev/null +++ b/.gitignore @@ -0,0 +1,34 @@ +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/ +logs diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..d58dfb7 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/ccalm.properties b/ccalm.properties new file mode 100644 index 0000000..fa8bc8b --- /dev/null +++ b/ccalm.properties @@ -0,0 +1,50 @@ +spring.application.name=dbms +server.port=8084 + +issuer.name=geovizor + +#??? ?????? ???????? ? ??????? +logging.level.com.zaxxer.hikari=DEBUG + +#spring.datasource.url=jdbc:postgresql://geovizor.com:5432/monitoring_new +#spring.datasource.username=postgres +#spring.datasource.password=y7HMHi0ATxx1VC3UU5WG +#spring.datasource.driver-class-name=org.postgresql.Driver + +#????????? ??? ?????????? ? ????? ?????? +spring.datasource.url=jdbc:postgresql://mcp.kz:5432/mcp +spring.datasource.username=igor +spring.datasource.password=VnzbUdcePSLtg22ktz13 +spring.datasource.driver-class-name=org.postgresql.Driver + +#????????? ??? ???? ?????????? +spring.datasource.hikari.maximum-pool-size=10 +spring.datasource.hikari.minimum-idle=5 +spring.datasource.hikari.max-lifetime=1700000 +spring.datasource.hikari.idle-timeout=600000 +spring.datasource.hikari.connection-timeout=30000 +spring.datasource.hikari.connection-test-query=SELECT now() +spring.datasource.hikari.validation-timeout=60000 + + +access.key=yon8FWKppyvpSSUMyRt3tGKiOKfZk3LRkgh9ZA2+Zh8= +access.time=600 + +refresh.time=43200 + + +captcha.key=PPExpv36jk4Vzda3NpYnXLfuHCLYXqaNrxlOH/Jr/1M= +captcha.time=600 + +mail.host=smtp.yandex.ru +mail.port=465 +mail.loginModel=info@ccalm.org +mail.password=fu2lpsoGPGiq1xlRm8ag + +url.reset=http://127.0.0.1:8088/reset +url.main=http://127.0.0.1:8088/ + +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +spring.redis.password=9F3/NKWeOjd815vkadT2DcgVHf6fEpVQXw== + diff --git a/geovizor.properties b/geovizor.properties new file mode 100644 index 0000000..5a82ee0 --- /dev/null +++ b/geovizor.properties @@ -0,0 +1,51 @@ +spring.application.name=dbms +server.port=8084 + +issuer.name=geovizor + +#??? ?????? ???????? ? ??????? +logging.level.com.zaxxer.hikari=DEBUG + +#spring.datasource.url=jdbc:postgresql://geovizor.com:5432/monitoring_new +#spring.datasource.username=postgres +#spring.datasource.password=y7HMHi0ATxx1VC3UU5WG +#spring.datasource.driver-class-name=org.postgresql.Driver + +#????????? ??? ?????????? ? ????? ?????? +spring.datasource.url=jdbc:postgresql://mcp.kz:5432/mcp +spring.datasource.username=igor +spring.datasource.password=VnzbUdcePSLtg22ktz13 +spring.datasource.driver-class-name=org.postgresql.Driver + +#????????? ??? ???? ?????????? +spring.datasource.hikari.maximum-pool-size=10 +spring.datasource.hikari.minimum-idle=5 +spring.datasource.hikari.max-lifetime=1700000 +spring.datasource.hikari.idle-timeout=300000 +spring.datasource.hikari.connection-timeout=30000 +spring.datasource.hikari.connection-test-query=SELECT now() +spring.datasource.hikari.validation-timeout=60000 + + +access.key=yon8FWKppyvpSSUMyRt3tGKiOKfZk3LRkgh9ZA2+Zh8= +access.time=600 + +refresh.key=yon8FWKppyvpSSUMyRt3tGKiOKfZk3LRkgh9ZA2+Zh8= +refresh.time=43200 + + +captcha.key=PPExpv36jk4Vzda3NpYnXLfuHCLYXqaNrxlOH/Jr/1M= +captcha.time=600 + +mail.host=smtp.yandex.ru +mail.port=465 +mail.loginModel=info@ccalm.org +mail.password=fu2lpsoGPGiq1xlRm8ag + +url.reset=http://127.0.0.1:8088/reset +url.main=http://127.0.0.1:8088/ + +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +spring.redis.password=9F3/NKWeOjd815vkadT2DcgVHf6fEpVQXw== + diff --git a/kz_istransit_dbms.properties b/kz_istransit_dbms.properties new file mode 100644 index 0000000..7830e63 --- /dev/null +++ b/kz_istransit_dbms.properties @@ -0,0 +1,36 @@ +spring.application.name=kz_istransit_dbms +server.port=8084 + +issuer.name=istransit + +logging.level.com.zaxxer.hikari=DEBUG + +spring.datasource.url=jdbc:postgresql://10.101.1.6:5432/transit_2024_09_03?ApplicationName=kz_istransit_jwt +spring.datasource.username=postgres +spring.datasource.password=PasSecrKey1 +spring.datasource.driver-class-name=org.postgresql.Driver + +spring.datasource.hikari.maximum-pool-size=10 +spring.datasource.hikari.minimum-idle=5 +spring.datasource.hikari.max-lifetime=1700000 +spring.datasource.hikari.idle-timeout=600000 +spring.datasource.hikari.connection-timeout=30000 +spring.datasource.hikari.connection-test-query=SELECT now() +spring.datasource.hikari.validation-timeout=60000 + +public.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArK1etFoDgmxQ8+5q6+QHXuMEqyo4AeD1/mNs87bXPOxSiC82bMKUL9ly0WVxG5IKQFYlffQbCg0ndH+OhU8p0x90qmwCeCn4bFT6nzA9sjYyQSUkci2dfUABXcsr3kSP2+KEPnTpdGYZQFEOR34ORt+HBPwMn6FWh0aJdmTqZH+Vy/dP3TysT7AGlsPi8IA9j3asyDZdS9exLKVVIzYkbHJUKpKHYc4T/260YauUtNyijbT5w4ZWSbHqeuzV/HGUCYIpfAZyMxhzKnRRfjQWaCz8v/q+FP1a+jtaD2e0St6J7WOnyTx2P2yNeyscELrJPAt7TyTcINlN5oZCd5hfdwIDAQAB +captcha.key=PPExpv36jk4Vzda3NpYnXLfuHCLYXqaNrxlOH/Jr/1M= +captcha.time=600 + +mail.host=92.46.51.29 +mail.port=465 +mail.login=no-reply@istt.kz +mail.password=je6&HHCEmJ + +url.reset=http://127.0.0.1:8088/reset +url.main=http://127.0.0.1:8088/ + +spring.redis.host=10.101.1.6 +spring.redis.port=6379 +spring.redis.password=9F3/NKWeOjd815vkadT2DcgVHf6fEpVQXw== + diff --git a/kz_mcp_dbms.properties b/kz_mcp_dbms.properties new file mode 100644 index 0000000..68d8682 --- /dev/null +++ b/kz_mcp_dbms.properties @@ -0,0 +1,43 @@ +spring.application.name=kz_mcp_dbms +server.port=8084 + +issuer.name=geovizor + +#??? ?????? ???????? ? ??????? +logging.level.com.zaxxer.hikari=DEBUG + +#spring.datasource.url=jdbc:postgresql://geovizor.com:5432/monitoring_new +#spring.datasource.username=postgres +#spring.datasource.password=y7HMHi0ATxx1VC3UU5WG +#spring.datasource.driver-class-name=org.postgresql.Driver + +spring.datasource.url=jdbc:postgresql://mcp.kz:5432/mcp +spring.datasource.username=igor +spring.datasource.password=VnzbUdcePSLtg22ktz13 +spring.datasource.driver-class-name=org.postgresql.Driver + +spring.datasource.hikari.maximum-pool-size=10 +spring.datasource.hikari.minimum-idle=5 +spring.datasource.hikari.max-lifetime=1700000 +spring.datasource.hikari.idle-timeout=600000 +spring.datasource.hikari.connection-timeout=30000 +spring.datasource.hikari.connection-test-query=SELECT now() +spring.datasource.hikari.validation-timeout=60000 + +access.key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA30j+pSoKFHSdSulIGzdFtg+z+ANJPOSVFJ6jvehj1sonOqQsI2rz539+FgIrsDZE8iydFAlQNxS8vqYtWiQSksAUId7aOY/eq7mFkGW+U5xIA2OPgIvN0uhW1Edm85jS7aAg/P/c+lLHnPzQIFdsgVrAh4esFvVS10Pj6TjJVprDj0jOraIw84GVt0gYXZTudcvZavWcmGV1mQJf0jDIHQsCRcMJAE2lzBIKpJGPPZke9xs25lm8feTFR0NNjDNvCG4dYAimyAH36UslXa/zIfRB/7r4AB9KPBFxGe8szK1EcXbJY+paq+TazZJ8Lo8nEmpehCdHUNdD9iWtiYRjNQIDAQAB + +captcha.key=PPExpv36jk4Vzda3NpYnXLfuHCLYXqaNrxlOH/Jr/1M= +captcha.time=600 + +mail.host=smtp.yandex.ru +mail.port=465 +mail.loginModel=info@ccalm.org +mail.password=fu2lpsoGPGiq1xlRm8ag + +url.reset=http://127.0.0.1:8088/reset +url.main=http://127.0.0.1:8088/ + +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +spring.redis.password=9F3/NKWeOjd815vkadT2DcgVHf6fEpVQXw== + diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..19529dd --- /dev/null +++ b/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..7a2b046 --- /dev/null +++ b/pom.xml @@ -0,0 +1,123 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.3.3 + + + org.ccalm + dbms + 0.0.1-SNAPSHOT + dbms + Database management system + + + + + + + + + + + + + + + 21 + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-redis + + + org.springframework.boot + spring-boot-starter-test + test + + + org.postgresql + postgresql + runtime + + + org.json + json + 20231013 + + + javax.mail + mail + 1.4 + + + org.springframework + spring-jdbc + 6.1.12 + + + org.xerial + sqlite-jdbc + 3.36.0.1 + + + org.springframework.boot + spring-boot-starter-jdbc + + + com.zaxxer + HikariCP + 5.0.1 + + + io.jsonwebtoken + jjwt-api + 0.11.2 + + + io.jsonwebtoken + jjwt-impl + 0.11.2 + runtime + + + io.jsonwebtoken + jjwt-jackson + 0.11.2 + runtime + + + commons-io + commons-io + 2.16.1 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + + file:kz_mcp_dbms.properties + + + + + + + diff --git a/src/main/java/dbms/DBMSRecords.java b/src/main/java/dbms/DBMSRecords.java new file mode 120000 index 0000000..e30a454 --- /dev/null +++ b/src/main/java/dbms/DBMSRecords.java @@ -0,0 +1 @@ +O:/MyDocuments/projects/Workspace_PHP/Metadata_PHP/metadata/dbms/DBMSRecords.java \ No newline at end of file diff --git a/src/main/java/dbms/DBMSTree.java b/src/main/java/dbms/DBMSTree.java new file mode 120000 index 0000000..9fd3920 --- /dev/null +++ b/src/main/java/dbms/DBMSTree.java @@ -0,0 +1 @@ +O:/MyDocuments/projects/Workspace_PHP/Metadata_PHP/metadata/dbms/DBMSTree.java \ No newline at end of file diff --git a/src/main/java/org/ccalm/dbms/DbmsApplication.java b/src/main/java/org/ccalm/dbms/DbmsApplication.java new file mode 100644 index 0000000..e6d1576 --- /dev/null +++ b/src/main/java/org/ccalm/dbms/DbmsApplication.java @@ -0,0 +1,13 @@ +package org.ccalm.dbms; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication(scanBasePackages = {"org.ccalm.dbms", "dbms"}) +public class DbmsApplication { + + public static void main(String[] args) { + SpringApplication.run(DbmsApplication.class, args); + } + +} diff --git a/src/main/java/org/ccalm/dbms/MainController.java b/src/main/java/org/ccalm/dbms/MainController.java new file mode 100644 index 0000000..5e6ce38 --- /dev/null +++ b/src/main/java/org/ccalm/dbms/MainController.java @@ -0,0 +1,38 @@ +package org.ccalm.dbms; + +import com.zaxxer.hikari.HikariDataSource; +import org.json.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +@Controller +public class MainController { + + private HikariDataSource dataSource; + + @Value("${spring.application.name}") + String application_name=""; + + @Autowired + public void DatabaseService(HikariDataSource dataSource) { + this.dataSource = dataSource; + } + + @RequestMapping(value = "/",method = {RequestMethod.POST,RequestMethod.GET},produces = "text/json;charset=utf-8") + @ResponseBody + public String index(Model model, @RequestParam(required=false,name="lng",defaultValue = "1") String language_id) { + JSONObject json = new JSONObject(); + json.put("error_code",0); + json.put("error_message","Application name: "+application_name); + //json.put("active_connections",dataSource.getHikariPoolMXBean().getActiveConnections()); + //json.put("idle_connections",dataSource.getHikariPoolMXBean().getIdleConnections()); + return json.toString(); + } + +} diff --git a/src/main/java/tctable b/src/main/java/tctable new file mode 120000 index 0000000..e0b2103 --- /dev/null +++ b/src/main/java/tctable @@ -0,0 +1 @@ +O:/MyDocuments/projects/Tools_java/tctable \ No newline at end of file diff --git a/src/main/java/tools/DBTools.java b/src/main/java/tools/DBTools.java new file mode 120000 index 0000000..39a13a9 --- /dev/null +++ b/src/main/java/tools/DBTools.java @@ -0,0 +1 @@ +O:/MyDocuments/projects/Tools_java/DBTools.java \ No newline at end of file diff --git a/src/main/java/tools/EmailUtility.java b/src/main/java/tools/EmailUtility.java new file mode 120000 index 0000000..36e6277 --- /dev/null +++ b/src/main/java/tools/EmailUtility.java @@ -0,0 +1 @@ +O:/MyDocuments/projects/Tools_java/EmailUtility.java \ No newline at end of file diff --git a/src/main/java/tools/PreparedStatementNamed.java b/src/main/java/tools/PreparedStatementNamed.java new file mode 120000 index 0000000..45a2e85 --- /dev/null +++ b/src/main/java/tools/PreparedStatementNamed.java @@ -0,0 +1 @@ +O:/MyDocuments/projects/Tools_java/PreparedStatementNamed.java \ No newline at end of file diff --git a/src/main/java/tools/Translation.java b/src/main/java/tools/Translation.java new file mode 120000 index 0000000..dc95e05 --- /dev/null +++ b/src/main/java/tools/Translation.java @@ -0,0 +1 @@ +O:/MyDocuments/projects/Tools_java/Translation.java \ No newline at end of file diff --git a/src/main/java/tools/User.java b/src/main/java/tools/User.java new file mode 120000 index 0000000..5c4adf2 --- /dev/null +++ b/src/main/java/tools/User.java @@ -0,0 +1 @@ +O:/MyDocuments/projects/Tools_java/User.java \ No newline at end of file diff --git a/src/main/java/tools/XMLTools.java b/src/main/java/tools/XMLTools.java new file mode 120000 index 0000000..1e654b0 --- /dev/null +++ b/src/main/java/tools/XMLTools.java @@ -0,0 +1 @@ +O:/MyDocuments/projects/Tools_java/XMLTools.java \ No newline at end of file diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..02a6985 --- /dev/null +++ b/src/main/resources/logback-spring.xml @@ -0,0 +1,33 @@ + + + + + + + + + ${LOGS}/${appName}.log + + {"timestamp":"%d{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}","thread":"[%thread]","level":"%level","logger":"%logger{36}","marker":"%X{marker}","message":"%msg"}%n + + + ${LOGS}/${appName}.%d{yyyy-MM-dd}.%i.log + 30 + + 100MB + + + + + + + %d{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'} | %level | %logger{36} | %X{marker} | %msg%n + + + + + + + + + \ No newline at end of file diff --git a/src/test/java/com/geovizor/dbms/DbmsApplicationTests.java b/src/test/java/com/geovizor/dbms/DbmsApplicationTests.java new file mode 100644 index 0000000..e6680e2 --- /dev/null +++ b/src/test/java/com/geovizor/dbms/DbmsApplicationTests.java @@ -0,0 +1,13 @@ +package org.ccalm.dbms; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class DbmsApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/transit.properties b/transit.properties new file mode 100644 index 0000000..3557ca4 --- /dev/null +++ b/transit.properties @@ -0,0 +1,51 @@ +spring.application.name=dbms +server.port=8084 + +issuer.name=geovizor + +#??? ?????? ???????? ? ??????? +logging.level.com.zaxxer.hikari=DEBUG + +#spring.datasource.url=jdbc:postgresql://geovizor.com:5432/monitoring_new +#spring.datasource.username=postgres +#spring.datasource.password=y7HMHi0ATxx1VC3UU5WG +#spring.datasource.driver-class-name=org.postgresql.Driver + +#????????? ??? ?????????? ? ????? ?????? +spring.datasource.url=jdbc:postgresql://mcp.kz:5432/mcp +spring.datasource.username=igor +spring.datasource.password=VnzbUdcePSLtg22ktz13 +spring.datasource.driver-class-name=org.postgresql.Driver + +#????????? ??? ???? ?????????? +spring.datasource.hikari.maximum-pool-size=10 +spring.datasource.hikari.minimum-idle=5 +spring.datasource.hikari.max-lifetime=1700000 +spring.datasource.hikari.idle-timeout=600000 +spring.datasource.hikari.connection-timeout=30000 +spring.datasource.hikari.connection-test-query=SELECT now() +spring.datasource.hikari.validation-timeout=60000 + + +access.key=yon8FWKppyvpSSUMyRt3tGKiOKfZk3LRkgh9ZA2+Zh8= +access.time=600 + +refresh.key=yon8FWKppyvpSSUMyRt3tGKiOKfZk3LRkgh9ZA2+Zh8= +refresh.time=43200 + + +captcha.key=PPExpv36jk4Vzda3NpYnXLfuHCLYXqaNrxlOH/Jr/1M= +captcha.time=600 + +mail.host=smtp.yandex.ru +mail.port=465 +mail.loginModel=info@ccalm.org +mail.password=fu2lpsoGPGiq1xlRm8ag + +url.reset=http://127.0.0.1:8088/reset +url.main=http://127.0.0.1:8088/ + +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +spring.redis.password=9F3/NKWeOjd815vkadT2DcgVHf6fEpVQXw== +