From 63b7aba82a35a3e77bd694701dc087e46713ad43 Mon Sep 17 00:00:00 2001 From: "h.hein" <26-h-kyaw-sakuracommunication@it-college.co.jp> Date: Mon, 19 Oct 2026 13:53:05 +0900 Subject: [PATCH 1/9] Setet one --- .gitignore | 1 + book-rent/.gitattributes | 2 + book-rent/.gitignore | 33 ++ .../.mvn/wrapper/maven-wrapper.properties | 3 + book-rent/mvnw | 295 ++++++++++++++++++ book-rent/mvnw.cmd | 189 +++++++++++ book-rent/pom.xml | 139 +++++++++ .../com/example/demo/BookRentApplication.java | 13 + .../com/example/demo/ServletInitializer.java | 13 + .../src/main/resources/application.properties | 14 + .../demo/BookRentApplicationTests.java | 13 + 11 files changed, 715 insertions(+) create mode 100644 book-rent/.gitattributes create mode 100644 book-rent/.gitignore create mode 100644 book-rent/.mvn/wrapper/maven-wrapper.properties create mode 100644 book-rent/mvnw create mode 100644 book-rent/mvnw.cmd create mode 100644 book-rent/pom.xml create mode 100644 book-rent/src/main/java/com/example/demo/BookRentApplication.java create mode 100644 book-rent/src/main/java/com/example/demo/ServletInitializer.java create mode 100644 book-rent/src/main/resources/application.properties create mode 100644 book-rent/src/test/java/com/example/demo/BookRentApplicationTests.java diff --git a/.gitignore b/.gitignore index 9154f4c..8ea91a8 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ hs_err_pid* replay_pid* +/.metadata/ diff --git a/book-rent/.gitattributes b/book-rent/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/book-rent/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/book-rent/.gitignore b/book-rent/.gitignore new file mode 100644 index 0000000..667aaef --- /dev/null +++ b/book-rent/.gitignore @@ -0,0 +1,33 @@ +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/ diff --git a/book-rent/.mvn/wrapper/maven-wrapper.properties b/book-rent/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..bb58b3c --- /dev/null +++ b/book-rent/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.10.0/apache-maven-3.10.0-bin.zip diff --git a/book-rent/mvnw b/book-rent/mvnw new file mode 100644 index 0000000..bd8896b --- /dev/null +++ b/book-rent/mvnw @@ -0,0 +1,295 @@ +#!/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.4 +# +# 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:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# 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 <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.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${scriptName#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 + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/book-rent/mvnw.cmd b/book-rent/mvnw.cmd new file mode 100644 index 0000000..92450f9 --- /dev/null +++ b/book-rent/mvnw.cmd @@ -0,0 +1,189 @@ +<# : 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.4 +@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 -eq $False) { "/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_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::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 + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -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/book-rent/pom.xml b/book-rent/pom.xml new file mode 100644 index 0000000..8c08431 --- /dev/null +++ b/book-rent/pom.xml @@ -0,0 +1,139 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 4.1.1 + + + com.example + book-rent + 0.0.1-SNAPSHOT + war + book-rent + + + + + + + + + + + + + + + + 21 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-webmvc + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + com.mysql + mysql-connector-j + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-tomcat + provided + + + org.springframework.boot + spring-boot-starter-data-jpa-test + test + + + org.springframework.boot + spring-boot-starter-thymeleaf-test + test + + + org.springframework.boot + spring-boot-starter-validation-test + test + + + org.springframework.boot + spring-boot-starter-webmvc-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + + + default-compile + compile + + compile + + + + + org.projectlombok + lombok + + + + + + default-testCompile + test-compile + + testCompile + + + + + org.projectlombok + lombok + + + + + + + + + + \ No newline at end of file diff --git a/book-rent/src/main/java/com/example/demo/BookRentApplication.java b/book-rent/src/main/java/com/example/demo/BookRentApplication.java new file mode 100644 index 0000000..4bffa3a --- /dev/null +++ b/book-rent/src/main/java/com/example/demo/BookRentApplication.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class BookRentApplication { + + public static void main(String[] args) { + SpringApplication.run(BookRentApplication.class, args); + } + +} diff --git a/book-rent/src/main/java/com/example/demo/ServletInitializer.java b/book-rent/src/main/java/com/example/demo/ServletInitializer.java new file mode 100644 index 0000000..8665a44 --- /dev/null +++ b/book-rent/src/main/java/com/example/demo/ServletInitializer.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; + +public class ServletInitializer extends SpringBootServletInitializer { + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(BookRentApplication.class); + } + +} diff --git a/book-rent/src/main/resources/application.properties b/book-rent/src/main/resources/application.properties new file mode 100644 index 0000000..251b89f --- /dev/null +++ b/book-rent/src/main/resources/application.properties @@ -0,0 +1,14 @@ +spring.application.name=book-rent + +# --- MySQL (CREATE DATABASE.sql \u3067\u4f5c\u6210\u3057\u305f book_manage) --- +spring.datasource.url=jdbc:mysql://localhost:3306/book_manage?serverTimezone=Asia/Tokyo&characterEncoding=UTF-8 +spring.datasource.username=bookuser +spring.datasource.password=Book2026 + +# \u30c6\u30fc\u30d6\u30eb\u306fSQL\u3067\u4f5c\u6210\u6e08\u307f\u3002JPA\u3067\u306f\u5909\u66f4\u3057\u306a\u3044 +spring.jpa.hibernate.ddl-auto=none +spring.jpa.open-in-view=false +spring.jpa.properties.hibernate.jdbc.time_zone=Asia/Tokyo + +spring.thymeleaf.cache=false +server.servlet.session.timeout=30m \ No newline at end of file diff --git a/book-rent/src/test/java/com/example/demo/BookRentApplicationTests.java b/book-rent/src/test/java/com/example/demo/BookRentApplicationTests.java new file mode 100644 index 0000000..06a19da --- /dev/null +++ b/book-rent/src/test/java/com/example/demo/BookRentApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class BookRentApplicationTests { + + @Test + void contextLoads() { + } + +} From 44ed4b3120ecfcef11c1ca73b73aea10cb90c325 Mon Sep 17 00:00:00 2001 From: m-shimizu <26-m-e-stella-tecnica@it-college.jp> Date: Mon, 19 Oct 2026 15:33:39 +0900 Subject: [PATCH 2/9] =?UTF-8?q?FR-01=5F=E4=BF=AE=E6=AD=A3=E3=83=BB?= =?UTF-8?q?=E8=BF=BD=E8=A8=98=E2=91=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/LoginController.java | 34 +++++++++++++++++++ .../src/main/resources/templates/login.html | 15 ++++---- 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/book-rent/src/main/java/com/example/demo/controller/LoginController.java b/book-rent/src/main/java/com/example/demo/controller/LoginController.java index 5880c4f..4f790ca 100644 --- a/book-rent/src/main/java/com/example/demo/controller/LoginController.java +++ b/book-rent/src/main/java/com/example/demo/controller/LoginController.java @@ -1,5 +1,39 @@ +// package宣言（チームの構成に合わせる） package com.example.demo.controller; +import jakarta.validation.Valid; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; + +@Controller public class LoginController { + // ログイン画面表示 + @GetMapping("/login") + public String showLogin(Model model) { + model.addAttribute("loginInfoForm", new LoginInfoForm()); + return "login"; + } + + // ログイン処理 + @PostMapping("/doLogin") + public String doLogin( + @Valid @ModelAttribute("loginInfoForm") + LoginInfoForm form, + BindingResult result) { + + // 入力チェックでエラーがあればログイン画面に戻る + if (result.hasErrors()) { + return "login"; + } + + // ここから社員情報の検索・認証処理を追加する + + return "login"; + } } diff --git a/book-rent/src/main/resources/templates/login.html b/book-rent/src/main/resources/templates/login.html index 6ee30de..44aaf6e 100644 --- a/book-rent/src/main/resources/templates/login.html +++ b/book-rent/src/main/resources/templates/login.html @@ -25,12 +25,15 @@ method="post" th:object="${loginInfoForm}"> - -
- -
+ +
+ +

+

+ +
From 013bb72439ed9c0f6e48c59121317796ea7b07a1 Mon Sep 17 00:00:00 2001 From: m-shimizu <26-m-e-stella-tecnica@it-college.jp> Date: Tue, 20 Oct 2026 09:36:57 +0900 Subject: [PATCH 3/9] =?UTF-8?q?LoginController=5F=E9=80=94=E4=B8=AD?= =?UTF-8?q?=E7=B5=8C=E9=81=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/LoginController.java | 96 ++++++++++++++----- 1 file changed, 72 insertions(+), 24 deletions(-) diff --git a/book-rent/src/main/java/com/example/demo/controller/LoginController.java b/book-rent/src/main/java/com/example/demo/controller/LoginController.java index 4f790ca..d67fcc2 100644 --- a/book-rent/src/main/java/com/example/demo/controller/LoginController.java +++ b/book-rent/src/main/java/com/example/demo/controller/LoginController.java @@ -1,39 +1,87 @@ -// package宣言（チームの構成に合わせる） package com.example.demo.controller; -import jakarta.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.example.demo.common.LoginUser; +import com.example.demo.entity.Employee; +import com.example.demo.repository.EmployeeRepository; @Controller public class LoginController { - // ログイン画面表示 - @GetMapping("/login") - public String showLogin(Model model) { - model.addAttribute("loginInfoForm", new LoginInfoForm()); - return "login"; - } + private final EmployeeRepository employeeRepository; - // ログイン処理 - @PostMapping("/doLogin") - public String doLogin( - @Valid @ModelAttribute("loginInfoForm") - LoginInfoForm form, - BindingResult result) { + public LoginController(EmployeeRepository employeeRepository) { + this.employeeRepository = employeeRepository; + } - // 入力チェックでエラーがあればログイン画面に戻る - if (result.hasErrors()) { - return "login"; - } + // ログイン画面表示 + @GetMapping("/login") + public String showLogin() { + return "login"; + } - // ここから社員情報の検索・認証処理を追加する + // ログイン処理 + @PostMapping("/doLogin") + public String doLogin( + @RequestParam(required = false) String mailAddress, + @RequestParam(required = false) String password, + HttpServletRequest request, + Model model) { - return "login"; - } -} + // 入力チェック + if (mailAddress == null || password == null + || mailAddress.isBlank() || password.isBlank() + || mailAddress.length() > 256 + || !mailAddress.matches( + "^[^\\s@]+@[^\\s@]+\\.[^\\s@]+$")) { + + model.addAttribute("errorMessage", + "メールアドレスとパスワードを正しく入力してください。"); + return "login"; + } + + // 在籍中の社員を検索 + Employee employee = employeeRepository + .findByMailAddressAndFlgRetirement( + mailAddress.trim(), "0") + .orElse(null); + + // 社員情報・パスワードの確認 + if (employee == null + || !password.equals(employee.getPassword())) { + + model.addAttribute("errorMessage", + "メールアドレスまたはパスワードが正しくありません。"); + return "login"; + } + + // 古いセッションがあれば破棄 + HttpSession oldSession = request.getSession(false); + if (oldSession != null) { + oldSession.invalidate(); + } + + // ログイン情報を新しいセッションに保存 + HttpSession newSession = request.getSession(true); + + LoginUser loginUser = new LoginUser( + employee.getIdEmployee(), + employee.getNmEmployee(), + employee.getKnEmployee(), + employee.getMailAddress(), + employee.getFlgAdmin()); + + newSession.setAttribute("loginUser", loginUser); + + // メニュー画面へ遷移 + return "redirect:/menu"; + } +} \ No newline at end of file From 4a01b85ae9487f5980b4091ef5efa1ed89def490 Mon Sep 17 00:00:00 2001 From: m-shimizu <26-m-e-stella-tecnica@it-college.jp> Date: Tue, 20 Oct 2026 10:44:04 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=E5=85=A8=E4=BD=93=E5=8F=8D=E6=98=A0?= =?UTF-8?q?=E3=81=AA=E3=81=97=5FFR-01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- book-rent/pom.xml | 126 +++++++++++++++++- .../demo/controller/MenuController.java | 28 ++-- .../src/main/resources/application.properties | 13 ++ .../src/main/resources/templates/menu.html | 3 +- 4 files changed, 160 insertions(+), 10 deletions(-) diff --git a/book-rent/pom.xml b/book-rent/pom.xml index 139597f..565f780 100644 --- a/book-rent/pom.xml +++ b/book-rent/pom.xml @@ -1,2 +1,126 @@ - + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 4.1.1 + + + com.example + book-rent + 0.0.1-SNAPSHOT + war + book-rent + + + + + + + + + + + + + + + + 21 + + + +org.springframework.boot +spring-boot-starter-data-jpa + + +org.springframework.boot +spring-boot-starter-thymeleaf + + +org.springframework.boot +spring-boot-starter-validation + + + +org.springframework.boot +spring-boot-starter-web + + + +org.springframework.boot +spring-devtools +runtime +true + + +com.mysql +mysql-connector-j +runtime + + +org.projectlombok +lombok +true + + +org.springframework.boot +spring-boot-starter-tomcat +provided + + + +org.springframework.boot +spring-boot-starter-test +test + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + + + default-compile + compile + + compile + + + + + org.projectlombok + lombok + + + + + + default-testCompile + test-compile + + testCompile + + + + + org.projectlombok + lombok + + + + + + + + + + diff --git a/book-rent/src/main/java/com/example/demo/controller/MenuController.java b/book-rent/src/main/java/com/example/demo/controller/MenuController.java index a84e905..d1c373c 100644 --- a/book-rent/src/main/java/com/example/demo/controller/MenuController.java +++ b/book-rent/src/main/java/com/example/demo/controller/MenuController.java @@ -1,19 +1,31 @@ package com.example.demo.controller; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; + import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; @Controller public class MenuController { + // メニュー画面表示 @GetMapping("/menu") - public String showMenu(Model model) { - - // 仮のログインユーザー名 - model.addAttribute("loginUserName", "テストユーザー"); - - // menu.htmlを表示 + public String showMenu() { return "menu"; } -} + + // ログアウト処理 + @PostMapping("/logout") + public String logout(HttpServletRequest request) { + + HttpSession session = request.getSession(false); + + if (session != null) { + session.invalidate(); + } + + return "redirect:/login"; + } +} \ No newline at end of file diff --git a/book-rent/src/main/resources/application.properties b/book-rent/src/main/resources/application.properties index e69de29..93d885f 100644 --- a/book-rent/src/main/resources/application.properties +++ b/book-rent/src/main/resources/application.properties @@ -0,0 +1,13 @@ +spring.application.name=book-rent +# --- MySQL (CREATE DATABASE.sql で作成した book_manage) --- +spring.datasource.url=jdbc:mysql://localhost:3306/book_manage?serverTimezone=Asia/Tokyo&characterEncoding=UTF-8 +spring.datasource.username=bookuser +spring.datasource.password=Book2026 + +# テーブルはSQLで作成済み。JPAでは変更しない +spring.jpa.hibernate.ddl-auto=none +spring.jpa.open-in-view=false +spring.jpa.properties.hibernate.jdbc.time_zone=Asia/Tokyo + +spring.thymeleaf.cache=false +server.servlet.session.timeout=30m diff --git a/book-rent/src/main/resources/templates/menu.html b/book-rent/src/main/resources/templates/menu.html index ff60b1b..e5a6d92 100644 --- a/book-rent/src/main/resources/templates/menu.html +++ b/book-rent/src/main/resources/templates/menu.html @@ -10,7 +10,8 @@
-

メニュー

+

書籍管理システム

+

メニュー

書籍一覧 From c612e9dac314d188514e311c54fda59adb7ea30c Mon Sep 17 00:00:00 2001 From: m-shimizu <26-m-e-stella-tecnica@it-college.jp> Date: Tue, 20 Oct 2026 13:17:15 +0900 Subject: [PATCH 5/9] =?UTF-8?q?FR-01=5F=E5=85=A8=E4=BD=93=E5=8F=8D?= =?UTF-8?q?=E6=98=A0=E3=81=AA=E3=81=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- book-rent/pom.xml | 3 +- .../demo/controller/LoginController.java | 2 +- .../com/example/demo/form/EmployeeForm.java | 103 +++++++++++++----- .../src/main/resources/templates/login.html | 28 +++-- 4 files changed, 92 insertions(+), 44 deletions(-) diff --git a/book-rent/pom.xml b/book-rent/pom.xml index 565f780..606ba8b 100644 --- a/book-rent/pom.xml +++ b/book-rent/pom.xml @@ -51,10 +51,11 @@ org.springframework.boot -spring-devtools +spring-boot-devtools runtime true + com.mysql mysql-connector-j diff --git a/book-rent/src/main/java/com/example/demo/controller/LoginController.java b/book-rent/src/main/java/com/example/demo/controller/LoginController.java index d67fcc2..28d07d8 100644 --- a/book-rent/src/main/java/com/example/demo/controller/LoginController.java +++ b/book-rent/src/main/java/com/example/demo/controller/LoginController.java @@ -23,7 +23,7 @@ public class LoginController { } // ログイン画面表示 - @GetMapping("/login") + @GetMapping("/") public String showLogin() { return "login"; } diff --git a/book-rent/src/main/java/com/example/demo/form/EmployeeForm.java b/book-rent/src/main/java/com/example/demo/form/EmployeeForm.java index edc1561..fde4b39 100644 --- a/book-rent/src/main/java/com/example/demo/form/EmployeeForm.java +++ b/book-rent/src/main/java/com/example/demo/form/EmployeeForm.java @@ -1,33 +1,82 @@ package com.example.demo.form; + /** 社員登録・編集フォーム */ public class EmployeeForm { - private Integer idEmployee; - private String nmEmployee = ""; - private String knEmployee = ""; - private String mailAddress = ""; - private String password = ""; - private String flgAdmin = "0"; - private String flgRetirement = "0"; + private Integer idEmployee; + private String nmEmployee = ""; + private String knEmployee = ""; + private String mailAddress = ""; + private String password = ""; + private String flgAdmin = "0"; + private String flgRetirement = "0"; - public void trim() { - nmEmployee = t(nmEmployee); knEmployee = t(knEmployee); mailAddress = t(mailAddress); - flgAdmin = t(flgAdmin); flgRetirement = t(flgRetirement); - if (password == null) password = ""; - } - private static String t(String s) { return s == null ? "" : s.trim(); } + public void trim() { + nmEmployee = t(nmEmployee); + knEmployee = t(knEmployee); + mailAddress = t(mailAddress); + flgAdmin = t(flgAdmin); + flgRetirement = t(flgRetirement); + if (password == null) + password = ""; + } - public Integer getIdEmployee() { return idEmployee; } - public void setIdEmployee(Integer v) { this.idEmployee = v; } - public String getNmEmployee() { return nmEmployee; } - public void setNmEmployee(String v) { this.nmEmployee = v; } - public String getKnEmployee() { return knEmployee; } - public void setKnEmployee(String v) { this.knEmployee = v; } - public String getMailAddress() { return mailAddress; } - public void setMailAddress(String v) { this.mailAddress = v; } - public String getPassword() { return password; } - public void setPassword(String v) { this.password = v; } - public String getFlgAdmin() { return flgAdmin; } - public void setFlgAdmin(String v) { this.flgAdmin = v; } - public String getFlgRetirement() { return flgRetirement; } - public void setFlgRetirement(String v) { this.flgRetirement = v; } + private static String t(String s) { + return s == null ? "" : s.trim(); + } + + public Integer getIdEmployee() { + return idEmployee; + } + + public void setIdEmployee(Integer v) { + this.idEmployee = v; + } + + public String getNmEmployee() { + return nmEmployee; + } + + public void setNmEmployee(String v) { + this.nmEmployee = v; + } + + public String getKnEmployee() { + return knEmployee; + } + + public void setKnEmployee(String v) { + this.knEmployee = v; + } + + public String getMailAddress() { + return mailAddress; + } + + public void setMailAddress(String v) { + this.mailAddress = v; + } + + public String getPassword() { + return password; + } + + public void setPassword(String v) { + this.password = v; + } + + public String getFlgAdmin() { + return flgAdmin; + } + + public void setFlgAdmin(String v) { + this.flgAdmin = v; + } + + public String getFlgRetirement() { + return flgRetirement; + } + + public void setFlgRetirement(String v) { + this.flgRetirement = v; + } } diff --git a/book-rent/src/main/resources/templates/login.html b/book-rent/src/main/resources/templates/login.html index 44aaf6e..8ad5ebc 100644 --- a/book-rent/src/main/resources/templates/login.html +++ b/book-rent/src/main/resources/templates/login.html @@ -5,12 +5,12 @@ - - + + - - - + + + ログイン @@ -19,21 +19,19 @@
-

ログイン

+

書籍管理システム

+

ログイン

- -
- -

-

- -
+ +
+ +
From 0bf7852ef9ff98c2102940a205f09799985d0919 Mon Sep 17 00:00:00 2001 From: m-shimizu <26-m-e-stella-tecnica@it-college.jp> Date: Tue, 20 Oct 2026 14:25:38 +0900 Subject: [PATCH 6/9] FR-01 --- .../demo/controller/LoginController.java | 103 ++------------ .../demo/controller/MenuController.java | 52 ++++--- .../src/main/resources/templates/login.html | 134 +++--------------- .../src/main/resources/templates/menu.html | 2 +- 4 files changed, 63 insertions(+), 228 deletions(-) diff --git a/book-rent/src/main/java/com/example/demo/controller/LoginController.java b/book-rent/src/main/java/com/example/demo/controller/LoginController.java index 44f2ee2..0423fa5 100644 --- a/book-rent/src/main/java/com/example/demo/controller/LoginController.java +++ b/book-rent/src/main/java/com/example/demo/controller/LoginController.java @@ -1,11 +1,8 @@ package com.example.demo.controller; - -<<<<<<< HEAD -======= - + + import java.util.Optional; ->>>>>>> 81d722be8d9837c5d9bcdfda5182ced23af4c17d import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpSession; @@ -15,102 +12,24 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; -<<<<<<< HEAD -import com.example.demo.common.LoginUser; -import com.example.demo.entity.Employee; -import com.example.demo.repository.EmployeeRepository; - -======= import com.example.demo.common.Const; import com.example.demo.common.LoginUser; import com.example.demo.service.AuthService; - + /** AUTH-01：ログイン／ログアウト（login.html） */ ->>>>>>> 81d722be8d9837c5d9bcdfda5182ced23af4c17d @Controller public class LoginController { private final AuthService authService; - + public LoginController(AuthService authService) { this.authService = authService; } - -<<<<<<< HEAD - private final EmployeeRepository employeeRepository; - - public LoginController(EmployeeRepository employeeRepository) { - this.employeeRepository = employeeRepository; - } - - // ログイン画面表示 - @GetMapping("/") - public String showLogin() { - return "login"; - } - - // ログイン処理 - @PostMapping("/doLogin") - public String doLogin( - @RequestParam(required = false) String mailAddress, - @RequestParam(required = false) String password, - HttpServletRequest request, - Model model) { - - // 入力チェック - if (mailAddress == null || password == null - || mailAddress.isBlank() || password.isBlank() - || mailAddress.length() > 256 - || !mailAddress.matches( - "^[^\\s@]+@[^\\s@]+\\.[^\\s@]+$")) { - - model.addAttribute("errorMessage", - "メールアドレスとパスワードを正しく入力してください。"); - return "login"; - } - - // 在籍中の社員を検索 - Employee employee = employeeRepository - .findByMailAddressAndFlgRetirement( - mailAddress.trim(), "0") - .orElse(null); - - // 社員情報・パスワードの確認 - if (employee == null - || !password.equals(employee.getPassword())) { - - model.addAttribute("errorMessage", - "メールアドレスまたはパスワードが正しくありません。"); - return "login"; - } - - // 古いセッションがあれば破棄 - HttpSession oldSession = request.getSession(false); - if (oldSession != null) { - oldSession.invalidate(); - } - - // ログイン情報を新しいセッションに保存 - HttpSession newSession = request.getSession(true); - - LoginUser loginUser = new LoginUser( - employee.getIdEmployee(), - employee.getNmEmployee(), - employee.getKnEmployee(), - employee.getMailAddress(), - employee.getFlgAdmin()); - - newSession.setAttribute("loginUser", loginUser); - - // メニュー画面へ遷移 - return "redirect:/menu"; - } -} -======= + @GetMapping("/") public String root() { return "redirect:/menu"; } - + @GetMapping("/login") public String loginForm(HttpSession session) { if (session.getAttribute(Const.SESSION_LOGIN_USER) != null) { @@ -118,14 +37,14 @@ public class LoginController { } return "login"; } - + @PostMapping("/login") public String login(@RequestParam(defaultValue = "") String mailAddress, @RequestParam(defaultValue = "") String password, HttpServletRequest request, Model model) { String mail = mailAddress.trim(); model.addAttribute("mailAddress", mail); // 入力値を保持（パスワードは保持しない） - + if (mail.isEmpty() || password.isEmpty()) { model.addAttribute("errorMessage", "メールアドレスとパスワードを入力してください。"); return "login"; @@ -144,12 +63,10 @@ public class LoginController { request.getSession(true).setAttribute(Const.SESSION_LOGIN_USER, user.get()); return "redirect:/menu"; } - + @PostMapping("/logout") public String logout(HttpSession session) { session.invalidate(); return "redirect:/login"; } -} - ->>>>>>> 81d722be8d9837c5d9bcdfda5182ced23af4c17d +} \ No newline at end of file diff --git a/book-rent/src/main/java/com/example/demo/controller/MenuController.java b/book-rent/src/main/java/com/example/demo/controller/MenuController.java index d1c373c..0246994 100644 --- a/book-rent/src/main/java/com/example/demo/controller/MenuController.java +++ b/book-rent/src/main/java/com/example/demo/controller/MenuController.java @@ -1,31 +1,41 @@ package com.example.demo.controller; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpSession; - import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; @Controller public class MenuController { - - // メニュー画面表示 + @GetMapping("/menu") - public String showMenu() { + public String showMenu(Model model) { + + // 仮のログインユーザー名 + model.addAttribute("loginUserName", "テストユーザー"); + + // menu.htmlを表示 return "menu"; } - - // ログアウト処理 - @PostMapping("/logout") - public String logout(HttpServletRequest request) { - - HttpSession session = request.getSession(false); - - if (session != null) { - session.invalidate(); - } - - return "redirect:/login"; - } -} \ No newline at end of file +} +//@Controller +//public class MenuController { +// +// // メニュー画面表示 +// @GetMapping("/menu") +// public String showMenu() { +// return "menu"; +// } +// +// // ログアウト処理 +// @PostMapping("/logout") +// public String logout(HttpServletRequest request) { +// +// HttpSession session = request.getSession(false); +// +// if (session != null) { +// session.invalidate(); +// } +// +// return "redirect:/login"; +// } +//} \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/login.html b/book-rent/src/main/resources/templates/login.html index 236ae1f..26aaa40 100644 --- a/book-rent/src/main/resources/templates/login.html +++ b/book-rent/src/main/resources/templates/login.html @@ -1,103 +1,12 @@ - + -<<<<<<< HEAD - - - - - - - - - - - ログイン - - - - -
- -

書籍管理システム

-

ログイン

- - - - -
- -
- -
- - - - - - - - - - - - - - - - -
メールアドレス - -
パスワード - -
- - - -
- - - - - - - - -======= ログイン - +

書籍貸出管理システム

@@ -114,45 +23,44 @@
->>>>>>> 81d722be8d9837c5d9bcdfda5182ced23af4c17d - + - + - + - + - + - + - + - + - + - + - + - + @@ -167,7 +75,7 @@ - + @@ -181,7 +89,7 @@ - + @@ -189,7 +97,7 @@ - + @@ -198,11 +106,11 @@ - + - + - + @@ -210,6 +118,6 @@ - + \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/menu.html b/book-rent/src/main/resources/templates/menu.html index e5a6d92..4f6fe89 100644 --- a/book-rent/src/main/resources/templates/menu.html +++ b/book-rent/src/main/resources/templates/menu.html @@ -8,7 +8,7 @@ -
+

書籍管理システム

メニュー

From 136b18bfc72e4a4389a73e273cb448b87866f1af Mon Sep 17 00:00:00 2001 From: m-shimizu <26-m-e-stella-tecnica@it-college.jp> Date: Tue, 20 Oct 2026 16:08:03 +0900 Subject: [PATCH 7/9] FR-01 --- .../demo/controller/MenuController.java | 37 +------------------ .../src/main/resources/templates/menu.html | 22 ++--------- 2 files changed, 5 insertions(+), 54 deletions(-) diff --git a/book-rent/src/main/java/com/example/demo/controller/MenuController.java b/book-rent/src/main/java/com/example/demo/controller/MenuController.java index 42012ae..1428bdb 100644 --- a/book-rent/src/main/java/com/example/demo/controller/MenuController.java +++ b/book-rent/src/main/java/com/example/demo/controller/MenuController.java @@ -2,45 +2,12 @@ package com.example.demo.controller; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; - + /** メニュー画面（menu.html）。表示内容は管理者フラグで切り替える。 */ @Controller public class MenuController { -<<<<<<< HEAD - - @GetMapping("/menu") - public String showMenu(Model model) { - - // 仮のログインユーザー名 - model.addAttribute("loginUserName", "テストユーザー"); - - // menu.htmlを表示 -======= @GetMapping("/menu") public String menu() { ->>>>>>> a2a406dd8b1fc59df6056bcb128d62be9c6e1176 return "menu"; } -} -//@Controller -//public class MenuController { -// -// // メニュー画面表示 -// @GetMapping("/menu") -// public String showMenu() { -// return "menu"; -// } -// -// // ログアウト処理 -// @PostMapping("/logout") -// public String logout(HttpServletRequest request) { -// -// HttpSession session = request.getSession(false); -// -// if (session != null) { -// session.invalidate(); -// } -// -// return "redirect:/login"; -// } -//} \ No newline at end of file +} \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/menu.html b/book-rent/src/main/resources/templates/menu.html index 8f09ffb..5ae23e7 100644 --- a/book-rent/src/main/resources/templates/menu.html +++ b/book-rent/src/main/resources/templates/menu.html @@ -6,24 +6,6 @@ -<<<<<<< HEAD - -
-

書籍管理システム

-

メニュー

-
-
- 書籍一覧 - - - 書籍貸出申請一覧 - 貸出中書籍一覧 - 社員登録 - - 社員編集 -
-
-=======

メニュー

@@ -39,6 +21,8 @@ 社員編集
->>>>>>> a2a406dd8b1fc59df6056bcb128d62be9c6e1176 + + + \ No newline at end of file From 45eff1634e977d8764712ac70a3ba673d6e78ee0 Mon Sep 17 00:00:00 2001 From: m-shimizu <26-m-e-stella-tecnica@it-college.jp> Date: Tue, 20 Oct 2026 16:10:15 +0900 Subject: [PATCH 8/9] =?UTF-8?q?FR-09=5F=E5=85=A8=E4=BD=93=E5=8F=8D?= =?UTF-8?q?=E6=98=A0=E3=81=AA=E3=81=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/employeeRegistComplete.html | 44 ++++++++ .../templates/employeeRegistConfrim.html | 95 ++++++++++++++++ .../templates/employeeRegistInput.html | 103 ++++++++++++++++++ 3 files changed, 242 insertions(+) create mode 100644 book-rent/src/main/resources/templates/employeeRegistComplete.html create mode 100644 book-rent/src/main/resources/templates/employeeRegistConfrim.html create mode 100644 book-rent/src/main/resources/templates/employeeRegistInput.html diff --git a/book-rent/src/main/resources/templates/employeeRegistComplete.html b/book-rent/src/main/resources/templates/employeeRegistComplete.html new file mode 100644 index 0000000..4de5730 --- /dev/null +++ b/book-rent/src/main/resources/templates/employeeRegistComplete.html @@ -0,0 +1,44 @@ + + + + + + 社員登録完了画面 + + + + +
+
+
+ +
+
+

社員登録が完了しました。

+
+ メニューに戻る +
+
+ + \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/employeeRegistConfrim.html b/book-rent/src/main/resources/templates/employeeRegistConfrim.html new file mode 100644 index 0000000..1e8dd6e --- /dev/null +++ b/book-rent/src/main/resources/templates/employeeRegistConfrim.html @@ -0,0 +1,95 @@ + + + + + + 社員登録確認画面 + + + + +
+
+
+ +
+
+

社員登録確認

+
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + ******** + +
+
+ + +
+
+ +
+
+
+ 社員情報入力に戻る +
+
+ + diff --git a/book-rent/src/main/resources/templates/employeeRegistInput.html b/book-rent/src/main/resources/templates/employeeRegistInput.html new file mode 100644 index 0000000..635bf26 --- /dev/null +++ b/book-rent/src/main/resources/templates/employeeRegistInput.html @@ -0,0 +1,103 @@ + + + + + + 社員登録入力画面 + + + + +
+ +
+
+ +
+
+

社員登録

+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +
+ +
+ +
+
+ +
+ メニューへ戻る +
+
+ + \ No newline at end of file From 7d5d038a9e267461780e2ac29afdbc2944879d5e Mon Sep 17 00:00:00 2001 From: m-shimizu <26-m-e-stella-tecnica@it-college.jp> Date: Wed, 21 Oct 2026 14:27:40 +0900 Subject: [PATCH 9/9] FR-09 --- .../templates/employeeRegistComplete.html | 40 ++---- .../templates/employeeRegistConfirm.html | 79 +++++++++++ .../templates/employeeRegistConfrim.html | 95 ------------- .../templates/employeeRegistInput.html | 126 +++++++----------- 4 files changed, 133 insertions(+), 207 deletions(-) create mode 100644 book-rent/src/main/resources/templates/employeeRegistConfirm.html delete mode 100644 book-rent/src/main/resources/templates/employeeRegistConfrim.html diff --git a/book-rent/src/main/resources/templates/employeeRegistComplete.html b/book-rent/src/main/resources/templates/employeeRegistComplete.html index 4de5730..ac13d6c 100644 --- a/book-rent/src/main/resources/templates/employeeRegistComplete.html +++ b/book-rent/src/main/resources/templates/employeeRegistComplete.html @@ -4,41 +4,17 @@ 社員登録完了画面 - - + + +
-
-
- -
-
-

社員登録が完了しました。

-
- メニューに戻る -
+

社員登録完了

+

+ 社員登録が完了しました。 +

+ メニューへ戻る
\ No newline at end of file diff --git a/book-rent/src/main/resources/templates/employeeRegistConfirm.html b/book-rent/src/main/resources/templates/employeeRegistConfirm.html new file mode 100644 index 0000000..865f6c6 --- /dev/null +++ b/book-rent/src/main/resources/templates/employeeRegistConfirm.html @@ -0,0 +1,79 @@ + + + + + + 社員登録確認画面 + + + + +
+
+

社員登録確認

+ +
+

+

+
+
+

以下の内容で登録します。内容を確認してください。

+ +
+ + + + + + + + + + + + + + + + + + + + + +
社員名
社員名よみ
メールアドレス
パスワード********
権限
+ + + + + + +
+ +
+
+ +
+ + + + + +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/book-rent/src/main/resources/templates/employeeRegistConfrim.html b/book-rent/src/main/resources/templates/employeeRegistConfrim.html deleted file mode 100644 index 1e8dd6e..0000000 --- a/book-rent/src/main/resources/templates/employeeRegistConfrim.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - 社員登録確認画面 - - - - -
-
-
- -
-
-

社員登録確認

-
-
- - - -
-
- - - -
-
- - - -
-
- - ******** - -
-
- - -
-
- -
-
-
- 社員情報入力に戻る -
-
- - diff --git a/book-rent/src/main/resources/templates/employeeRegistInput.html b/book-rent/src/main/resources/templates/employeeRegistInput.html index 635bf26..d59be27 100644 --- a/book-rent/src/main/resources/templates/employeeRegistInput.html +++ b/book-rent/src/main/resources/templates/employeeRegistInput.html @@ -3,101 +3,67 @@ - 社員登録入力画面 - - + 社員登録画面 + -
- -
-
- -
-
+ +
+ +

社員登録

- -
-
+ +
+

+

+
+ +
- +
-
+
- +
-
+
- +
-
+
- +
- -
+
+ 権限 + - -
- -
- -
+ + - -
- メニューへ戻る -
+ メニューへ戻る
\ No newline at end of file