mirror of https://github.com/elunez/eladmin
Chanheng
GitHub
commit
cd4c1e6798
|
|
@ -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.8.7/apache-maven-3.8.7-bin.zip
|
||||
|
|
@ -49,5 +49,4 @@ public enum DataScopeEnum {
|
|||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
config.stopBubbling = true
|
||||
lombok.addLombokGeneratedAnnotation = true
|
||||
lombok.anyConstructor.addConstructorProperties = true
|
||||
lombok.equalsAndHashCode.callSuper = call
|
||||
lombok.accessors.chain = true
|
||||
lombok.fieldDefaults.defaultPrivate = true
|
||||
lombok.extern.findbugs.addSuppressFBWarnings = false
|
||||
# Ensure getters and setters are properly generated
|
||||
lombok.getter.noIsPrefix = false
|
||||
lombok.setter.flagUsage = allow
|
||||
# Enable all field-level annotations
|
||||
lombok.data.flagUsage = allow
|
||||
|
|
@ -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-<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 "$@"
|
||||
|
|
@ -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-<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"
|
||||
45
pom.xml
45
pom.xml
|
|
@ -34,6 +34,7 @@
|
|||
<druid.version>1.2.19</druid.version>
|
||||
<commons-pool2.version>2.11.1</commons-pool2.version>
|
||||
<mapstruct.version>1.4.2.Final</mapstruct.version>
|
||||
<lombok.version>1.18.30</lombok.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
|
@ -160,7 +161,8 @@
|
|||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<optional>true</optional>
|
||||
<version>${lombok.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- excel tool -->
|
||||
|
|
@ -241,6 +243,47 @@
|
|||
<skip>true</skip>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<!-- Configure Maven compiler plugin to properly handle Lombok -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.8.1</version>
|
||||
<configuration>
|
||||
<source>${java.version}</source>
|
||||
<target>${java.version}</target>
|
||||
<annotationProcessorPaths>
|
||||
<path>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>${lombok.version}</version>
|
||||
</path>
|
||||
<path>
|
||||
<groupId>org.mapstruct</groupId>
|
||||
<artifactId>mapstruct-processor</artifactId>
|
||||
<version>${mapstruct.version}</version>
|
||||
</path>
|
||||
</annotationProcessorPaths>
|
||||
<compilerArgs>
|
||||
<arg>-parameters</arg>
|
||||
</compilerArgs>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<!-- Lombok plugin to ensure annotation processing -->
|
||||
<plugin>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok-maven-plugin</artifactId>
|
||||
<version>1.18.20.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>generate-sources</phase>
|
||||
<goals>
|
||||
<goal>delombok</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<properties>
|
||||
<hutool.version>5.8.35</hutool.version>
|
||||
<mapstruct.version>1.5.3.Final</mapstruct.version>
|
||||
</properties>
|
||||
|
||||
<artifactId>sport</artifactId>
|
||||
|
|
@ -25,5 +26,49 @@
|
|||
<artifactId>eladmin-tools</artifactId>
|
||||
<version>2.7</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Explicitly add Lombok with provided scope -->
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>${lombok.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mapstruct</groupId>
|
||||
<artifactId>mapstruct</artifactId>
|
||||
<version>${mapstruct.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<!-- Add build configuration specific to sport module -->
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.8.1</version>
|
||||
<configuration>
|
||||
<source>${java.version}</source>
|
||||
<target>${java.version}</target>
|
||||
<annotationProcessorPaths>
|
||||
<path>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>${lombok.version}</version>
|
||||
</path>
|
||||
<path>
|
||||
<groupId>org.mapstruct</groupId>
|
||||
<artifactId>mapstruct-processor</artifactId>
|
||||
<version>${mapstruct.version}</version>
|
||||
</path>
|
||||
</annotationProcessorPaths>
|
||||
<compilerArgs>
|
||||
<arg>-Amapstruct.defaultComponentModel=spring</arg>
|
||||
<arg>-parameters</arg>
|
||||
</compilerArgs>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
|
|
@ -40,50 +40,50 @@ public class Club implements Serializable {
|
|||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "`id`")
|
||||
@Column(name = "id")
|
||||
@ApiModelProperty(value = "id", hidden = true)
|
||||
private Long id;
|
||||
|
||||
@Column(name = "`name`",nullable = false)
|
||||
@Column(name = "name",nullable = false)
|
||||
@NotBlank
|
||||
@ApiModelProperty(value = "Name")
|
||||
private String name;
|
||||
|
||||
@Column(name = "`description`")
|
||||
@Column(name = "description")
|
||||
@ApiModelProperty(value = "Description")
|
||||
private String description;
|
||||
|
||||
@Column(name = "`create_time`")
|
||||
@Column(name = "create_time")
|
||||
@CreationTimestamp
|
||||
@ApiModelProperty(value = "Creation time", hidden = true)
|
||||
private Timestamp createTime;
|
||||
|
||||
@Column(name = "`update_time`")
|
||||
@Column(name = "update_time")
|
||||
@UpdateTimestamp
|
||||
@ApiModelProperty(value = "Update time", hidden = true)
|
||||
private Timestamp updateTime;
|
||||
|
||||
@Column(name = "`icon`")
|
||||
@Column(name = "icon")
|
||||
@ApiModelProperty(value = "Icon")
|
||||
private String icon;
|
||||
|
||||
@Column(name = "`sort`")
|
||||
@Column(name = "sort")
|
||||
@ApiModelProperty(value = "Sort")
|
||||
private Integer sort;
|
||||
|
||||
@Column(name = "`enabled`")
|
||||
@Column(name = "enabled")
|
||||
@ApiModelProperty(value = "Enabled")
|
||||
private Boolean enabled;
|
||||
|
||||
@Column(name = "`location`")
|
||||
@Column(name = "location")
|
||||
@ApiModelProperty(value = "Location")
|
||||
private String location;
|
||||
|
||||
@Column(name = "`longitude`")
|
||||
@Column(name = "longitude")
|
||||
@ApiModelProperty(value = "Longitude")
|
||||
private Double longitude;
|
||||
|
||||
@Column(name = "`latitude`")
|
||||
@Column(name = "latitude")
|
||||
@ApiModelProperty(value = "Latitude")
|
||||
private Double latitude;
|
||||
|
||||
|
|
|
|||
|
|
@ -40,29 +40,29 @@ public class Court implements Serializable {
|
|||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "`id`")
|
||||
@Column(name = "id")
|
||||
@ApiModelProperty(value = "id", hidden = true)
|
||||
private Long id;
|
||||
|
||||
@Column(name = "`club_id`")
|
||||
@Column(name = "club_id")
|
||||
@ApiModelProperty(value = "clubId")
|
||||
private Long clubId;
|
||||
|
||||
@Column(name = "`sport_id`")
|
||||
@Column(name = "sport_id")
|
||||
@ApiModelProperty(value = "sportId")
|
||||
private Long sportId;
|
||||
|
||||
@Column(name = "`create_time`")
|
||||
@Column(name = "create_time")
|
||||
@CreationTimestamp
|
||||
@ApiModelProperty(value = "Creation time", hidden = true)
|
||||
private Timestamp createTime;
|
||||
|
||||
@Column(name = "`update_time`")
|
||||
@Column(name = "update_time")
|
||||
@UpdateTimestamp
|
||||
@ApiModelProperty(value = "Update time", hidden = true)
|
||||
private Timestamp updateTime;
|
||||
|
||||
@Column(name = "`amount`",nullable = false)
|
||||
@Column(name = "amount",nullable = false)
|
||||
@NotNull
|
||||
@ApiModelProperty(value = "Amount")
|
||||
private Integer amount;
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@ package com.srr.domain;
|
|||
import com.srr.converter.StringListConverter;
|
||||
import com.srr.enumeration.EventStatus;
|
||||
import com.srr.enumeration.Format;
|
||||
import lombok.Data;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import cn.hutool.core.bean.copier.CopyOptions;
|
||||
|
|
@ -41,7 +42,8 @@ import java.util.List;
|
|||
* @date 2025-05-18
|
||||
**/
|
||||
@Entity
|
||||
@Data
|
||||
@Getter
|
||||
@Setter
|
||||
@Table(name="event")
|
||||
@SQLDelete(sql = "update event set status = 'DELETED' where id = ?", check = ResultCheckStyle.COUNT)
|
||||
@Where(clause = "status != 'DELETED'")
|
||||
|
|
@ -49,105 +51,105 @@ public class Event implements Serializable {
|
|||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "`id`")
|
||||
@Column(name = "id")
|
||||
@ApiModelProperty(value = "id", hidden = true)
|
||||
private Long id;
|
||||
|
||||
@Column(name = "`name`",nullable = false)
|
||||
@Column(name = "name", nullable = false)
|
||||
@NotBlank
|
||||
@ApiModelProperty(value = "Name")
|
||||
private String name;
|
||||
|
||||
@Column(name = "`description`")
|
||||
@Column(name = "description")
|
||||
@ApiModelProperty(value = "Description")
|
||||
private String description;
|
||||
|
||||
@Column(name = "`format`",nullable = false)
|
||||
@Column(name = "format", nullable = false)
|
||||
@NotNull
|
||||
@Enumerated(EnumType.STRING)
|
||||
@ApiModelProperty(value = "SINGLE, DOUBLE")
|
||||
private Format format;
|
||||
|
||||
@Column(name = "`location`")
|
||||
@Column(name = "location")
|
||||
@ApiModelProperty(value = "Location")
|
||||
private String location;
|
||||
|
||||
@Column(name = "`image`")
|
||||
@Column(name = "image")
|
||||
@ApiModelProperty(value = "Image")
|
||||
private String image;
|
||||
|
||||
@Column(name = "`create_time`")
|
||||
@Column(name = "create_time")
|
||||
@CreationTimestamp
|
||||
@ApiModelProperty(value = "Creation time", hidden = true)
|
||||
private Timestamp createTime;
|
||||
|
||||
@Column(name = "`update_time`")
|
||||
@Column(name = "update_time")
|
||||
@UpdateTimestamp
|
||||
@ApiModelProperty(value = "Update time", hidden = true)
|
||||
private Timestamp updateTime;
|
||||
|
||||
@Column(name = "`check_in_at`")
|
||||
@Column(name = "check_in_at")
|
||||
@ApiModelProperty(value = "Check in time", hidden = true)
|
||||
private Timestamp checkInAt;
|
||||
|
||||
@Column(name = "`group_count`")
|
||||
@Column(name = "group_count")
|
||||
@ApiModelProperty(value = "Number of groups")
|
||||
private Integer groupCount;
|
||||
|
||||
@Column(name = "`sort`")
|
||||
@Column(name = "sort")
|
||||
@ApiModelProperty(value = "Sort")
|
||||
private Integer sort;
|
||||
|
||||
@Column(name = "`enabled`")
|
||||
@Column(name = "enabled")
|
||||
@ApiModelProperty(value = "Enabled")
|
||||
private Boolean enabled;
|
||||
|
||||
@Column(name = "`event_time`",nullable = false)
|
||||
@Column(name = "event_time", nullable = false)
|
||||
@NotNull
|
||||
@ApiModelProperty(value = "Time")
|
||||
private Timestamp eventTime;
|
||||
|
||||
@Column(name = "`club_id`",nullable = false)
|
||||
@Column(name = "club_id", nullable = false)
|
||||
@NotNull
|
||||
@ApiModelProperty(value = "clubId")
|
||||
private Long clubId;
|
||||
|
||||
@Column(name = "`public_link`")
|
||||
@Column(name = "public_link")
|
||||
@ApiModelProperty(value = "publicLink", accessMode = ApiModelProperty.AccessMode.READ_ONLY)
|
||||
private String publicLink;
|
||||
|
||||
@NotNull
|
||||
@Column(name = "`sport_id`",nullable = false)
|
||||
@Column(name = "sport_id", nullable = false)
|
||||
@ApiModelProperty(value = "sportId")
|
||||
private Long sportId;
|
||||
|
||||
@Column(name = "`create_by`")
|
||||
@Column(name = "create_by")
|
||||
@ApiModelProperty(value = "createBy")
|
||||
private Long createBy;
|
||||
|
||||
@Column(name = "`status`")
|
||||
@Column(name = "status")
|
||||
@Enumerated(EnumType.STRING)
|
||||
@ApiModelProperty(value = "status")
|
||||
private EventStatus status;
|
||||
|
||||
@Column(name = "`is_public`")
|
||||
@Column(name = "is_public")
|
||||
private boolean isPublic;
|
||||
|
||||
@Column(name = "`allow_wait_list`")
|
||||
@Column(name = "allow_wait_list")
|
||||
private boolean allowWaitList;
|
||||
|
||||
@Column(name = "`current_participants`")
|
||||
@Column(name = "current_participants")
|
||||
@ApiModelProperty(value = "Current number of participants")
|
||||
private Integer currentParticipants = 0;
|
||||
|
||||
@Column(name = "`max_participants`")
|
||||
@Column(name = "max_participants")
|
||||
@ApiModelProperty(value = "Maximum number of participants")
|
||||
private Integer maxParticipants;
|
||||
|
||||
@Column(name = "`poster_image`")
|
||||
@Column(name = "poster_image")
|
||||
private String posterImage;
|
||||
|
||||
@Column(name = "`tags`")
|
||||
@Column(name = "tags")
|
||||
@Convert(converter = StringListConverter.class)
|
||||
private List<String> tags = new ArrayList<>();
|
||||
|
||||
|
|
|
|||
|
|
@ -15,18 +15,19 @@
|
|||
*/
|
||||
package com.srr.domain;
|
||||
|
||||
import lombok.Data;
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import cn.hutool.core.bean.copier.CopyOptions;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.hibernate.annotations.CreationTimestamp;
|
||||
import org.hibernate.annotations.UpdateTimestamp;
|
||||
|
||||
import javax.persistence.*;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import org.hibernate.annotations.*;
|
||||
import java.sql.Timestamp;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.io.Serializable;
|
||||
import java.sql.Timestamp;
|
||||
|
||||
/**
|
||||
* @website https://eladmin.vip
|
||||
|
|
@ -35,52 +36,53 @@ import java.io.Serializable;
|
|||
* @date 2025-05-18
|
||||
**/
|
||||
@Entity
|
||||
@Data
|
||||
@Getter
|
||||
@Setter
|
||||
@Table(name="player")
|
||||
public class Player implements Serializable {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "`id`")
|
||||
@Column(name = "id")
|
||||
@ApiModelProperty(value = "id", hidden = true)
|
||||
private Long id;
|
||||
|
||||
@Column(name = "`name`",nullable = false)
|
||||
@Column(name = "name", nullable = false)
|
||||
@NotBlank
|
||||
@ApiModelProperty(value = "Name")
|
||||
private String name;
|
||||
|
||||
@Column(name = "`description`")
|
||||
@Column(name = "description")
|
||||
@ApiModelProperty(value = "Description")
|
||||
private String description;
|
||||
|
||||
@Column(name = "`latitude`")
|
||||
@Column(name = "latitude")
|
||||
@ApiModelProperty(value = "Latitude")
|
||||
private Double latitude;
|
||||
|
||||
@Column(name = "`longitude`")
|
||||
@Column(name = "longitude")
|
||||
@ApiModelProperty(value = "Longitude")
|
||||
private Double longitude;
|
||||
|
||||
@Column(name = "`profile_image`")
|
||||
@Column(name = "profile_image")
|
||||
@ApiModelProperty(value = "Image")
|
||||
private String profileImage;
|
||||
|
||||
@Column(name = "`create_time`")
|
||||
@Column(name = "create_time")
|
||||
@CreationTimestamp
|
||||
@ApiModelProperty(value = "Creation time", hidden = true)
|
||||
private Timestamp createTime;
|
||||
|
||||
@Column(name = "`update_time`")
|
||||
@Column(name = "update_time")
|
||||
@UpdateTimestamp
|
||||
@ApiModelProperty(value = "Update time", hidden = true)
|
||||
private Timestamp updateTime;
|
||||
|
||||
@Column(name = "`rate_score`")
|
||||
@Column(name = "rate_score")
|
||||
@ApiModelProperty(value = "Score")
|
||||
private Double rateScore;
|
||||
|
||||
@Column(name = "`user_id`",nullable = false)
|
||||
@Column(name = "user_id", nullable = false)
|
||||
@NotNull
|
||||
@ApiModelProperty(value = "userId")
|
||||
private Long userId;
|
||||
|
|
|
|||
|
|
@ -1,12 +1,16 @@
|
|||
package com.srr.domain;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import javax.persistence.*;
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
@Entity
|
||||
@Getter
|
||||
@Setter
|
||||
@Table(name = "team")
|
||||
public class Team implements Serializable {
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@ import java.io.Serializable;
|
|||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "`team_player`")
|
||||
@Table(name = "team_player")
|
||||
public class TeamPlayer implements Serializable {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "`id`")
|
||||
@Column(name = "id")
|
||||
@ApiModelProperty(value = "id", hidden = true)
|
||||
private Long id;
|
||||
|
||||
|
|
@ -22,13 +22,13 @@ public class TeamPlayer implements Serializable {
|
|||
@JoinColumn(name = "team_id")
|
||||
private Team team;
|
||||
|
||||
@Column(name = "`score`")
|
||||
@Column(name = "score")
|
||||
private Double score;
|
||||
|
||||
@ManyToOne
|
||||
@JoinColumn(name = "player_id")
|
||||
private Player player;
|
||||
|
||||
@Column(name = "`is_checked_in`")
|
||||
@Column(name = "is_checked_in")
|
||||
private boolean isCheckedIn;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,4 +25,5 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
|||
* @date 2025-05-25
|
||||
**/
|
||||
public interface TeamPlayerRepository extends JpaRepository<TeamPlayer, Long>, JpaSpecificationExecutor<TeamPlayer> {
|
||||
boolean existsByTeamIdAndPlayerId(Long teamId, Long playerId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,11 @@
|
|||
package com.srr.service.impl;
|
||||
|
||||
import com.srr.domain.Event;
|
||||
import com.srr.domain.Player;
|
||||
import com.srr.domain.Team;
|
||||
import com.srr.domain.TeamPlayer;
|
||||
import com.srr.enumeration.EventStatus;
|
||||
import com.srr.enumeration.Format;
|
||||
import me.zhengjie.exception.EntityNotFoundException;
|
||||
import me.zhengjie.utils.ValidationUtil;
|
||||
import me.zhengjie.utils.FileUtil;
|
||||
|
|
@ -104,7 +108,7 @@ public class EventServiceImpl implements EventService {
|
|||
@Transactional(rollbackFor = Exception.class)
|
||||
public EventDto updateStatus(Long id, EventStatus status) {
|
||||
Event event = eventRepository.findById(id)
|
||||
.orElseThrow(() -> new EntityNotFoundException(Event.class, "id", id));
|
||||
.orElseThrow(() -> new EntityNotFoundException(Event.class, "id", Long.valueOf(id)));
|
||||
|
||||
// Only update the status field
|
||||
event.setStatus(status);
|
||||
|
|
@ -121,7 +125,7 @@ public class EventServiceImpl implements EventService {
|
|||
public EventDto joinEvent(JoinEventDto joinEventDto) {
|
||||
// Find the event
|
||||
Event event = eventRepository.findById(joinEventDto.getEventId())
|
||||
.orElseThrow(() -> new EntityNotFoundException(Event.class, "id", joinEventDto.getEventId()));
|
||||
.orElseThrow(() -> new EntityNotFoundException(Event.class, "id", Long.valueOf(joinEventDto.getEventId())));
|
||||
|
||||
// Check if event allows joining
|
||||
if (event.getStatus() != EventStatus.OPEN) {
|
||||
|
|
@ -143,11 +147,75 @@ public class EventServiceImpl implements EventService {
|
|||
// Handle team-related logic
|
||||
if (joinEventDto.getTeamId() != null) {
|
||||
// Add player to existing team
|
||||
// For implementation, you'd use teamRepository and teamPlayerRepository
|
||||
// to check if team exists and add the player
|
||||
Team team = teamRepository.findById(joinEventDto.getTeamId())
|
||||
.orElseThrow(() -> new EntityNotFoundException(Team.class, "id", Long.valueOf(joinEventDto.getTeamId())));
|
||||
|
||||
// Verify team belongs to this event
|
||||
if (!team.getEvent().getId().equals(event.getId())) {
|
||||
throw new BadRequestException("Team does not belong to this event");
|
||||
}
|
||||
|
||||
// Check if player is already in the team
|
||||
if (teamPlayerRepository.existsByTeamIdAndPlayerId(team.getId(), joinEventDto.getPlayerId())) {
|
||||
throw new BadRequestException("Player is already in this team");
|
||||
}
|
||||
|
||||
// Check if team is full
|
||||
if (team.getTeamSize() == team.getTeamPlayers().size()) {
|
||||
throw new BadRequestException("Team is already full");
|
||||
}
|
||||
|
||||
// Add player to team
|
||||
TeamPlayer teamPlayer = new TeamPlayer();
|
||||
teamPlayer.setTeam(team);
|
||||
Player player = new Player();
|
||||
player.setId(joinEventDto.getPlayerId());
|
||||
teamPlayer.setPlayer(player);
|
||||
teamPlayer.setCheckedIn(false);
|
||||
teamPlayerRepository.save(teamPlayer);
|
||||
} else {
|
||||
// Create new team for the player if needed
|
||||
// or add as individual participant depending on event format
|
||||
// Create new team for the player if needed or add as individual participant
|
||||
if (event.getFormat() == Format.SINGLE) {
|
||||
// For single format, create a "virtual" team with just one player
|
||||
Team team = new Team();
|
||||
team.setEvent(event);
|
||||
team.setName("Player " + joinEventDto.getPlayerId());
|
||||
team.setTeamSize(1);
|
||||
Team savedTeam = teamRepository.save(team);
|
||||
|
||||
// Add player to the team
|
||||
TeamPlayer teamPlayer = new TeamPlayer();
|
||||
teamPlayer.setTeam(savedTeam);
|
||||
Player player = new Player();
|
||||
player.setId(joinEventDto.getPlayerId());
|
||||
teamPlayer.setPlayer(player);
|
||||
teamPlayer.setCheckedIn(false);
|
||||
teamPlayerRepository.save(teamPlayer);
|
||||
} else if (event.getFormat() == Format.DOUBLE || event.getFormat() == Format.TEAM) {
|
||||
// For doubles/team format, create a new team
|
||||
Team team = new Team();
|
||||
team.setEvent(event);
|
||||
team.setName("New Team");
|
||||
|
||||
// Set team size based on format
|
||||
if (event.getFormat() == Format.DOUBLE) {
|
||||
team.setTeamSize(2);
|
||||
} else {
|
||||
// Default team size of 4 for TEAM format, can be adjusted as needed
|
||||
team.setTeamSize(4);
|
||||
}
|
||||
|
||||
Team savedTeam = teamRepository.save(team);
|
||||
|
||||
// Add player as the first member of the team
|
||||
TeamPlayer teamPlayer = new TeamPlayer();
|
||||
teamPlayer.setTeam(savedTeam);
|
||||
Player player = new Player();
|
||||
player.setId(joinEventDto.getPlayerId());
|
||||
teamPlayer.setPlayer(player);
|
||||
teamPlayer.setCheckedIn(false);
|
||||
teamPlayerRepository.save(teamPlayer);
|
||||
}
|
||||
}
|
||||
|
||||
// Update participant count if not joining waitlist
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ public class WaitListServiceImpl implements WaitListService {
|
|||
public WaitListDto create(WaitList resources) {
|
||||
// Validate event exists
|
||||
Event event = eventRepository.findById(resources.getEventId())
|
||||
.orElseThrow(() -> new EntityNotFoundException(Event.class, "id", resources.getEventId()));
|
||||
.orElseThrow(() -> new EntityNotFoundException(Event.class, "id", Long.valueOf(resources.getEventId())));
|
||||
|
||||
// Check if player is already in wait list
|
||||
if (waitListRepository.findByEventIdAndPlayerId(resources.getEventId(), resources.getPlayerId()) != null) {
|
||||
|
|
@ -73,7 +73,7 @@ public class WaitListServiceImpl implements WaitListService {
|
|||
@Transactional
|
||||
public void update(WaitList resources) {
|
||||
WaitList waitList = waitListRepository.findById(resources.getId())
|
||||
.orElseThrow(() -> new EntityNotFoundException(WaitList.class, "id", resources.getId()));
|
||||
.orElseThrow(() -> new EntityNotFoundException(WaitList.class, "id", Long.valueOf(resources.getId())));
|
||||
waitList.copy(resources);
|
||||
waitListRepository.save(waitList);
|
||||
}
|
||||
|
|
@ -93,7 +93,7 @@ public class WaitListServiceImpl implements WaitListService {
|
|||
@Override
|
||||
public WaitListDto findById(Long id) {
|
||||
WaitList waitList = waitListRepository.findById(id)
|
||||
.orElseThrow(() -> new EntityNotFoundException(WaitList.class, "id", id));
|
||||
.orElseThrow(() -> new EntityNotFoundException(WaitList.class, "id", Long.valueOf(id)));
|
||||
return mapToDto(waitList);
|
||||
}
|
||||
|
||||
|
|
@ -101,7 +101,7 @@ public class WaitListServiceImpl implements WaitListService {
|
|||
public List<WaitListDto> findByEventId(Long eventId) {
|
||||
// Validate event exists
|
||||
if (!eventRepository.existsById(eventId)) {
|
||||
throw new EntityNotFoundException(Event.class, "id", eventId);
|
||||
throw new EntityNotFoundException(Event.class, "id", Long.valueOf(eventId));
|
||||
}
|
||||
|
||||
return waitListRepository.findByEventId(eventId).stream()
|
||||
|
|
@ -127,11 +127,11 @@ public class WaitListServiceImpl implements WaitListService {
|
|||
public boolean promoteToParticipant(Long waitListId) {
|
||||
// Find wait list entry
|
||||
WaitList waitList = waitListRepository.findById(waitListId)
|
||||
.orElseThrow(() -> new EntityNotFoundException(WaitList.class, "id", waitListId));
|
||||
.orElseThrow(() -> new EntityNotFoundException(WaitList.class, "id", Long.valueOf(waitListId)));
|
||||
|
||||
// Find event
|
||||
Event event = eventRepository.findById(waitList.getEventId())
|
||||
.orElseThrow(() -> new EntityNotFoundException(Event.class, "id", waitList.getEventId()));
|
||||
.orElseThrow(() -> new EntityNotFoundException(Event.class, "id", Long.valueOf(waitList.getEventId())));
|
||||
|
||||
// Check if event is full
|
||||
if (event.getCurrentParticipants() >= event.getMaxParticipants()) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue