diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..07e72e7 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..6c094e1 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..786e160 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c5ad60c --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/remote-targets.xml b/.idea/remote-targets.xml new file mode 100644 index 0000000..bdce3f4 --- /dev/null +++ b/.idea/remote-targets.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 2744b69..82ef71f 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,14 @@ # 4team_final_MainSpring + spring 메인 레포 + +전승민 registerPage branch v0.1.1 + +changes + +1. delete demo files ( demo, java, src) + +2. delete useless dir ( temp) + +3. created new project (main-Login) +> login page, register page diff --git a/main-Login/.gitignore b/main-Login/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/main-Login/.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/main-Login/.mvn/wrapper/maven-wrapper.jar b/main-Login/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..cb28b0e Binary files /dev/null and b/main-Login/.mvn/wrapper/maven-wrapper.jar differ diff --git a/main-Login/.mvn/wrapper/maven-wrapper.properties b/main-Login/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..5f0536e --- /dev/null +++ b/main-Login/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/main-Login/mvnw b/main-Login/mvnw new file mode 100644 index 0000000..66df285 --- /dev/null +++ b/main-Login/mvnw @@ -0,0 +1,308 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "$(uname)" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && + JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="$(which javac)" + if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=$(which readlink) + if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then + if $darwin ; then + javaHome="$(dirname "\"$javaExecutable\"")" + javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" + else + javaExecutable="$(readlink -f "\"$javaExecutable\"")" + fi + javaHome="$(dirname "\"$javaExecutable\"")" + javaHome=$(expr "$javaHome" : '\(.*\)/bin') + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=$(cd "$wdir/.." || exit 1; pwd) + fi + # end of workaround + done + printf '%s' "$(cd "$basedir" || exit 1; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' < "$1" + fi +} + +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" +else + log "Couldn't find $wrapperJarPath, downloading it ..." + + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; + esac + done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget > /dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + esac +done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + elif command -v shasum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + exit 1 + fi + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi +fi + +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +# shellcheck disable=SC2086 # safe args +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/main-Login/mvnw.cmd b/main-Login/mvnw.cmd new file mode 100644 index 0000000..95ba6f5 --- /dev/null +++ b/main-Login/mvnw.cmd @@ -0,0 +1,205 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.2.0 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/main-Login/pom.xml b/main-Login/pom.xml new file mode 100644 index 0000000..ee98e4e --- /dev/null +++ b/main-Login/pom.xml @@ -0,0 +1,113 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.2.3 + + + main.spring.login + main-Login + 0.0.1-SNAPSHOT + main-Login + main-Login + + 17 + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + org.springframework.boot + spring-boot-starter-security + 3.2.3 + + + + + io.jsonwebtoken + jjwt-api + 0.11.2 + + + + + io.jsonwebtoken + jjwt-impl + 0.11.2 + runtime + + + + + + io.jsonwebtoken + jjwt-jackson + 0.11.2 + runtime + + + + + + org.projectlombok + lombok + 1.18.30 + provided + + + + + org.springframework.boot + spring-boot-starter-data-jpa + 3.2.3 + + + + + org.springframework.boot + spring-boot-starter-jdbc + 3.2.4 + + + + + org.mariadb.jdbc + mariadb-java-client + 3.3.3 + + + + + org.springframework.boot + spring-boot-starter-thymeleaf + 3.1.2 + + + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/main-Login/src/main/java/main/spring/login/MainLoginApplication.java b/main-Login/src/main/java/main/spring/login/MainLoginApplication.java new file mode 100644 index 0000000..e64eb7c --- /dev/null +++ b/main-Login/src/main/java/main/spring/login/MainLoginApplication.java @@ -0,0 +1,14 @@ +package main.spring.login; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; + +@SpringBootApplication(exclude = SecurityAutoConfiguration.class) +public class MainLoginApplication { + + public static void main(String[] args) { + SpringApplication.run(MainLoginApplication.class, args); + } + +} diff --git a/main-Login/src/main/java/main/spring/login/config/SpringSecurityConfig.java b/main-Login/src/main/java/main/spring/login/config/SpringSecurityConfig.java new file mode 100644 index 0000000..61759f6 --- /dev/null +++ b/main-Login/src/main/java/main/spring/login/config/SpringSecurityConfig.java @@ -0,0 +1,75 @@ +package main.spring.login.config; + +import lombok.RequiredArgsConstructor; +import main.spring.login.jwt.JwtAuthFilter; +import main.spring.login.jwt.JwtUtil; +import main.spring.login.security.UserRoleEnum; +import org.springframework.boot.autoconfigure.security.servlet.PathRequest; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpMethod; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + + +@Configuration +@EnableWebSecurity +@RequiredArgsConstructor +public class SpringSecurityConfig { + + private final JwtUtil jwtUtil; + + @Bean + public PasswordEncoder passwordEncoder() + { + return new BCryptPasswordEncoder(); + } + @Bean + public WebSecurityCustomizer webSecurityCustomizer(){ + // resources 자원 접근 허용 + return (web) -> web.ignoring().requestMatchers(PathRequest.toStaticResources().atCommonLocations()); + + + } + + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + + http.csrf(AbstractHttpConfigurer::disable); + http.sessionManagement(sessionManagement ->sessionManagement.sessionCreationPolicy(SessionCreationPolicy.STATELESS)); + + + + // url mapping + http.authorizeHttpRequests(authorize -> + authorize + .requestMatchers(HttpMethod.GET, "/signup").permitAll() + .requestMatchers(HttpMethod.GET, "/login").permitAll() + .requestMatchers(HttpMethod.POST, "/api/signup").permitAll() + .requestMatchers(HttpMethod.POST, "/api/login").permitAll() + .requestMatchers("/cookie/test").permitAll() + .requestMatchers("/vip").hasRole(UserRoleEnum.VIP_MEMBER.toString()) + .requestMatchers("/admin").hasRole(UserRoleEnum.ADMIN.toString()) + .anyRequest().authenticated() + ).addFilterBefore(new JwtAuthFilter(jwtUtil), UsernamePasswordAuthenticationFilter.class); + + + + http.formLogin(formLogin-> formLogin.loginPage("/login")); + + http.exceptionHandling(exceptionHandling-> exceptionHandling + .accessDeniedPage("/forbidden")); + + return http.build(); + + } +} diff --git a/main-Login/src/main/java/main/spring/login/controller/MemberController.java b/main-Login/src/main/java/main/spring/login/controller/MemberController.java new file mode 100644 index 0000000..327662f --- /dev/null +++ b/main-Login/src/main/java/main/spring/login/controller/MemberController.java @@ -0,0 +1,151 @@ +package main.spring.login.controller; + + +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.extern.slf4j.Slf4j; +import main.spring.login.dto.LoginRequestDto; +import main.spring.login.dto.SignUpRequestDto; +import main.spring.login.security.UserDetailsImpl; +import main.spring.login.service.MemberService; +import org.springframework.boot.Banner; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.CookieValue; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; + +@Slf4j +@Controller +@RestController +public class MemberController { + + private final MemberService memberService; + + + public MemberController(MemberService memberService) + { + this.memberService = memberService; + } + + //이미 로그인된 사용자일 경우 인덱스 페이지로 강제이동 + @GetMapping("/index") + public String index(){ + return "index"; + } + + + @GetMapping("/login") + public ModelAndView login(@AuthenticationPrincipal UserDetailsImpl userDetails) + { + ModelAndView modelAndView = new ModelAndView(); + + + if(userDetails != null) + { + log.info(userDetails.getMember().getMemberName() + "님이 로그인 페이지로 이동을 시도했습니다. -> index 페이지로 강제 이동시켰습니다."); + modelAndView.setViewName("index.html"); + return modelAndView; + } + modelAndView.setViewName("login.html"); + return modelAndView; + } + +// rest api test 후 원복 예정 +// @GetMapping("/login") +// public String login(@AuthenticationPrincipal UserDetailsImpl userDetails) +// { +// if(userDetails != null) +// { +// log.info(userDetails.getMember().getMemberName() + "님이 로그인 페이지로 이동을 시도했습니다. -> index 페이지로 강제 이동시켰습니다."); +// return "redirect:/index"; +// } +// +// return "login"; +// } + + @GetMapping("/signup") + public String signUp() + { + return "signUp"; + } + + @GetMapping("/vip") + public String vip(HttpServletRequest request){ + return "role"; + } + + @GetMapping("/admin") + public String system(HttpServletRequest request) + { + return "role"; + } + + //회원가입 + @PostMapping("/api/signup") + public String signUp(SignUpRequestDto requestDto) + { + memberService.signUp(requestDto); + return "redirect:/login"; + } + + // 로그인 + + @PostMapping("/api/login") + public ModelAndView login(LoginRequestDto requestDto, HttpServletResponse response) { + memberService.login(requestDto, response); + + ModelAndView modelAndView =new ModelAndView(); + modelAndView.setViewName("index.html"); + return modelAndView; + // return "redirect:/index"; + } + + // restcontroller test 후 다시 사용 +// @PostMapping("/api/login") +// public String login(LoginRequestDto requestDto, HttpServletResponse response) +// { +// memberService.login(requestDto, response); +// return "redirect:/index"; +// } + + @GetMapping("/cookie/test") + public String test(@CookieValue(value= "Authorization", defaultValue="", required = false) String test){ + log.info(test); + return "index"; + + } + + + @GetMapping("/forbidden") + public String forbidden(){ + + log.warn("비정상적인 접근: 403 forbidden"); + return "redirect:/index"; + } + + + // 로그아웃 + + @GetMapping("/api/logout") + public String logout(@CookieValue(value= "Authorization", defaultValue = "", required = false)Cookie jwtCookie, + HttpServletResponse response) + { + jwtCookie.setValue(null); + jwtCookie.setMaxAge(0); + jwtCookie.setPath("/"); + response.addCookie(jwtCookie); + + return "redirect:/login"; + } + + + + +} + + diff --git a/main-Login/src/main/java/main/spring/login/controller/MemberRestController.java b/main-Login/src/main/java/main/spring/login/controller/MemberRestController.java new file mode 100644 index 0000000..c823b4c --- /dev/null +++ b/main-Login/src/main/java/main/spring/login/controller/MemberRestController.java @@ -0,0 +1,4 @@ +package main.spring.login.controller; + +public class MemberRestController { +} diff --git a/main-Login/src/main/java/main/spring/login/dto/LoginRequestDto.java b/main-Login/src/main/java/main/spring/login/dto/LoginRequestDto.java new file mode 100644 index 0000000..1336da9 --- /dev/null +++ b/main-Login/src/main/java/main/spring/login/dto/LoginRequestDto.java @@ -0,0 +1,14 @@ +package main.spring.login.dto; + + +import lombok.Getter; +import lombok.Setter; +import org.springframework.stereotype.Service; + +@Getter +@Setter +public class LoginRequestDto { + +private String memberName; +private String password; +} diff --git a/main-Login/src/main/java/main/spring/login/dto/SignUpRequestDto.java b/main-Login/src/main/java/main/spring/login/dto/SignUpRequestDto.java new file mode 100644 index 0000000..1cfefbe --- /dev/null +++ b/main-Login/src/main/java/main/spring/login/dto/SignUpRequestDto.java @@ -0,0 +1,16 @@ +package main.spring.login.dto; + + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class SignUpRequestDto { + + private String memberName; + private String password; + private String role; + + +} diff --git a/main-Login/src/main/java/main/spring/login/entity/Member.java b/main-Login/src/main/java/main/spring/login/entity/Member.java new file mode 100644 index 0000000..f7856c3 --- /dev/null +++ b/main-Login/src/main/java/main/spring/login/entity/Member.java @@ -0,0 +1,44 @@ +package main.spring.login.entity; + + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.NoArgsConstructor; +import main.spring.login.security.UserRoleEnum; + + +@Getter +@NoArgsConstructor +@Entity +public class Member { + + //기업 아이디 String + //기업 이름 String + // 패스워드 String + // 사업자 번호 long + // 기업 홈페이지 링크 String + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long Id; + + @Column(nullable = false, unique = true) + private String memberName; + + @Column(nullable = false) + private String password; + + @Column(nullable = false) + @Enumerated(value = EnumType.STRING) + private UserRoleEnum role; + + public Member(String memberName, String password, UserRoleEnum role){ + this.memberName = memberName; + this.password = password; + this.role = role; + + } + + + +} diff --git a/main-Login/src/main/java/main/spring/login/jwt/JwtAuthFilter.java b/main-Login/src/main/java/main/spring/login/jwt/JwtAuthFilter.java new file mode 100644 index 0000000..cfa69a8 --- /dev/null +++ b/main-Login/src/main/java/main/spring/login/jwt/JwtAuthFilter.java @@ -0,0 +1,50 @@ +package main.spring.login.jwt; + + +import io.jsonwebtoken.Claims; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContext; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +@Slf4j +@RequiredArgsConstructor +public class JwtAuthFilter extends OncePerRequestFilter { + + private final JwtUtil jwtUtil; + + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { + + String token = jwtUtil.resolveToken(request); + + if (token != null){ + if(!jwtUtil.validateToken(token)) + { + log.warn("JWT Token 인증 실패"); + throw new IllegalArgumentException("JWT Token 인증 실패"); + } + Claims info = jwtUtil.getUserInfoFromToken(token); + setAuthentication(info.getSubject()); + } + filterChain.doFilter(request, response); + } + + public void setAuthentication(String username){ + + SecurityContext context = SecurityContextHolder.createEmptyContext(); + Authentication authentication = jwtUtil.createAuthentication(username); + context.setAuthentication(authentication); + + SecurityContextHolder.setContext(context); + } +} diff --git a/main-Login/src/main/java/main/spring/login/jwt/JwtUtil.java b/main-Login/src/main/java/main/spring/login/jwt/JwtUtil.java new file mode 100644 index 0000000..abf4832 --- /dev/null +++ b/main-Login/src/main/java/main/spring/login/jwt/JwtUtil.java @@ -0,0 +1,121 @@ +package main.spring.login.jwt; + + +import io.jsonwebtoken.*; +import io.jsonwebtoken.security.Keys; +import io.jsonwebtoken.security.SecurityException; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import main.spring.login.security.UserDetailsServiceImpl; +import main.spring.login.security.UserRoleEnum; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; + +import java.security.Key; +import java.util.Base64; +import java.util.Date; + +@Slf4j +@Component +@RequiredArgsConstructor + +public class JwtUtil { + + public static final String AUTHORIZATION_HEADER = "Authorization"; + public static final String AUTHORIZATION_KEY = "auth"; + private static final String BEARER_PREFIX = "Bearer="; + private static final long TOKEN_TIME=60*60*1000L; + + + private final UserDetailsServiceImpl userDetailsService; + + + @Value("${jwt.secret.key}") + private String secretKey; + private Key key; + private static final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithm.HS256; + + + @PostConstruct + public void init(){ + byte[] bytes = Base64.getDecoder().decode(secretKey); + key = Keys.hmacShaKeyFor(bytes); + } + + + public String resolveToken(HttpServletRequest request) { + String bearerToken = request.getHeader(AUTHORIZATION_HEADER); + + if (bearerToken == null) { + + Cookie[] cookies = request.getCookies(); + + if (cookies != null) { + for (Cookie c : cookies) { + String name = c.getName(); + String value = c.getValue(); + + if (name.equals(AUTHORIZATION_HEADER)) { + bearerToken = value; + } + + } + } + } + + if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(BEARER_PREFIX)) { + return bearerToken.substring(7); + } + return null; + } + public String createToken(String username, UserRoleEnum role ){ + Date date = new Date(); + + return BEARER_PREFIX + + Jwts.builder() + .setSubject(username) + .claim(AUTHORIZATION_KEY, role) + .setExpiration(new Date(date.getTime() + TOKEN_TIME)) + .setIssuedAt(date) + .signWith(key, signatureAlgorithm) + .compact(); + } + + public boolean validateToken(String token){ + try { + Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token); + return true; + } catch (SecurityException | MalformedJwtException e) { + log.info("Invalid JWT signature, 유효하지 않은 JWT 서명 입니다."); + } catch (ExpiredJwtException e) { + log.info("Expired JWT token, 만료된 JWT token 입니다."); + + } catch (UnsupportedJwtException e) { + log.info("Unsupported JWT token, 지원되지 않는 JWT 토큰입니다."); + + } catch (IllegalArgumentException e) { + log.info("JWT claims is empty, 잘못된 JWT 토큰입니다."); + } + return false; + } + + public Claims getUserInfoFromToken(String token) + { + return Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token).getBody(); + } + + public Authentication createAuthentication(String username) + { + UserDetails userDetails = userDetailsService.loadUserByUsername(username); + return new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); + } + } + + diff --git a/main-Login/src/main/java/main/spring/login/repository/MemberRepository.java b/main-Login/src/main/java/main/spring/login/repository/MemberRepository.java new file mode 100644 index 0000000..de63fc2 --- /dev/null +++ b/main-Login/src/main/java/main/spring/login/repository/MemberRepository.java @@ -0,0 +1,16 @@ +package main.spring.login.repository; + +import main.spring.login.entity.Member; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface MemberRepository extends JpaRepository { + + Optional findByMemberName(String memberName); + + + +} diff --git a/main-Login/src/main/java/main/spring/login/security/UserDetailsImpl.java b/main-Login/src/main/java/main/spring/login/security/UserDetailsImpl.java new file mode 100644 index 0000000..d68a46f --- /dev/null +++ b/main-Login/src/main/java/main/spring/login/security/UserDetailsImpl.java @@ -0,0 +1,81 @@ +package main.spring.login.security; + + +import lombok.extern.slf4j.Slf4j; +import main.spring.login.entity.Member; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import java.io.Serial; +import java.util.ArrayList; +import java.util.Collection; + +@Slf4j +public class UserDetailsImpl implements UserDetails { + + @Serial + private static final long serialVersionUID = 8256235982535387011L; + private final Member member; + private final String password; + private final String username; + + public UserDetailsImpl(Member member, String password, String username){ + + this.member = member; + this.password = password; + this.username = username; + + } + + public Member getMember(){ + return this.member; + + + } + + + @Override + public Collection getAuthorities() { + UserRoleEnum role = member.getRole(); + String authority = role.getAuthority(); + + SimpleGrantedAuthority simpleGrantedAuthority = new SimpleGrantedAuthority(authority); + Collection authorities = new ArrayList<>(); + authorities.add(simpleGrantedAuthority); + + return authorities; + + + } + + @Override + public String getPassword() { + return this.password; + } + + @Override + public String getUsername() { + return this.username; + } + + @Override + public boolean isAccountNonExpired() { + return true; + } + + @Override + public boolean isAccountNonLocked() { + return true; + } + + @Override + public boolean isCredentialsNonExpired() { + return true; + } + + @Override + public boolean isEnabled() { + return true; + } +} diff --git a/main-Login/src/main/java/main/spring/login/security/UserDetailsServiceImpl.java b/main-Login/src/main/java/main/spring/login/security/UserDetailsServiceImpl.java new file mode 100644 index 0000000..6ccad58 --- /dev/null +++ b/main-Login/src/main/java/main/spring/login/security/UserDetailsServiceImpl.java @@ -0,0 +1,28 @@ +package main.spring.login.security; + + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import main.spring.login.entity.Member; +import main.spring.login.repository.MemberRepository; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; + +@Service +@Slf4j +@RequiredArgsConstructor +public class UserDetailsServiceImpl implements UserDetailsService { + + private final MemberRepository memberRepository; + @Override + public UserDetails loadUserByUsername(String memberName) throws UsernameNotFoundException { + Member member = memberRepository.findByMemberName(memberName) + .orElseThrow(()->new UsernameNotFoundException("사용자를 찾을 수 없습니다.")); + + + return new UserDetailsImpl(member, member.getPassword(), member.getMemberName()); + } + +} diff --git a/main-Login/src/main/java/main/spring/login/security/UserRoleEnum.java b/main-Login/src/main/java/main/spring/login/security/UserRoleEnum.java new file mode 100644 index 0000000..3c0cb5c --- /dev/null +++ b/main-Login/src/main/java/main/spring/login/security/UserRoleEnum.java @@ -0,0 +1,42 @@ +package main.spring.login.security; + +public enum UserRoleEnum { + + MEMBER(Authority.MEMBER), + PRIVATE_MEMBER(Authority.PRIVATE_MEMBER), + VIP_MEMBER(Authority.VIP_MEMBER), + ADMIN(Authority.ADMIN); + + private final String authority; + + UserRoleEnum(String authority){ + this.authority = authority; + } + + public String getAuthority(){ + return this.authority; + } + + public static class Authority{ + public static final String MEMBER = "ROLE_MEMBER"; + public static final String PRIVATE_MEMBER = "ROLE_PRIVATE_MEMBER"; + public static final String VIP_MEMBER = "ROLE_VIP_MEMBER"; + public static final String ADMIN = "ROLE_ADMIN"; + + } + + public static UserRoleEnum fromString(String role){ + switch (role){ + case "ROLE_MEMBER": + return MEMBER; + case "ROLE_PRIVATE_MEMBER": + return PRIVATE_MEMBER; + case "ROLE_VIP_MEMBER": + return VIP_MEMBER; + case "ROLE_ADMIN": + return ADMIN; + + } + return null; + } +} diff --git a/main-Login/src/main/java/main/spring/login/service/MemberService.java b/main-Login/src/main/java/main/spring/login/service/MemberService.java new file mode 100644 index 0000000..096d3ce --- /dev/null +++ b/main-Login/src/main/java/main/spring/login/service/MemberService.java @@ -0,0 +1,77 @@ +package main.spring.login.service; + + +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import main.spring.login.dto.LoginRequestDto; +import main.spring.login.dto.SignUpRequestDto; +import main.spring.login.entity.Member; +import main.spring.login.jwt.JwtUtil; +import main.spring.login.repository.MemberRepository; +import main.spring.login.security.UserRoleEnum; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +@Slf4j +@RequiredArgsConstructor +public class MemberService { + + + private final MemberRepository memberRepository; + private final JwtUtil jwtUtil; + private final PasswordEncoder passwordEncoder; + + // 회원 가입 + @Transactional + public void signUp(SignUpRequestDto requestDto){ + + String memberName = requestDto.getMemberName(); + String password = passwordEncoder.encode(requestDto.getPassword()); + UserRoleEnum role =UserRoleEnum.valueOf(requestDto.getRole()); + + Member member = new Member(memberName, password, role); + memberRepository.save(member); + } + + @Transactional + public void login(LoginRequestDto requestDto, HttpServletResponse response) + { + Optional optionalMember = memberRepository.findByMemberName(requestDto.getMemberName()); + + if(optionalMember.isEmpty()) + { + log.warn("회원이 존재하지 않습니다."); + throw new IllegalArgumentException("회원이 존재하지 않습니다."); + } + + Member member = optionalMember.get(); + + if(!passwordEncoder.matches(requestDto.getPassword(), member.getPassword())) + { + log.warn("비밀번호가 일치하지 않습니다."); + throw new IllegalArgumentException("비밀번호가 일치하지 않습니다."); + } + + Cookie cookie = new Cookie(JwtUtil.AUTHORIZATION_HEADER, + jwtUtil.createToken(member.getMemberName(), member.getRole())); + + cookie.setMaxAge(7*24*60*60); + cookie.setPath("/"); + cookie.setDomain("localhost"); + cookie.setSecure(false); + + response.addCookie(cookie); + + + } + + +} + + diff --git a/main-Login/src/main/resources/application.properties b/main-Login/src/main/resources/application.properties new file mode 100644 index 0000000..25c14fa --- /dev/null +++ b/main-Login/src/main/resources/application.properties @@ -0,0 +1,10 @@ +spring.application.name=main-Login +spring.datasource.driver-class-name=org.mariadb.jdbc.Driver +spring.datasource.url=jdbc:mariadb://3.35.197.144:3306/users +spring.datasource.username=root +spring.datasource.password=1234 +spring.jpa.show-sql=true +#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDBDialect +spring.jpa.hibernate.ddl-auto=update +#server.port=8080 +jwt.secret.key=a42ceee07d2e44c8f05be9518836e4d48aa7d33a96732acf9e28be74a7a46746 diff --git a/main-Login/src/main/resources/templates/index.html b/main-Login/src/main/resources/templates/index.html new file mode 100644 index 0000000..e94673b --- /dev/null +++ b/main-Login/src/main/resources/templates/index.html @@ -0,0 +1,15 @@ + + + + + Title + + +

로그인 성공

+ + + + + + + \ No newline at end of file diff --git a/main-Login/src/main/resources/templates/login.html b/main-Login/src/main/resources/templates/login.html new file mode 100644 index 0000000..39631c9 --- /dev/null +++ b/main-Login/src/main/resources/templates/login.html @@ -0,0 +1,69 @@ + + + + + Title + + + + + +
+
Login
+
+
MemberName
+ + + + +
Password
+ + + +
+
+ + \ No newline at end of file diff --git a/main-Login/src/main/resources/templates/role.html b/main-Login/src/main/resources/templates/role.html new file mode 100644 index 0000000..33d7e99 --- /dev/null +++ b/main-Login/src/main/resources/templates/role.html @@ -0,0 +1,55 @@ + + + + + Title + + + +
+ ADMIN 님 안녕하세요. +
+ + +
+ VIP_MEMBER 님 안녕하세요. +
+ + +
+ 소유한 권한들 : +
+ + +

인증된 사람만 이 글을 볼 수 있습니다.

+ +
+ name : +
+ + +
+ principal.username : +
+ +
+ principal.password : +
+ +
+ principal.enabled : +
+ +
+ principal.accountNonLocked : +
+ +
+ principal.accountNonExpired : +
+ +
+ principal.credentialsNonExpired : +
+ + \ No newline at end of file diff --git a/main-Login/src/main/resources/templates/signUp.html b/main-Login/src/main/resources/templates/signUp.html new file mode 100644 index 0000000..82df29a --- /dev/null +++ b/main-Login/src/main/resources/templates/signUp.html @@ -0,0 +1,49 @@ + + + + + Title + + + + + + +
+
SignUp
+ +
+
MemberName
+ + +
Password
+ + + 멤버 + 프라이빗 멤버 + VIP + 관리자 + + +
+ +
+ + + \ No newline at end of file diff --git a/main-Login/src/test/java/main/spring/login/mainlogin/MainLoginApplicationTests.java b/main-Login/src/test/java/main/spring/login/mainlogin/MainLoginApplicationTests.java new file mode 100644 index 0000000..5f71fbc --- /dev/null +++ b/main-Login/src/test/java/main/spring/login/mainlogin/MainLoginApplicationTests.java @@ -0,0 +1,13 @@ +package main.spring.login.mainlogin; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class MainLoginApplicationTests { + + @Test + void contextLoads() { + } + +}