From bd92695db3105c0df70dd5edf8ab96fc55cfeccf Mon Sep 17 00:00:00 2001 From: SeoJimin1234 <113419021+SeoJimin1234@users.noreply.github.com> Date: Tue, 7 Jan 2025 16:23:05 +0900 Subject: [PATCH 01/19] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 22 ++++++++++++++++++++ .github/ISSUE_TEMPLATE/etc-issue-template.md | 10 +++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/etc-issue-template.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..9f2b3ff --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,22 @@ +--- +name: Bug report +about: 버그 리포트 이슈 +title: '' +labels: '' +assignees: '' + +--- + +## 어떤 버그인가요? + +> 어떤 버그인지 간결하게 설명해주세요 + +## 어떤 상황에서 발생한 버그인가요? + +> (가능하면) Given-When-Then 형식으로 서술해주세요 + +## 예상 결과 + +> 예상했던 정상적인 결과가 어떤 것이었는지 설명해주세요 + +## 참고할만한 자료(선택) diff --git a/.github/ISSUE_TEMPLATE/etc-issue-template.md b/.github/ISSUE_TEMPLATE/etc-issue-template.md new file mode 100644 index 0000000..af77cb7 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/etc-issue-template.md @@ -0,0 +1,10 @@ +--- +name: ETC Issue Template +about: 기타 이슈 +title: '' +labels: '' +assignees: '' + +--- + + diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..506bd1f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: 기능 요청 Issue +title: '' +labels: '' +assignees: '' + +--- + +## 어떤 기능인가요? + +> 추가하려는 기능에 대해 간결하게 설명해주세요 + +## 작업 상세 내용 + +- [ ] TODO +- [ ] TODO +- [ ] TODO + +## 참고할만한 자료(선택) From 518ed2b0e44c4344d46b943b51a44fc6158d9538 Mon Sep 17 00:00:00 2001 From: SeoJimin1234 <113419021+SeoJimin1234@users.noreply.github.com> Date: Tue, 7 Jan 2025 16:24:42 +0900 Subject: [PATCH 02/19] Create PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..2226925 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,14 @@ +### PR 타입(하나 이상의 PR 타입을 선택해주세요) +-[] 기능 추가 +-[] 기능 삭제 +-[] 버그 수정 +-[] 의존성, 환경 변수, 빌드 관련 코드 업데이트 + +### 반영 브랜치 +ex) feat/login -> dev + +### 변경 사항 +ex) 로그인 시, 구글 소셜 로그인 기능을 추가했습니다. + +### 테스트 결과 +ex) 베이스 브랜치에 포함되기 위한 코드는 모두 정상적으로 동작해야 합니다. 결과물에 대한 스크린샷, GIF, 혹은 라이브 데모가 가능하도록 샘플API를 첨부할 수도 있습니다. From 0fc083f365dca1c9b429f109c98459fa0d93074f Mon Sep 17 00:00:00 2001 From: SeoJimin1234 <113419021+SeoJimin1234@users.noreply.github.com> Date: Thu, 9 Jan 2025 17:03:05 +0900 Subject: [PATCH 03/19] Project Init (#2) * Project Init * Update PULL_REQUEST_TEMPLATE.md * Update PULL_REQUEST_TEMPLATE.md * Update bug_report.md * Update PULL_REQUEST_TEMPLATE.md * Update PULL_REQUEST_TEMPLATE.md * Update feature_request.md * Update etc-issue-template.md --- .github/ISSUE_TEMPLATE/bug_report.md | 8 - .github/ISSUE_TEMPLATE/etc-issue-template.md | 14 +- .github/ISSUE_TEMPLATE/feature_request.md | 13 +- .github/PULL_REQUEST_TEMPLATE.md | 23 +- .gitignore | 43 +++ HELP.md | 25 ++ build.gradle | 38 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 252 ++++++++++++++++++ gradlew.bat | 94 +++++++ settings.gradle | 1 + .../umc/codeplay/CodeplayApplication.java | 13 + src/main/resources/application.properties | 1 + .../codeplay/CodeplayApplicationTests.java | 13 + 15 files changed, 507 insertions(+), 38 deletions(-) create mode 100644 .gitignore create mode 100644 HELP.md create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/umc/codeplay/CodeplayApplication.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/umc/codeplay/CodeplayApplicationTests.java diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 9f2b3ff..ba3a124 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,11 +1,3 @@ ---- -name: Bug report -about: 버그 리포트 이슈 -title: '' -labels: '' -assignees: '' - ---- ## 어떤 버그인가요? diff --git a/.github/ISSUE_TEMPLATE/etc-issue-template.md b/.github/ISSUE_TEMPLATE/etc-issue-template.md index af77cb7..ebf481f 100644 --- a/.github/ISSUE_TEMPLATE/etc-issue-template.md +++ b/.github/ISSUE_TEMPLATE/etc-issue-template.md @@ -1,10 +1,8 @@ ---- -name: ETC Issue Template -about: 기타 이슈 -title: '' -labels: '' -assignees: '' - ---- +## 어떤 이슈인가요? +> 어떤 아슈인지 간결하게 설명해주세요 +## 작업 상세 내용 +- [ ] TODO +- [ ] TODO +- [ ] TODO diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 506bd1f..5cfbc0e 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,20 +1,11 @@ ---- -name: Feature request -about: 기능 요청 Issue -title: '' -labels: '' -assignees: '' - ---- - ## 어떤 기능인가요? - > 추가하려는 기능에 대해 간결하게 설명해주세요 -## 작업 상세 내용 +## 작업 상세 내용 - [ ] TODO - [ ] TODO - [ ] TODO + ## 참고할만한 자료(선택) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 2226925..2d5e06f 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,14 +1,15 @@ -### PR 타입(하나 이상의 PR 타입을 선택해주세요) --[] 기능 추가 --[] 기능 삭제 --[] 버그 수정 --[] 의존성, 환경 변수, 빌드 관련 코드 업데이트 +## PR 타입 +> 하나 이상의 PR 타입을 선택해주세요. +- [ ] 기능 추가 +- [ ] 기능 삭제 +- [ ] 버그 수정 +- [ ] 의존성, 환경 변수, 빌드 관련 코드 업데이트 +- [ ] 기타 -### 반영 브랜치 -ex) feat/login -> dev -### 변경 사항 -ex) 로그인 시, 구글 소셜 로그인 기능을 추가했습니다. +## 변경 사항 +> ex) 로그인 시, 구글 소셜 로그인 기능을 추가했습니다. -### 테스트 결과 -ex) 베이스 브랜치에 포함되기 위한 코드는 모두 정상적으로 동작해야 합니다. 결과물에 대한 스크린샷, GIF, 혹은 라이브 데모가 가능하도록 샘플API를 첨부할 수도 있습니다. + +## 테스트 결과 +> 병합되기 위한 코드는 모두 정상적으로 동작해야 합니다. 결과물에 대한 스크린 샷, GIF, 혹은 라이브 데모가 가능하도록 샘플 API를 추가할 수 있습니다. diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4b6f09b --- /dev/null +++ b/.gitignore @@ -0,0 +1,43 @@ +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/ + +### macOS ### +# General +.DS_Store +.AppleDouble +.LSOverride \ No newline at end of file diff --git a/HELP.md b/HELP.md new file mode 100644 index 0000000..2c68f3c --- /dev/null +++ b/HELP.md @@ -0,0 +1,25 @@ +# Getting Started + +### Reference Documentation +For further reference, please consider the following sections: + +* [Official Gradle documentation](https://docs.gradle.org) +* [Spring Boot Gradle Plugin Reference Guide](https://docs.spring.io/spring-boot/3.3.7/gradle-plugin) +* [Create an OCI image](https://docs.spring.io/spring-boot/3.3.7/gradle-plugin/packaging-oci-image.html) +* [Spring Web](https://docs.spring.io/spring-boot/3.3.7/reference/web/servlet.html) +* [Spring Data JPA](https://docs.spring.io/spring-boot/3.3.7/reference/data/sql.html#data.sql.jpa-and-spring-data) + +### Guides +The following guides illustrate how to use some features concretely: + +* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/) +* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/) +* [Building REST services with Spring](https://spring.io/guides/tutorials/rest/) +* [Accessing Data with JPA](https://spring.io/guides/gs/accessing-data-jpa/) +* [Accessing data with MySQL](https://spring.io/guides/gs/accessing-data-mysql/) + +### Additional Links +These additional references should also help you: + +* [Gradle Build Scans – insights for your project's build](https://scans.gradle.com#gradle) + diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..55dd606 --- /dev/null +++ b/build.gradle @@ -0,0 +1,38 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.3.7' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'umc' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { +// implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' +// runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e2847c8 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..f5feea6 --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed 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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +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 + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9b42019 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem 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, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..9e287d4 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'codeplay' diff --git a/src/main/java/umc/codeplay/CodeplayApplication.java b/src/main/java/umc/codeplay/CodeplayApplication.java new file mode 100644 index 0000000..b5bbd0b --- /dev/null +++ b/src/main/java/umc/codeplay/CodeplayApplication.java @@ -0,0 +1,13 @@ +package umc.codeplay; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class CodeplayApplication { + + public static void main(String[] args) { + SpringApplication.run(CodeplayApplication.class, args); + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..964bd07 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=codeplay diff --git a/src/test/java/umc/codeplay/CodeplayApplicationTests.java b/src/test/java/umc/codeplay/CodeplayApplicationTests.java new file mode 100644 index 0000000..a1d3b4a --- /dev/null +++ b/src/test/java/umc/codeplay/CodeplayApplicationTests.java @@ -0,0 +1,13 @@ +package umc.codeplay; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class CodeplayApplicationTests { + + @Test + void contextLoads() { + } + +} From f3c2cf863a29c7560ad444d8f78489d7c80e780c Mon Sep 17 00:00:00 2001 From: Kiara <80676180+2020147542@users.noreply.github.com> Date: Thu, 9 Jan 2025 18:28:19 +0900 Subject: [PATCH 04/19] =?UTF-8?q?issue,=20pr=20template=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20(#6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: kiara --- .github/ISSUE_TEMPLATE/bug_report.md | 8 ++++++++ .github/ISSUE_TEMPLATE/etc-issue-template.md | 9 +++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 14 ++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 9 +++++++++ 4 files changed, 40 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index ba3a124..e95c2ba 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,3 +1,11 @@ +--- +name: Other Issue +about: Report an issue that doesn't fit into other categories +title: '[other] ' +labels: +assignees: '' + +--- ## 어떤 버그인가요? diff --git a/.github/ISSUE_TEMPLATE/etc-issue-template.md b/.github/ISSUE_TEMPLATE/etc-issue-template.md index ebf481f..3735707 100644 --- a/.github/ISSUE_TEMPLATE/etc-issue-template.md +++ b/.github/ISSUE_TEMPLATE/etc-issue-template.md @@ -1,3 +1,12 @@ +--- +name: issue +about: add additional issue +title: '[tag] ' +labels: +assignees: '' + +--- + ## 어떤 이슈인가요? > 어떤 아슈인지 간결하게 설명해주세요 diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 5cfbc0e..aeb864b 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,3 +1,12 @@ +--- +name: Feature Request +about: Suggest a new feature for the project +title: '[feature] ' +labels: Feat +assignees: '' + +--- + ## 어떤 기능인가요? > 추가하려는 기능에 대해 간결하게 설명해주세요 @@ -9,3 +18,8 @@ ## 참고할만한 자료(선택) + + +## Must do +- [ ] checked assignees +- [ ] checked labels \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 2d5e06f..dc937f6 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -7,9 +7,18 @@ - [ ] 기타 +## ⭐Related Issues +- closes # + + ## 변경 사항 > ex) 로그인 시, 구글 소셜 로그인 기능을 추가했습니다. ## 테스트 결과 > 병합되기 위한 코드는 모두 정상적으로 동작해야 합니다. 결과물에 대한 스크린 샷, GIF, 혹은 라이브 데모가 가능하도록 샘플 API를 추가할 수 있습니다. + + +## Must do +- [ ] checked assignees +- [ ] checked labels \ No newline at end of file From b6cd24cc744f705ae90bec0460cbe8fa1e152493 Mon Sep 17 00:00:00 2001 From: Kiara <80676180+2020147542@users.noreply.github.com> Date: Thu, 9 Jan 2025 18:45:31 +0900 Subject: [PATCH 05/19] Template edit (#7) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * issue, pr template 수정 * issue, pr template 추가 수정 --------- Co-authored-by: kiara --- .github/ISSUE_TEMPLATE/bug_report.md | 14 ++++++++++---- .github/ISSUE_TEMPLATE/etc-issue-template.md | 14 ++++++++++---- .github/ISSUE_TEMPLATE/feature_request.md | 5 +++-- .github/PULL_REQUEST_TEMPLATE.md | 1 + 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index e95c2ba..104dda3 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,8 +1,8 @@ --- -name: Other Issue -about: Report an issue that doesn't fit into other categories -title: '[other] ' -labels: +name: Bug Report +about: Report a bug to improve the project +title: '[Bug] ' +labels: Bug assignees: '' --- @@ -20,3 +20,9 @@ assignees: '' > 예상했던 정상적인 결과가 어떤 것이었는지 설명해주세요 ## 참고할만한 자료(선택) + + +## Must do +- [ ] checked assignees +- [ ] checked labels +- [ ] checked Development (branch 와 이슈 연결) \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/etc-issue-template.md b/.github/ISSUE_TEMPLATE/etc-issue-template.md index 3735707..0c1d115 100644 --- a/.github/ISSUE_TEMPLATE/etc-issue-template.md +++ b/.github/ISSUE_TEMPLATE/etc-issue-template.md @@ -1,8 +1,8 @@ --- -name: issue -about: add additional issue -title: '[tag] ' -labels: +name: Other Issue +about: Feat, Bug 외 이슈 +title: '[Other] ' +labels: assignees: '' --- @@ -15,3 +15,9 @@ assignees: '' - [ ] TODO - [ ] TODO - [ ] TODO + + +## Must do +- [ ] checked assignees +- [ ] checked labels +- [ ] checked Development (branch 와 이슈 연결) \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index aeb864b..03393db 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,7 +1,7 @@ --- name: Feature Request about: Suggest a new feature for the project -title: '[feature] ' +title: '[Feat] ' labels: Feat assignees: '' @@ -22,4 +22,5 @@ assignees: '' ## Must do - [ ] checked assignees -- [ ] checked labels \ No newline at end of file +- [ ] checked labels +- [ ] checked Development (branch 와 이슈 연결) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index dc937f6..fc6df7a 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,6 +4,7 @@ - [ ] 기능 삭제 - [ ] 버그 수정 - [ ] 의존성, 환경 변수, 빌드 관련 코드 업데이트 +- [ ] 문서 관련 - [ ] 기타 From bf2c87797dc2189f8611d2b36c77e92af399a968 Mon Sep 17 00:00:00 2001 From: Kiara <80676180+2020147542@users.noreply.github.com> Date: Thu, 9 Jan 2025 19:41:07 +0900 Subject: [PATCH 06/19] Build ci (#8) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build ci script 추가 * spotless 변경사항 자동 git 반영 script 추가 * spotless 자동 실행되도록 gradle 파일 수정 * spotless 설정 수정 * spotless 변경사항 자동 git 반영 script 변경 * env 파일 추가 * env 파일 수정 --- .github/hooks/pre-commit | 16 ++++++ .github/workflows/build-test.yml | 29 +++++++++++ HELP.md | 1 - build.gradle | 50 ++++++++++++++++++- env/local.env | 12 +++++ .../umc/codeplay/CodeplayApplication.java | 7 ++- src/main/resources/application.properties | 1 - src/main/resources/application.yml | 7 +++ .../codeplay/CodeplayApplicationTests.java | 10 ++-- src/test/resources/application-test.yml | 15 ++++++ 10 files changed, 136 insertions(+), 12 deletions(-) create mode 100644 .github/hooks/pre-commit create mode 100644 .github/workflows/build-test.yml create mode 100644 env/local.env delete mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/application.yml create mode 100644 src/test/resources/application-test.yml diff --git a/.github/hooks/pre-commit b/.github/hooks/pre-commit new file mode 100644 index 0000000..3ef3f9f --- /dev/null +++ b/.github/hooks/pre-commit @@ -0,0 +1,16 @@ +#!/bin/bash + +echo "Spotless를 사용하여 코드를 자동 포맷팅합니다" + +# Spotless 적용 +if ./gradlew spotlessApply; then + + # Spotless 적용 후 변경된 파일들을 다시 스테이징 + git diff --staged --name-only | while read -r file; do + [ -f "$file" ] && git add "$file" + done + +else + echo "Spotless 자동 포맷팅에 실패했습니다." >&2 + exit 1 +fi diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml new file mode 100644 index 0000000..0605d71 --- /dev/null +++ b/.github/workflows/build-test.yml @@ -0,0 +1,29 @@ +name: Spring boot build test + +on: + pull_request: + branches: + - Develop + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: ✔️ 리포지토리 가져오기 + uses: actions/checkout@v4 + + - name: ✔️ JDK 17 설치 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + - name: ✔️ Gradle 명령 실행 권한 설정 + run: chmod +x gradlew + + - name: ✔️ Gradle build + run: ./gradlew build -x installLocalGitHook -x test -x spotlessJava -x spotlessJavaApply -x spotlessJavaCheck -x spotlessMisc -x spotlessMiscApply -x spotlessMiscCheck -x spotlessCheck -x spotlessApply + + - name: ✔️ Gradle test + run: ./gradlew --info test -Dspring.profiles.active=test \ No newline at end of file diff --git a/HELP.md b/HELP.md index 2c68f3c..82bc2a4 100644 --- a/HELP.md +++ b/HELP.md @@ -22,4 +22,3 @@ The following guides illustrate how to use some features concretely: These additional references should also help you: * [Gradle Build Scans – insights for your project's build](https://scans.gradle.com#gradle) - diff --git a/build.gradle b/build.gradle index 55dd606..4497378 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ plugins { id 'java' id 'org.springframework.boot' version '3.3.7' id 'io.spring.dependency-management' version '1.1.7' + id 'com.diffplug.spotless' version '6.23.3' } group = 'umc' @@ -24,15 +25,60 @@ repositories { } dependencies { -// implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' compileOnly 'org.projectlombok:lombok' -// runtimeOnly 'com.mysql:mysql-connector-j' annotationProcessor 'org.projectlombok:lombok' + + // implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + // runtimeOnly 'com.mysql:mysql-connector-j' + + implementation 'io.github.cdimascio:java-dotenv:5.2.2' // .env 사용 + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' // 스웨거 설정 + + // 테스트 testImplementation 'org.springframework.boot:spring-boot-starter-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + testImplementation 'io.rest-assured:rest-assured:5.3.1' + testRuntimeOnly 'com.h2database:h2' } tasks.named('test') { useJUnitPlatform() } + +tasks.register('installLocalGitHook', Copy) { + from("${rootProject.rootDir}/.github/hooks") + into("${rootProject.rootDir}/.git/hooks") + + eachFile { + mode = 0755 + } + + onlyIf { + !file("${rootProject.rootDir}/.git/hooks/pre-commit").exists() + } + + doLast { + println 'pre-commit 훅이 성공적으로 설치되었습니다.' + } +} + +spotless { + java { + googleJavaFormat().aosp() // Google Java 포맷 적용 + importOrder() + removeUnusedImports() // 공백 2칸으로 들여쓰기 + trimTrailingWhitespace() + } + format 'misc', { + target "*.gradle", "*.md", ".gitignore" + trimTrailingWhitespace() + indentWithTabs(1) + } +} + +tasks.named('compileJava') { + dependsOn 'installLocalGitHook' + dependsOn 'spotlessApply' +} diff --git a/env/local.env b/env/local.env new file mode 100644 index 0000000..6be0624 --- /dev/null +++ b/env/local.env @@ -0,0 +1,12 @@ +# MySQL 설정 +DB_URL= +MYSQL_USERNAME= +MYSQL_PASSWORD= + +# Spring Boot 설정 + +# AWS S3 settings + +# Kakao settings + +# Google settings \ No newline at end of file diff --git a/src/main/java/umc/codeplay/CodeplayApplication.java b/src/main/java/umc/codeplay/CodeplayApplication.java index b5bbd0b..ebe4f4d 100644 --- a/src/main/java/umc/codeplay/CodeplayApplication.java +++ b/src/main/java/umc/codeplay/CodeplayApplication.java @@ -6,8 +6,7 @@ @SpringBootApplication public class CodeplayApplication { - public static void main(String[] args) { - SpringApplication.run(CodeplayApplication.class, args); - } - + public static void main(String[] args) { + SpringApplication.run(CodeplayApplication.class, args); + } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index 964bd07..0000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.application.name=codeplay diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..f5b3116 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,7 @@ +spring: + application: + name: codeplay + + config: + import: + - optional:file:env/local-db.env[.properties] # .env.properties ? ???? ????? diff --git a/src/test/java/umc/codeplay/CodeplayApplicationTests.java b/src/test/java/umc/codeplay/CodeplayApplicationTests.java index a1d3b4a..32fe804 100644 --- a/src/test/java/umc/codeplay/CodeplayApplicationTests.java +++ b/src/test/java/umc/codeplay/CodeplayApplicationTests.java @@ -2,12 +2,14 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.test.context.ActiveProfiles; +@ActiveProfiles("test") @SpringBootTest +@ComponentScan(basePackages = "umc.codeplay") class CodeplayApplicationTests { - @Test - void contextLoads() { - } - + @Test + void contextLoads() {} } diff --git a/src/test/resources/application-test.yml b/src/test/resources/application-test.yml new file mode 100644 index 0000000..ae60a01 --- /dev/null +++ b/src/test/resources/application-test.yml @@ -0,0 +1,15 @@ +spring: + h2: + console: + enabled: true + datasource: + url: jdbc:h2:mem:testdb;MODE=MYSQL + driver-class-name: org.h2.Driver + username: sa + password: + jpa: + show-sql: true + properties: + hibernate: + dialect: org.hibernate.dialect.H2Dialect + ddl-auto: create-drop \ No newline at end of file From aac9f78541be2f0204f05c03cb3883367ed7b617 Mon Sep 17 00:00:00 2001 From: Kiara <80676180+2020147542@users.noreply.github.com> Date: Fri, 10 Jan 2025 18:59:06 +0900 Subject: [PATCH 07/19] #15 ci test (#17) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * spotless 설정 변경됨 * build ci - spotless 부분 수정 * 안되게 test * 원복 --- .github/workflows/build-test.yml | 2 +- build.gradle | 28 +++++++++++-------- .../umc/codeplay/CodeplayApplication.java | 6 ++-- .../codeplay/CodeplayApplicationTests.java | 7 +++-- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 0605d71..913376b 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -23,7 +23,7 @@ jobs: run: chmod +x gradlew - name: ✔️ Gradle build - run: ./gradlew build -x installLocalGitHook -x test -x spotlessJava -x spotlessJavaApply -x spotlessJavaCheck -x spotlessMisc -x spotlessMiscApply -x spotlessMiscCheck -x spotlessCheck -x spotlessApply + run: ./gradlew build -x installLocalGitHook -x spotlessInternalRegisterDependencies -x spotlessJava -x spotlessJavaApply -x spotlessApply -x spotlessJavaCheck -x spotlessCheck -x test - name: ✔️ Gradle test run: ./gradlew --info test -Dspring.profiles.active=test \ No newline at end of file diff --git a/build.gradle b/build.gradle index 4497378..ab361a9 100644 --- a/build.gradle +++ b/build.gradle @@ -30,8 +30,9 @@ dependencies { compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' - // implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - // runtimeOnly 'com.mysql:mysql-connector-j' + // mysql 사용시 주석 해제 + // implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + // runtimeOnly 'com.mysql:mysql-connector-j' implementation 'io.github.cdimascio:java-dotenv:5.2.2' // .env 사용 implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' // 스웨거 설정 @@ -66,15 +67,20 @@ tasks.register('installLocalGitHook', Copy) { spotless { java { - googleJavaFormat().aosp() // Google Java 포맷 적용 - importOrder() - removeUnusedImports() // 공백 2칸으로 들여쓰기 - trimTrailingWhitespace() - } - format 'misc', { - target "*.gradle", "*.md", ".gitignore" - trimTrailingWhitespace() - indentWithTabs(1) + googleJavaFormat() // Google Java 포맷 적용 + importOrder( + 'java|javax|jakarta', + 'org.springframework', + 'lombok', + '', + 'org.junit|org.mockito', + '\\#', + '\\#org.junit' + ) // 이 순서로 import문 정렬 + removeUnusedImports() // 사용하지 않는 import문 제거 + trimTrailingWhitespace() // 각 라인 끝의 공백 제거 + endWithNewline() // 파일 끝에 항상 새로운 줄 추가 + formatAnnotations() // 어노테이션 정렬 } } diff --git a/src/main/java/umc/codeplay/CodeplayApplication.java b/src/main/java/umc/codeplay/CodeplayApplication.java index ebe4f4d..8193ddd 100644 --- a/src/main/java/umc/codeplay/CodeplayApplication.java +++ b/src/main/java/umc/codeplay/CodeplayApplication.java @@ -6,7 +6,7 @@ @SpringBootApplication public class CodeplayApplication { - public static void main(String[] args) { - SpringApplication.run(CodeplayApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(CodeplayApplication.class, args); + } } diff --git a/src/test/java/umc/codeplay/CodeplayApplicationTests.java b/src/test/java/umc/codeplay/CodeplayApplicationTests.java index 32fe804..a14fe25 100644 --- a/src/test/java/umc/codeplay/CodeplayApplicationTests.java +++ b/src/test/java/umc/codeplay/CodeplayApplicationTests.java @@ -1,15 +1,16 @@ package umc.codeplay; -import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; import org.springframework.test.context.ActiveProfiles; +import org.junit.jupiter.api.Test; + @ActiveProfiles("test") @SpringBootTest @ComponentScan(basePackages = "umc.codeplay") class CodeplayApplicationTests { - @Test - void contextLoads() {} + @Test + void contextLoads() {} } From 2337bb8af41edfc18e7fd86eb2de0607b9345e52 Mon Sep 17 00:00:00 2001 From: Kiara <80676180+2020147542@users.noreply.github.com> Date: Fri, 10 Jan 2025 19:45:45 +0900 Subject: [PATCH 08/19] =?UTF-8?q?=EC=8A=A4=EC=9B=A8=EA=B1=B0=20=EC=84=B8?= =?UTF-8?q?=ED=8C=85=20=EC=A7=84=ED=96=89=20(#19)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat:issue 템플릿에서 필요없는 must do 제거(#14) * feat: swagger configuration 완료(#14) --- .github/ISSUE_TEMPLATE/bug_report.md | 3 +- .github/ISSUE_TEMPLATE/etc-issue-template.md | 3 +- .github/ISSUE_TEMPLATE/feature_request.md | 3 +- build.gradle | 3 ++ .../umc/codeplay/config/SwaggerConfig.java | 45 +++++++++++++++++++ 5 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 src/main/java/umc/codeplay/config/SwaggerConfig.java diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 104dda3..9ef9dc1 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -24,5 +24,4 @@ assignees: '' ## Must do - [ ] checked assignees -- [ ] checked labels -- [ ] checked Development (branch 와 이슈 연결) \ No newline at end of file +- [ ] checked labels \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/etc-issue-template.md b/.github/ISSUE_TEMPLATE/etc-issue-template.md index 0c1d115..7da4c5a 100644 --- a/.github/ISSUE_TEMPLATE/etc-issue-template.md +++ b/.github/ISSUE_TEMPLATE/etc-issue-template.md @@ -19,5 +19,4 @@ assignees: '' ## Must do - [ ] checked assignees -- [ ] checked labels -- [ ] checked Development (branch 와 이슈 연결) \ No newline at end of file +- [ ] checked labels \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 03393db..d8cf240 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -22,5 +22,4 @@ assignees: '' ## Must do - [ ] checked assignees -- [ ] checked labels -- [ ] checked Development (branch 와 이슈 연결) +- [ ] checked labels \ No newline at end of file diff --git a/build.gradle b/build.gradle index ab361a9..04c5e5f 100644 --- a/build.gradle +++ b/build.gradle @@ -42,6 +42,9 @@ dependencies { testRuntimeOnly 'org.junit.platform:junit-platform-launcher' testImplementation 'io.rest-assured:rest-assured:5.3.1' testRuntimeOnly 'com.h2database:h2' + + // 스웨거 + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' } tasks.named('test') { diff --git a/src/main/java/umc/codeplay/config/SwaggerConfig.java b/src/main/java/umc/codeplay/config/SwaggerConfig.java new file mode 100644 index 0000000..a693c56 --- /dev/null +++ b/src/main/java/umc/codeplay/config/SwaggerConfig.java @@ -0,0 +1,45 @@ +package umc.codeplay.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; +import io.swagger.v3.oas.models.servers.Server; + +@Configuration +public class SwaggerConfig { + + @Bean + public OpenAPI CodePlayAPI() { + + Info info = + new Info() + .title("CodePlay Server API") + .description("UMC 7th Code Play Server API 문서") + .version("1.0"); + + String securitySchemeName = "JWT TOKEN"; + + SecurityRequirement securityRequirement = new SecurityRequirement().addList(securitySchemeName); + + Components components = + new Components() + .addSecuritySchemes( + securitySchemeName, + new SecurityScheme() + .name(securitySchemeName) + .type(SecurityScheme.Type.HTTP) + .scheme("bearer") + .bearerFormat("JWT")); + + return new OpenAPI() + .addServersItem(new Server().url("/")) + .info(info) + .addSecurityItem(securityRequirement) + .components(components); + } +} From 19d93f41b7e3d1bd3ecc904cca6e1aef44f76f9b Mon Sep 17 00:00:00 2001 From: chan0831 <116000778+chan0831@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:54:32 +0900 Subject: [PATCH 09/19] =?UTF-8?q?[Feat]=20=EC=8A=A4=ED=94=84=EB=A7=81=20?= =?UTF-8?q?=EC=8B=9C=ED=81=90=EB=A6=AC=ED=8B=B0=20=EC=84=A4=EC=A0=95(#13)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 이찬우 --- build.gradle | 6 +++ .../umc/codeplay/config/SecurityConfig.java | 42 +++++++++++++++++++ .../controller/MemberViewController.java | 13 ++++++ 3 files changed, 61 insertions(+) create mode 100644 src/main/java/umc/codeplay/config/SecurityConfig.java create mode 100644 src/main/java/umc/codeplay/controller/MemberViewController.java diff --git a/build.gradle b/build.gradle index 04c5e5f..ab0462c 100644 --- a/build.gradle +++ b/build.gradle @@ -45,6 +45,12 @@ dependencies { // 스웨거 implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + + //스프링 시큐리티 + implementation 'org.springframework.boot:spring-boot-starter-security' + testImplementation 'org.springframework.security:spring-security-test' + //thymeleaf 에서 시큐리티 동작 + implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.1.RELEASE' } tasks.named('test') { diff --git a/src/main/java/umc/codeplay/config/SecurityConfig.java b/src/main/java/umc/codeplay/config/SecurityConfig.java new file mode 100644 index 0000000..541df25 --- /dev/null +++ b/src/main/java/umc/codeplay/config/SecurityConfig.java @@ -0,0 +1,42 @@ +package umc.codeplay.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; + +@EnableWebSecurity +@Configuration +public class SecurityConfig { + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeRequests( + (requests) -> + requests + // 인증 없이 접근 가능 + .requestMatchers("/", "/home", "/signup", "/css/**") + .permitAll() + + // 나머지는 인증 있어야 접근 가능 + .anyRequest() + .authenticated()) + .formLogin( + (form) -> + form.loginPage("/login") + .defaultSuccessUrl("/home", true) // 로그인 성공 시 홈으로 + .permitAll() // 로그인 페이지 인증없이 접근 허용 + ) + .logout( + (logout) -> logout.logoutUrl("/logout").logoutSuccessUrl("/login?logout").permitAll()); + return http.build(); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } +} diff --git a/src/main/java/umc/codeplay/controller/MemberViewController.java b/src/main/java/umc/codeplay/controller/MemberViewController.java new file mode 100644 index 0000000..2f55c60 --- /dev/null +++ b/src/main/java/umc/codeplay/controller/MemberViewController.java @@ -0,0 +1,13 @@ +package umc.codeplay.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +public class MemberViewController { + + @GetMapping("/login") + public String login() { + return "login"; + } +} From 7d7f13634c4d70ac96fc5c9e49b722a20c756b3a Mon Sep 17 00:00:00 2001 From: chan0831 <116000778+chan0831@users.noreply.github.com> Date: Fri, 10 Jan 2025 22:53:31 +0900 Subject: [PATCH 10/19] =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=EA=B0=80=EC=9E=85=20=EC=84=A4=EC=A0=95(#12)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 이찬우 --- build.gradle | 7 ++-- .../controller/MemberViewController.java | 31 +++++++++++++++-- .../codeplay/converter/MemberConverter.java | 21 ++++++++++++ src/main/java/umc/codeplay/domain/Member.java | 34 +++++++++++++++++++ .../umc/codeplay/dto/MemberRequestDTO.java | 13 +++++++ .../umc/codeplay/dto/MemberResponseDTO.java | 17 ++++++++++ .../codeplay/repository/MemberRepository.java | 7 ++++ .../umc/codeplay/service/MemberService.java | 26 ++++++++++++++ 8 files changed, 152 insertions(+), 4 deletions(-) create mode 100644 src/main/java/umc/codeplay/converter/MemberConverter.java create mode 100644 src/main/java/umc/codeplay/domain/Member.java create mode 100644 src/main/java/umc/codeplay/dto/MemberRequestDTO.java create mode 100644 src/main/java/umc/codeplay/dto/MemberResponseDTO.java create mode 100644 src/main/java/umc/codeplay/repository/MemberRepository.java create mode 100644 src/main/java/umc/codeplay/service/MemberService.java diff --git a/build.gradle b/build.gradle index ab0462c..9868e13 100644 --- a/build.gradle +++ b/build.gradle @@ -43,13 +43,16 @@ dependencies { testImplementation 'io.rest-assured:rest-assured:5.3.1' testRuntimeOnly 'com.h2database:h2' + // jpa + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + // 스웨거 implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - //스프링 시큐리티 + // 스프링 시큐리티 implementation 'org.springframework.boot:spring-boot-starter-security' testImplementation 'org.springframework.security:spring-security-test' - //thymeleaf 에서 시큐리티 동작 + // thymeleaf 에서 시큐리티 동작 implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.1.RELEASE' } diff --git a/src/main/java/umc/codeplay/controller/MemberViewController.java b/src/main/java/umc/codeplay/controller/MemberViewController.java index 2f55c60..638635b 100644 --- a/src/main/java/umc/codeplay/controller/MemberViewController.java +++ b/src/main/java/umc/codeplay/controller/MemberViewController.java @@ -1,13 +1,40 @@ package umc.codeplay.controller; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; -@Controller +import lombok.RequiredArgsConstructor; + +import umc.codeplay.converter.MemberConverter; +import umc.codeplay.domain.Member; +import umc.codeplay.dto.MemberRequestDTO; +import umc.codeplay.dto.MemberResponseDTO; +import umc.codeplay.service.MemberService; + +@RestController +@RequiredArgsConstructor public class MemberViewController { + private final MemberService memberService; + @GetMapping("/login") public String login() { return "login"; } + + @GetMapping("/signup") + public String signup() { + return "signup"; + } + + @PostMapping("/signup") + public String join(@RequestBody MemberRequestDTO.JoinDto request) { + Member member = memberService.joinMember(request); + MemberResponseDTO.JoinResultDTO newJoinResultDTO = MemberConverter.toJoinResultDTO(member); + // ApiResponse 세팅 필요. + // return ApiResponse.onSuccess(newJoinResultDTO); + return null; + } } diff --git a/src/main/java/umc/codeplay/converter/MemberConverter.java b/src/main/java/umc/codeplay/converter/MemberConverter.java new file mode 100644 index 0000000..4fdb174 --- /dev/null +++ b/src/main/java/umc/codeplay/converter/MemberConverter.java @@ -0,0 +1,21 @@ +package umc.codeplay.converter; + +import umc.codeplay.domain.Member; +import umc.codeplay.dto.MemberRequestDTO; +import umc.codeplay.dto.MemberResponseDTO; + +public class MemberConverter { + + public static Member toMember(MemberRequestDTO.JoinDto request) { + + return Member.builder() + .name(request.getName()) + .email(request.getEmail()) + .password(request.getPassword()) + .build(); + } + + public static MemberResponseDTO.JoinResultDTO toJoinResultDTO(Member member) { + return MemberResponseDTO.JoinResultDTO.builder().id(member.getId()).build(); + } +} diff --git a/src/main/java/umc/codeplay/domain/Member.java b/src/main/java/umc/codeplay/domain/Member.java new file mode 100644 index 0000000..f81a4ef --- /dev/null +++ b/src/main/java/umc/codeplay/domain/Member.java @@ -0,0 +1,34 @@ +package umc.codeplay.domain; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; + +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Member { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String name; + + private String password; + + private String email; + + public void encodePassword(String password) { + this.password = password; + } +} diff --git a/src/main/java/umc/codeplay/dto/MemberRequestDTO.java b/src/main/java/umc/codeplay/dto/MemberRequestDTO.java new file mode 100644 index 0000000..023ff48 --- /dev/null +++ b/src/main/java/umc/codeplay/dto/MemberRequestDTO.java @@ -0,0 +1,13 @@ +package umc.codeplay.dto; + +import lombok.Getter; + +public class MemberRequestDTO { + + @Getter + public static class JoinDto { + String name; + String email; + String password; + } +} diff --git a/src/main/java/umc/codeplay/dto/MemberResponseDTO.java b/src/main/java/umc/codeplay/dto/MemberResponseDTO.java new file mode 100644 index 0000000..22d613f --- /dev/null +++ b/src/main/java/umc/codeplay/dto/MemberResponseDTO.java @@ -0,0 +1,17 @@ +package umc.codeplay.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +public class MemberResponseDTO { + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class JoinResultDTO { + Long id; + } +} diff --git a/src/main/java/umc/codeplay/repository/MemberRepository.java b/src/main/java/umc/codeplay/repository/MemberRepository.java new file mode 100644 index 0000000..d6edfa3 --- /dev/null +++ b/src/main/java/umc/codeplay/repository/MemberRepository.java @@ -0,0 +1,7 @@ +package umc.codeplay.repository; + +import org.springframework.data.jpa.repository.JpaRepository; + +import umc.codeplay.domain.Member; + +public interface MemberRepository extends JpaRepository {} diff --git a/src/main/java/umc/codeplay/service/MemberService.java b/src/main/java/umc/codeplay/service/MemberService.java new file mode 100644 index 0000000..6495bf0 --- /dev/null +++ b/src/main/java/umc/codeplay/service/MemberService.java @@ -0,0 +1,26 @@ +package umc.codeplay.service; + +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; + +import lombok.RequiredArgsConstructor; + +import umc.codeplay.converter.MemberConverter; +import umc.codeplay.domain.Member; +import umc.codeplay.dto.MemberRequestDTO; +import umc.codeplay.repository.MemberRepository; + +@Service +@RequiredArgsConstructor +public class MemberService { + + private final MemberRepository memberRepository; + private final PasswordEncoder passwordEncoder; + + public Member joinMember(MemberRequestDTO.JoinDto request) { + + Member newMember = MemberConverter.toMember(request); + newMember.encodePassword(passwordEncoder.encode(request.getPassword())); + return memberRepository.save(newMember); + } +} From 6cc13a386889feedbe29270a197bcf779f66271d Mon Sep 17 00:00:00 2001 From: johnjal Date: Sat, 11 Jan 2025 14:35:56 +0900 Subject: [PATCH 11/19] =?UTF-8?q?[Feat]=20JWT=20+=20Spring=20Security=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8/=ED=9A=8C=EC=9B=90=EA=B0=80?= =?UTF-8?q?=EC=9E=85=20=EA=B5=AC=ED=98=84=20(#24)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Authorization feature * Authentication feature implemented * bug fix --- build.gradle | 26 ++-- .../umc/codeplay/CodeplayApplication.java | 6 +- .../umc/codeplay/apiPayLoad/ApiResponse.java | 45 ++++++ .../codeplay/apiPayLoad/code/BaseCode.java | 8 + .../apiPayLoad/code/BaseErrorCode.java | 8 + .../apiPayLoad/code/ErrorReasonDTO.java | 21 +++ .../codeplay/apiPayLoad/code/ReasonDTO.java | 21 +++ .../apiPayLoad/code/status/ErrorStatus.java | 45 ++++++ .../apiPayLoad/code/status/SuccessStatus.java | 36 +++++ .../apiPayLoad/exception/ExceptionAdvice.java | 138 +++++++++++++++++ .../exception/GeneralException.java | 22 +++ .../exception/handler/GeneralHandler.java | 11 ++ .../umc/codeplay/config/SecurityConfig.java | 140 ++++++++++++++---- .../umc/codeplay/config/SwaggerConfig.java | 59 ++++---- .../security/CustomUserDetailsService.java | 33 +++++ .../codeplay/controller/AuthController.java | 70 +++++++++ .../controller/MemberViewController.java | 40 ----- .../codeplay/converter/MemberConverter.java | 26 ++-- src/main/java/umc/codeplay/domain/Member.java | 22 +-- .../java/umc/codeplay/domain/enums/Role.java | 6 + .../umc/codeplay/dto/MemberRequestDTO.java | 21 ++- .../umc/codeplay/dto/MemberResponseDTO.java | 23 ++- .../codeplay/jwt/JwtAuthenticationFilter.java | 56 +++++++ src/main/java/umc/codeplay/jwt/JwtUtil.java | 90 +++++++++++ .../codeplay/repository/MemberRepository.java | 6 +- .../umc/codeplay/service/MemberService.java | 20 ++- src/main/resources/application.yml | 21 +++ .../codeplay/CodeplayApplicationTests.java | 4 +- 28 files changed, 873 insertions(+), 151 deletions(-) create mode 100644 src/main/java/umc/codeplay/apiPayLoad/ApiResponse.java create mode 100644 src/main/java/umc/codeplay/apiPayLoad/code/BaseCode.java create mode 100644 src/main/java/umc/codeplay/apiPayLoad/code/BaseErrorCode.java create mode 100644 src/main/java/umc/codeplay/apiPayLoad/code/ErrorReasonDTO.java create mode 100644 src/main/java/umc/codeplay/apiPayLoad/code/ReasonDTO.java create mode 100644 src/main/java/umc/codeplay/apiPayLoad/code/status/ErrorStatus.java create mode 100644 src/main/java/umc/codeplay/apiPayLoad/code/status/SuccessStatus.java create mode 100644 src/main/java/umc/codeplay/apiPayLoad/exception/ExceptionAdvice.java create mode 100644 src/main/java/umc/codeplay/apiPayLoad/exception/GeneralException.java create mode 100644 src/main/java/umc/codeplay/apiPayLoad/exception/handler/GeneralHandler.java create mode 100644 src/main/java/umc/codeplay/config/security/CustomUserDetailsService.java create mode 100644 src/main/java/umc/codeplay/controller/AuthController.java delete mode 100644 src/main/java/umc/codeplay/controller/MemberViewController.java create mode 100644 src/main/java/umc/codeplay/domain/enums/Role.java create mode 100644 src/main/java/umc/codeplay/jwt/JwtAuthenticationFilter.java create mode 100644 src/main/java/umc/codeplay/jwt/JwtUtil.java diff --git a/build.gradle b/build.gradle index 9868e13..ace43d1 100644 --- a/build.gradle +++ b/build.gradle @@ -31,11 +31,11 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' // mysql 사용시 주석 해제 - // implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - // runtimeOnly 'com.mysql:mysql-connector-j' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + runtimeOnly 'com.mysql:mysql-connector-j' - implementation 'io.github.cdimascio:java-dotenv:5.2.2' // .env 사용 - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' // 스웨거 설정 + // .env 사용 + implementation 'io.github.cdimascio:java-dotenv:5.2.2' // 테스트 testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -43,17 +43,23 @@ dependencies { testImplementation 'io.rest-assured:rest-assured:5.3.1' testRuntimeOnly 'com.h2database:h2' - // jpa - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - // 스웨거 implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' // 스프링 시큐리티 implementation 'org.springframework.boot:spring-boot-starter-security' testImplementation 'org.springframework.security:spring-security-test' - // thymeleaf 에서 시큐리티 동작 - implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.1.RELEASE' + + // thymeleaf 에서 시큐리티 동작 (필요 없음) +// implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.1.RELEASE' + + // jwt + implementation 'io.jsonwebtoken:jjwt-api:0.11.5' + runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' + runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5' + + // validation + implementation 'org.springframework.boot:spring-boot-starter-validation' } tasks.named('test') { @@ -79,7 +85,7 @@ tasks.register('installLocalGitHook', Copy) { spotless { java { - googleJavaFormat() // Google Java 포맷 적용 + googleJavaFormat().aosp() // Google Java 포맷 적용 importOrder( 'java|javax|jakarta', 'org.springframework', diff --git a/src/main/java/umc/codeplay/CodeplayApplication.java b/src/main/java/umc/codeplay/CodeplayApplication.java index 8193ddd..ebe4f4d 100644 --- a/src/main/java/umc/codeplay/CodeplayApplication.java +++ b/src/main/java/umc/codeplay/CodeplayApplication.java @@ -6,7 +6,7 @@ @SpringBootApplication public class CodeplayApplication { - public static void main(String[] args) { - SpringApplication.run(CodeplayApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(CodeplayApplication.class, args); + } } diff --git a/src/main/java/umc/codeplay/apiPayLoad/ApiResponse.java b/src/main/java/umc/codeplay/apiPayLoad/ApiResponse.java new file mode 100644 index 0000000..bd6cea8 --- /dev/null +++ b/src/main/java/umc/codeplay/apiPayLoad/ApiResponse.java @@ -0,0 +1,45 @@ +package umc.codeplay.apiPayLoad; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import umc.codeplay.apiPayLoad.code.BaseCode; +import umc.codeplay.apiPayLoad.code.status.SuccessStatus; + +@Getter +@AllArgsConstructor +@JsonPropertyOrder({"isSuccess", "code", "message", "result"}) +public class ApiResponse { + + @JsonProperty("isSuccess") + private final Boolean isSuccess; + + private final String code; + private final String message; + + @JsonInclude(JsonInclude.Include.NON_NULL) + private T result; + + // 성공한 경우 응답 생성 + + public static ApiResponse onSuccess(T result) { + return new ApiResponse<>( + true, SuccessStatus._OK.getCode(), SuccessStatus._OK.getMessage(), result); + } + + public static ApiResponse of(BaseCode code, T result) { + return new ApiResponse<>( + true, + code.getReasonHttpStatus().getCode(), + code.getReasonHttpStatus().getMessage(), + result); + } + + // 실패한 경우 응답 생성 + public static ApiResponse onFailure(String code, String message, T data) { + return new ApiResponse<>(false, code, message, data); + } +} diff --git a/src/main/java/umc/codeplay/apiPayLoad/code/BaseCode.java b/src/main/java/umc/codeplay/apiPayLoad/code/BaseCode.java new file mode 100644 index 0000000..6e96d65 --- /dev/null +++ b/src/main/java/umc/codeplay/apiPayLoad/code/BaseCode.java @@ -0,0 +1,8 @@ +package umc.codeplay.apiPayLoad.code; + +public interface BaseCode { + + ReasonDTO getReason(); + + ReasonDTO getReasonHttpStatus(); +} diff --git a/src/main/java/umc/codeplay/apiPayLoad/code/BaseErrorCode.java b/src/main/java/umc/codeplay/apiPayLoad/code/BaseErrorCode.java new file mode 100644 index 0000000..eaa5fc7 --- /dev/null +++ b/src/main/java/umc/codeplay/apiPayLoad/code/BaseErrorCode.java @@ -0,0 +1,8 @@ +package umc.codeplay.apiPayLoad.code; + +public interface BaseErrorCode { + + ErrorReasonDTO getReason(); + + ErrorReasonDTO getReasonHttpStatus(); +} diff --git a/src/main/java/umc/codeplay/apiPayLoad/code/ErrorReasonDTO.java b/src/main/java/umc/codeplay/apiPayLoad/code/ErrorReasonDTO.java new file mode 100644 index 0000000..7916e0f --- /dev/null +++ b/src/main/java/umc/codeplay/apiPayLoad/code/ErrorReasonDTO.java @@ -0,0 +1,21 @@ +package umc.codeplay.apiPayLoad.code; + +import org.springframework.http.HttpStatus; + +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class ErrorReasonDTO { // ?? + + private HttpStatus httpStatus; + + private final boolean isSuccess; + private final String code; + private final String message; + + public boolean getIsSuccess() { + return isSuccess; + } +} diff --git a/src/main/java/umc/codeplay/apiPayLoad/code/ReasonDTO.java b/src/main/java/umc/codeplay/apiPayLoad/code/ReasonDTO.java new file mode 100644 index 0000000..d15f42e --- /dev/null +++ b/src/main/java/umc/codeplay/apiPayLoad/code/ReasonDTO.java @@ -0,0 +1,21 @@ +package umc.codeplay.apiPayLoad.code; + +import org.springframework.http.HttpStatus; + +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class ReasonDTO { // ?? + + private HttpStatus httpStatus; + + private final boolean isSuccess; + private final String code; + private final String message; + + public boolean getIsSuccess() { + return isSuccess; + } +} diff --git a/src/main/java/umc/codeplay/apiPayLoad/code/status/ErrorStatus.java b/src/main/java/umc/codeplay/apiPayLoad/code/status/ErrorStatus.java new file mode 100644 index 0000000..d60254d --- /dev/null +++ b/src/main/java/umc/codeplay/apiPayLoad/code/status/ErrorStatus.java @@ -0,0 +1,45 @@ +package umc.codeplay.apiPayLoad.code.status; + +import org.springframework.http.HttpStatus; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +import umc.codeplay.apiPayLoad.code.BaseErrorCode; +import umc.codeplay.apiPayLoad.code.ErrorReasonDTO; + +@Getter +@AllArgsConstructor +public enum ErrorStatus implements BaseErrorCode { + + // 가장 일반적인 응답 + _INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON500", "서버 에러, 관리자에게 문의 바랍니다."), + _BAD_REQUEST(HttpStatus.BAD_REQUEST, "COMMON400", "잘못된 요청입니다."), + _UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "COMMON401", "인증이 필요합니다."), + _FORBIDDEN(HttpStatus.FORBIDDEN, "COMMON403", "금지된 요청입니다."), + + MEMBER_NOT_FOUND(HttpStatus.BAD_REQUEST, "MEMBER400", "유저를 찾을 수 없습니다."), + MEMBER_ALREADY_EXISTS(HttpStatus.BAD_REQUEST, "MEMBER401", "유저가 이미 존재합니다."), + + NOT_AUTHORIZED(HttpStatus.BAD_REQUEST, "AUTH400", "인증되지 않은 요청입니다."), + ID_OR_PASSWORD_WRONG(HttpStatus.BAD_REQUEST, "AUTH401", "아이디 혹은 비밀번호가 잘못되었습니다."); + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + @Override + public ErrorReasonDTO getReason() { + return ErrorReasonDTO.builder().message(message).code(code).isSuccess(false).build(); + } + + @Override + public ErrorReasonDTO getReasonHttpStatus() { + return ErrorReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(false) + .httpStatus(httpStatus) + .build(); + } +} diff --git a/src/main/java/umc/codeplay/apiPayLoad/code/status/SuccessStatus.java b/src/main/java/umc/codeplay/apiPayLoad/code/status/SuccessStatus.java new file mode 100644 index 0000000..3d98f57 --- /dev/null +++ b/src/main/java/umc/codeplay/apiPayLoad/code/status/SuccessStatus.java @@ -0,0 +1,36 @@ +package umc.codeplay.apiPayLoad.code.status; + +import org.springframework.http.HttpStatus; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +import umc.codeplay.apiPayLoad.code.BaseCode; +import umc.codeplay.apiPayLoad.code.ReasonDTO; + +@Getter +@AllArgsConstructor +public enum SuccessStatus implements BaseCode { + + // 일반적인 응답 + _OK(HttpStatus.OK, "COMMON200", "성공입니다."); + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + @Override + public ReasonDTO getReason() { + return ReasonDTO.builder().message(message).code(code).isSuccess(true).build(); + } + + @Override + public ReasonDTO getReasonHttpStatus() { + return ReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(true) + .httpStatus(httpStatus) + .build(); + } +} diff --git a/src/main/java/umc/codeplay/apiPayLoad/exception/ExceptionAdvice.java b/src/main/java/umc/codeplay/apiPayLoad/exception/ExceptionAdvice.java new file mode 100644 index 0000000..d21a77f --- /dev/null +++ b/src/main/java/umc/codeplay/apiPayLoad/exception/ExceptionAdvice.java @@ -0,0 +1,138 @@ +package umc.codeplay.apiPayLoad.exception; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Optional; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ConstraintViolationException; + +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.context.request.ServletWebRequest; +import org.springframework.web.context.request.WebRequest; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; + +import lombok.extern.slf4j.Slf4j; + +import umc.codeplay.apiPayLoad.ApiResponse; +import umc.codeplay.apiPayLoad.code.ErrorReasonDTO; +import umc.codeplay.apiPayLoad.code.status.ErrorStatus; + +@Slf4j +@RestControllerAdvice(annotations = {RestController.class}) +public class ExceptionAdvice extends ResponseEntityExceptionHandler { + + @ExceptionHandler + public ResponseEntity validation(ConstraintViolationException e, WebRequest request) { + String errorMessage = + e.getConstraintViolations().stream() + .map(constraintViolation -> constraintViolation.getMessage()) + .findFirst() + .orElseThrow( + () -> + new RuntimeException( + "ConstraintViolationException 추출 도중 에러 발생")); + + return handleExceptionInternalConstraint( + e, ErrorStatus.valueOf(errorMessage), HttpHeaders.EMPTY, request); + } + + @Override + public ResponseEntity handleMethodArgumentNotValid( + MethodArgumentNotValidException e, + HttpHeaders headers, + HttpStatusCode status, + WebRequest request) { + + Map errors = new LinkedHashMap<>(); + + e.getBindingResult().getFieldErrors().stream() + .forEach( + fieldError -> { + String fieldName = fieldError.getField(); + String errorMessage = + Optional.ofNullable(fieldError.getDefaultMessage()).orElse(""); + errors.merge( + fieldName, + errorMessage, + (existingErrorMessage, newErrorMessage) -> + existingErrorMessage + ", " + newErrorMessage); + }); + + return handleExceptionInternalArgs( + e, HttpHeaders.EMPTY, ErrorStatus.valueOf("_BAD_REQUEST"), request, errors); + } + + @ExceptionHandler + public ResponseEntity exception(Exception e, WebRequest request) { + e.printStackTrace(); + + return handleExceptionInternalFalse( + e, + ErrorStatus._INTERNAL_SERVER_ERROR, + HttpHeaders.EMPTY, + ErrorStatus._INTERNAL_SERVER_ERROR.getHttpStatus(), + request, + e.getMessage()); + } + + @ExceptionHandler(value = umc.codeplay.apiPayLoad.exception.GeneralException.class) + public ResponseEntity onThrowException( + umc.codeplay.apiPayLoad.exception.GeneralException generalException, + HttpServletRequest request) { + ErrorReasonDTO errorReasonHttpStatus = generalException.getErrorReasonHttpStatus(); + return handleExceptionInternal(generalException, errorReasonHttpStatus, null, request); + } + + private ResponseEntity handleExceptionInternal( + Exception e, ErrorReasonDTO reason, HttpHeaders headers, HttpServletRequest request) { + + ApiResponse body = + ApiResponse.onFailure(reason.getCode(), reason.getMessage(), null); + e.printStackTrace(); + + WebRequest webRequest = new ServletWebRequest(request); + return super.handleExceptionInternal(e, body, headers, reason.getHttpStatus(), webRequest); + } + + private ResponseEntity handleExceptionInternalFalse( + Exception e, + ErrorStatus errorCommonStatus, + HttpHeaders headers, + HttpStatus status, + WebRequest request, + String errorPoint) { + ApiResponse body = + ApiResponse.onFailure( + errorCommonStatus.getCode(), errorCommonStatus.getMessage(), errorPoint); + return super.handleExceptionInternal(e, body, headers, status, request); + } + + private ResponseEntity handleExceptionInternalArgs( + Exception e, + HttpHeaders headers, + ErrorStatus errorCommonStatus, + WebRequest request, + Map errorArgs) { + ApiResponse body = + ApiResponse.onFailure( + errorCommonStatus.getCode(), errorCommonStatus.getMessage(), errorArgs); + return super.handleExceptionInternal( + e, body, headers, errorCommonStatus.getHttpStatus(), request); + } + + private ResponseEntity handleExceptionInternalConstraint( + Exception e, ErrorStatus errorCommonStatus, HttpHeaders headers, WebRequest request) { + ApiResponse body = + ApiResponse.onFailure( + errorCommonStatus.getCode(), errorCommonStatus.getMessage(), null); + return super.handleExceptionInternal( + e, body, headers, errorCommonStatus.getHttpStatus(), request); + } +} diff --git a/src/main/java/umc/codeplay/apiPayLoad/exception/GeneralException.java b/src/main/java/umc/codeplay/apiPayLoad/exception/GeneralException.java new file mode 100644 index 0000000..d87f144 --- /dev/null +++ b/src/main/java/umc/codeplay/apiPayLoad/exception/GeneralException.java @@ -0,0 +1,22 @@ +package umc.codeplay.apiPayLoad.exception; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +import umc.codeplay.apiPayLoad.code.BaseErrorCode; +import umc.codeplay.apiPayLoad.code.ErrorReasonDTO; + +@Getter +@AllArgsConstructor +public class GeneralException extends RuntimeException { + + private BaseErrorCode code; + + public ErrorReasonDTO getErrorReason() { + return this.code.getReason(); + } + + public ErrorReasonDTO getErrorReasonHttpStatus() { + return this.code.getReasonHttpStatus(); + } +} diff --git a/src/main/java/umc/codeplay/apiPayLoad/exception/handler/GeneralHandler.java b/src/main/java/umc/codeplay/apiPayLoad/exception/handler/GeneralHandler.java new file mode 100644 index 0000000..fa7e9c9 --- /dev/null +++ b/src/main/java/umc/codeplay/apiPayLoad/exception/handler/GeneralHandler.java @@ -0,0 +1,11 @@ +package umc.codeplay.apiPayLoad.exception.handler; + +import umc.codeplay.apiPayLoad.code.BaseErrorCode; +import umc.codeplay.apiPayLoad.exception.GeneralException; + +public class GeneralHandler extends GeneralException { + + public GeneralHandler(BaseErrorCode errorCode) { + super(errorCode); + } +} diff --git a/src/main/java/umc/codeplay/config/SecurityConfig.java b/src/main/java/umc/codeplay/config/SecurityConfig.java index 541df25..1006984 100644 --- a/src/main/java/umc/codeplay/config/SecurityConfig.java +++ b/src/main/java/umc/codeplay/config/SecurityConfig.java @@ -1,42 +1,128 @@ package umc.codeplay.config; +import java.io.IOException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.http.MediaType; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.Customizer; +import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; 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.configurers.AbstractHttpConfigurer; +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.AuthenticationEntryPoint; import org.springframework.security.web.SecurityFilterChain; +import com.fasterxml.jackson.databind.ObjectMapper; +import umc.codeplay.apiPayLoad.ApiResponse; +import umc.codeplay.apiPayLoad.code.status.ErrorStatus; +import umc.codeplay.jwt.JwtAuthenticationFilter; +import umc.codeplay.jwt.JwtUtil; + @EnableWebSecurity @Configuration public class SecurityConfig { - @Bean - public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { - http.authorizeRequests( - (requests) -> - requests - // 인증 없이 접근 가능 - .requestMatchers("/", "/home", "/signup", "/css/**") - .permitAll() - - // 나머지는 인증 있어야 접근 가능 - .anyRequest() - .authenticated()) - .formLogin( - (form) -> - form.loginPage("/login") - .defaultSuccessUrl("/home", true) // 로그인 성공 시 홈으로 - .permitAll() // 로그인 페이지 인증없이 접근 허용 - ) - .logout( - (logout) -> logout.logoutUrl("/logout").logoutSuccessUrl("/login?logout").permitAll()); - return http.build(); - } - - @Bean - public PasswordEncoder passwordEncoder() { - return new BCryptPasswordEncoder(); - } + private final JwtUtil jwtUtil; + + private final ObjectMapper objectMapper; + + public SecurityConfig(JwtUtil jwtUtil, ObjectMapper objectMapper) { + this.jwtUtil = jwtUtil; + this.objectMapper = objectMapper; + } + + // AuthenticationManager 를 빈으로 등록 (스프링 시큐리티 6.x 이상) + @Bean + public AuthenticationManager authenticationManager(AuthenticationConfiguration configuration) + throws Exception { + return configuration.getAuthenticationManager(); + } + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + AuthenticationEntryPoint entryPoint = new CustomAuthenticationEntryPoint(objectMapper); + http + // 세션을 사용하지 않도록 설정 + .sessionManagement( + session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .csrf(AbstractHttpConfigurer::disable) // JWT 사용 시 일반적으로 CSRF 는 disable + .exceptionHandling(exception -> exception.authenticationEntryPoint(entryPoint)) + .authorizeHttpRequests( + auth -> + auth + // 로그인, 회원가입 등 토큰 없이 접근해야 하는 API 허용 + .requestMatchers( + "/auth/signup", + "/auth/login", + "/v2/api-docs", + "/v3/api-docs", + "/v3/api-docs/**", + "/swagger-resources", + "/swagger-resources/**", + "/configuration/ui", + "/configuration/security", + "/swagger-ui/**", + "/webjars/**", + "/swagger-ui.html") + .permitAll() + // 그 외 나머지는 인증 필요 + .anyRequest() + .authenticated()) + // 폼 로그인 등 기본 기능 비활성화 (JWT 만 쓰려면) + .formLogin(Customizer.withDefaults()) + // .formLogin(form -> form.disable()) // 더 엄격하게 폼 로그인 완전히 비활성화할 수도 있음 + .logout(AbstractHttpConfigurer::disable); + + // 커스텀 JWT 필터 추가 + // UsernamePasswordAuthenticationFilter 이전에 동작하도록 설정 + http.addFilterBefore( + new JwtAuthenticationFilter(jwtUtil), + org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter + .class); + + return http.build(); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } + + public static class CustomAuthenticationEntryPoint implements AuthenticationEntryPoint { + + private final ObjectMapper objectMapper; + + public CustomAuthenticationEntryPoint(ObjectMapper objectMapper) { + this.objectMapper = objectMapper; + } + + @Override + public void commence( + HttpServletRequest request, + HttpServletResponse response, + org.springframework.security.core.AuthenticationException authException) + throws IOException, ServletException { + + ApiResponse apiResponse = + ApiResponse.onFailure( + ErrorStatus.NOT_AUTHORIZED.getCode(), + ErrorStatus.NOT_AUTHORIZED.getMessage(), + null); + + response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); + response.setContentType(MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8"); + response.setCharacterEncoding("UTF-8"); + + String jsonResponse = objectMapper.writeValueAsString(apiResponse); + response.getWriter().write(jsonResponse); + } + } } diff --git a/src/main/java/umc/codeplay/config/SwaggerConfig.java b/src/main/java/umc/codeplay/config/SwaggerConfig.java index a693c56..2c856de 100644 --- a/src/main/java/umc/codeplay/config/SwaggerConfig.java +++ b/src/main/java/umc/codeplay/config/SwaggerConfig.java @@ -13,33 +13,34 @@ @Configuration public class SwaggerConfig { - @Bean - public OpenAPI CodePlayAPI() { - - Info info = - new Info() - .title("CodePlay Server API") - .description("UMC 7th Code Play Server API 문서") - .version("1.0"); - - String securitySchemeName = "JWT TOKEN"; - - SecurityRequirement securityRequirement = new SecurityRequirement().addList(securitySchemeName); - - Components components = - new Components() - .addSecuritySchemes( - securitySchemeName, - new SecurityScheme() - .name(securitySchemeName) - .type(SecurityScheme.Type.HTTP) - .scheme("bearer") - .bearerFormat("JWT")); - - return new OpenAPI() - .addServersItem(new Server().url("/")) - .info(info) - .addSecurityItem(securityRequirement) - .components(components); - } + @Bean + public OpenAPI CodePlayAPI() { + + Info info = + new Info() + .title("CodePlay Server API") + .description("UMC 7th Code Play Server API 문서") + .version("1.0"); + + String securitySchemeName = "JWT TOKEN"; + + SecurityRequirement securityRequirement = + new SecurityRequirement().addList(securitySchemeName); + + Components components = + new Components() + .addSecuritySchemes( + securitySchemeName, + new SecurityScheme() + .name(securitySchemeName) + .type(SecurityScheme.Type.HTTP) + .scheme("bearer") + .bearerFormat("JWT")); + + return new OpenAPI() + .addServersItem(new Server().url("/")) + .info(info) + .addSecurityItem(securityRequirement) + .components(components); + } } diff --git a/src/main/java/umc/codeplay/config/security/CustomUserDetailsService.java b/src/main/java/umc/codeplay/config/security/CustomUserDetailsService.java new file mode 100644 index 0000000..5cc649c --- /dev/null +++ b/src/main/java/umc/codeplay/config/security/CustomUserDetailsService.java @@ -0,0 +1,33 @@ +package umc.codeplay.config.security; + +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; + +import lombok.RequiredArgsConstructor; + +import umc.codeplay.apiPayLoad.code.status.ErrorStatus; +import umc.codeplay.apiPayLoad.exception.handler.GeneralHandler; +import umc.codeplay.domain.Member; +import umc.codeplay.repository.MemberRepository; + +@Service +@RequiredArgsConstructor +public class CustomUserDetailsService implements UserDetailsService { + + private final MemberRepository memberRepository; + + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + Member member = + memberRepository + .findByEmail(username) + .orElseThrow(() -> new GeneralHandler(ErrorStatus.MEMBER_NOT_FOUND)); + + return org.springframework.security.core.userdetails.User.withUsername(member.getEmail()) + .password(member.getPassword()) + .roles(member.getRole().name()) + .build(); + } +} diff --git a/src/main/java/umc/codeplay/controller/AuthController.java b/src/main/java/umc/codeplay/controller/AuthController.java new file mode 100644 index 0000000..544cb60 --- /dev/null +++ b/src/main/java/umc/codeplay/controller/AuthController.java @@ -0,0 +1,70 @@ +package umc.codeplay.controller; + +import java.util.Collection; + +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import lombok.RequiredArgsConstructor; + +import umc.codeplay.apiPayLoad.ApiResponse; +import umc.codeplay.apiPayLoad.code.status.ErrorStatus; +import umc.codeplay.apiPayLoad.exception.handler.GeneralHandler; +import umc.codeplay.converter.MemberConverter; +import umc.codeplay.domain.Member; +import umc.codeplay.dto.MemberRequestDTO; +import umc.codeplay.dto.MemberResponseDTO; +import umc.codeplay.jwt.JwtUtil; +import umc.codeplay.service.MemberService; + +@RestController +@RequestMapping("/auth") +@RequiredArgsConstructor +@Validated +public class AuthController { + + private final AuthenticationManager authenticationManager; + private final JwtUtil jwtUtil; + private final MemberService memberService; + + @PostMapping("/login") + public ApiResponse login( + @RequestBody MemberRequestDTO.LoginDto request) { + // 아이디/비밀번호를 사용해 AuthenticationToken 생성 + UsernamePasswordAuthenticationToken authToken = + new UsernamePasswordAuthenticationToken(request.getEmail(), request.getPassword()); + + // 실제 인증 수행 + try { + Authentication authentication = authenticationManager.authenticate(authToken); + + // Role 정보 가져오기 + Collection authorities = authentication.getAuthorities(); + + // 인증에 성공했다면, JWT 토큰 생성 후 반환 + String token = jwtUtil.generateToken(authentication.getName(), authorities); + return ApiResponse.onSuccess( + MemberConverter.toLoginResultDTO(request.getEmail(), token)); // 예시로 토큰만 문자열로 반환 + } catch (Exception e) { + throw new GeneralHandler(ErrorStatus.ID_OR_PASSWORD_WRONG); + } + } + + @PostMapping("/signup") + public ApiResponse join( + @RequestBody MemberRequestDTO.JoinDto request) { + Member member = memberService.joinMember(request); + MemberResponseDTO.JoinResultDTO newJoinResult = MemberConverter.toJoinResultDTO(member); + + return ApiResponse.onSuccess(newJoinResult); + } + + // @GetMapping("/test") + // public ApiResponse test() { + // return ApiResponse.onSuccess(null); + // } +} diff --git a/src/main/java/umc/codeplay/controller/MemberViewController.java b/src/main/java/umc/codeplay/controller/MemberViewController.java deleted file mode 100644 index 638635b..0000000 --- a/src/main/java/umc/codeplay/controller/MemberViewController.java +++ /dev/null @@ -1,40 +0,0 @@ -package umc.codeplay.controller; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -import lombok.RequiredArgsConstructor; - -import umc.codeplay.converter.MemberConverter; -import umc.codeplay.domain.Member; -import umc.codeplay.dto.MemberRequestDTO; -import umc.codeplay.dto.MemberResponseDTO; -import umc.codeplay.service.MemberService; - -@RestController -@RequiredArgsConstructor -public class MemberViewController { - - private final MemberService memberService; - - @GetMapping("/login") - public String login() { - return "login"; - } - - @GetMapping("/signup") - public String signup() { - return "signup"; - } - - @PostMapping("/signup") - public String join(@RequestBody MemberRequestDTO.JoinDto request) { - Member member = memberService.joinMember(request); - MemberResponseDTO.JoinResultDTO newJoinResultDTO = MemberConverter.toJoinResultDTO(member); - // ApiResponse 세팅 필요. - // return ApiResponse.onSuccess(newJoinResultDTO); - return null; - } -} diff --git a/src/main/java/umc/codeplay/converter/MemberConverter.java b/src/main/java/umc/codeplay/converter/MemberConverter.java index 4fdb174..3c750d5 100644 --- a/src/main/java/umc/codeplay/converter/MemberConverter.java +++ b/src/main/java/umc/codeplay/converter/MemberConverter.java @@ -6,16 +6,22 @@ public class MemberConverter { - public static Member toMember(MemberRequestDTO.JoinDto request) { + public static Member toMember(MemberRequestDTO.JoinDto request) { - return Member.builder() - .name(request.getName()) - .email(request.getEmail()) - .password(request.getPassword()) - .build(); - } + return Member.builder() + .name(request.getName()) + .email(request.getEmail()) + .password(request.getPassword()) + .role(request.getRole()) + .build(); + } - public static MemberResponseDTO.JoinResultDTO toJoinResultDTO(Member member) { - return MemberResponseDTO.JoinResultDTO.builder().id(member.getId()).build(); - } + public static MemberResponseDTO.JoinResultDTO toJoinResultDTO(Member member) { + return MemberResponseDTO.JoinResultDTO.builder().id(member.getId()).build(); + } + + public static MemberResponseDTO.LoginResultDTO toLoginResultDTO(String email, String token) { + + return MemberResponseDTO.LoginResultDTO.builder().email(email).token(token).build(); + } } diff --git a/src/main/java/umc/codeplay/domain/Member.java b/src/main/java/umc/codeplay/domain/Member.java index f81a4ef..8d7d6ed 100644 --- a/src/main/java/umc/codeplay/domain/Member.java +++ b/src/main/java/umc/codeplay/domain/Member.java @@ -11,6 +11,8 @@ import lombok.Getter; import lombok.NoArgsConstructor; +import umc.codeplay.domain.enums.Role; + @Entity @Getter @Builder @@ -18,17 +20,19 @@ @AllArgsConstructor public class Member { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String name; - private String name; + private String password; - private String password; + private String email; - private String email; + private Role role; - public void encodePassword(String password) { - this.password = password; - } + public void encodePassword(String password) { + this.password = password; + } } diff --git a/src/main/java/umc/codeplay/domain/enums/Role.java b/src/main/java/umc/codeplay/domain/enums/Role.java new file mode 100644 index 0000000..8645757 --- /dev/null +++ b/src/main/java/umc/codeplay/domain/enums/Role.java @@ -0,0 +1,6 @@ +package umc.codeplay.domain.enums; + +public enum Role { + ADMIN, + USER +} diff --git a/src/main/java/umc/codeplay/dto/MemberRequestDTO.java b/src/main/java/umc/codeplay/dto/MemberRequestDTO.java index 023ff48..b2b28eb 100644 --- a/src/main/java/umc/codeplay/dto/MemberRequestDTO.java +++ b/src/main/java/umc/codeplay/dto/MemberRequestDTO.java @@ -2,12 +2,21 @@ import lombok.Getter; +import umc.codeplay.domain.enums.Role; + public class MemberRequestDTO { - @Getter - public static class JoinDto { - String name; - String email; - String password; - } + @Getter + public static class JoinDto { + String name; + String email; + String password; + Role role; + } + + @Getter + public static class LoginDto { + String email; + String password; + } } diff --git a/src/main/java/umc/codeplay/dto/MemberResponseDTO.java b/src/main/java/umc/codeplay/dto/MemberResponseDTO.java index 22d613f..4b2f811 100644 --- a/src/main/java/umc/codeplay/dto/MemberResponseDTO.java +++ b/src/main/java/umc/codeplay/dto/MemberResponseDTO.java @@ -7,11 +7,20 @@ public class MemberResponseDTO { - @Builder - @Getter - @NoArgsConstructor - @AllArgsConstructor - public static class JoinResultDTO { - Long id; - } + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class JoinResultDTO { + Long id; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class LoginResultDTO { + String email; + String token; + } } diff --git a/src/main/java/umc/codeplay/jwt/JwtAuthenticationFilter.java b/src/main/java/umc/codeplay/jwt/JwtAuthenticationFilter.java new file mode 100644 index 0000000..22a567f --- /dev/null +++ b/src/main/java/umc/codeplay/jwt/JwtAuthenticationFilter.java @@ -0,0 +1,56 @@ +package umc.codeplay.jwt; + +import java.io.IOException; +import java.util.List; +import java.util.stream.Collectors; +import jakarta.servlet.FilterChain; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.web.filter.OncePerRequestFilter; + +public class JwtAuthenticationFilter extends OncePerRequestFilter { + + private final JwtUtil jwtUtil; + + public JwtAuthenticationFilter(JwtUtil jwtUtil) { + this.jwtUtil = jwtUtil; + } + + @Override + protected void doFilterInternal( + HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) + throws IOException, jakarta.servlet.ServletException { + + // 1. Authorization 헤더 파싱 + String authHeader = request.getHeader("Authorization"); + if (authHeader != null && authHeader.startsWith("Bearer ")) { + String token = authHeader.substring(7); + + // 2. 토큰 유효성 검사 + if (jwtUtil.validateToken(token)) { + // 3. 토큰에서 사용자명 추출 + String username = jwtUtil.getUsernameFromToken(token); + + List roles = jwtUtil.getRolesFromToken(token); + + List authorities = + roles.stream() + .map(SimpleGrantedAuthority::new) + .collect(Collectors.toList()); + + UsernamePasswordAuthenticationToken authentication = + new UsernamePasswordAuthenticationToken(username, null, authorities); + + SecurityContextHolder.getContext().setAuthentication(authentication); + } + } + + // 필터 체인 계속 진행 + filterChain.doFilter(request, response); + } +} diff --git a/src/main/java/umc/codeplay/jwt/JwtUtil.java b/src/main/java/umc/codeplay/jwt/JwtUtil.java new file mode 100644 index 0000000..1df8ca6 --- /dev/null +++ b/src/main/java/umc/codeplay/jwt/JwtUtil.java @@ -0,0 +1,90 @@ +package umc.codeplay.jwt; + +import java.security.Key; +import java.util.Collection; +import java.util.Date; +import java.util.List; + +import org.springframework.security.core.GrantedAuthority; +import org.springframework.stereotype.Component; + +import io.jsonwebtoken.*; +import io.jsonwebtoken.security.Keys; + +@Component +public class JwtUtil { + + // 숨겨야합니다 + private final String SECRET_KEY = "thisisthesecretkeyverylongsecretkey"; + + // 30분 만료 + private final long EXPIRATION_TIME = 1000 * 60 * 30; + + private Key getSigningKey() { + return Keys.hmacShaKeyFor(SECRET_KEY.getBytes()); + } + + // JWT 토큰 생성 + public String generateToken( + String username, Collection authorities) { + Date now = new Date(); + + List roleNames = + authorities.stream() + .map(GrantedAuthority::getAuthority) // "ROLE_ADMIN" 등 + .toList(); + + return Jwts.builder() + .setSubject(username) // 사용자 식별 정보 + .setIssuedAt(now) + .claim("roles", roleNames) // 발급 시간 + .setExpiration(new Date(now.getTime() + EXPIRATION_TIME)) // 만료 시간 + .signWith(getSigningKey(), SignatureAlgorithm.HS256) // 서명 (HS256 알고리즘) + .compact(); + } + + // JWT 토큰에서 username 추출 + public String getUsernameFromToken(String token) { + return Jwts.parserBuilder() + .setSigningKey(getSigningKey()) + .build() + .parseClaimsJws(token) + .getBody() + .getSubject(); + } + + // 토큰 유효성 검사 + public boolean validateToken(String token) { + try { + Jwts.parserBuilder().setSigningKey(getSigningKey()).build().parseClaimsJws(token); + return true; + } catch (JwtException | IllegalArgumentException e) { + // 만료되었거나 서명 검증 실패 등 + return false; + } + } + + // 토큰 클레임 요청 + private Claims getAllClaimsFromToken(String token) { + return Jwts.parserBuilder() + .setSigningKey(SECRET_KEY) // 서명 검증을 위한 키 설정 + .build() + .parseClaimsJws(token) + .getBody(); + } + + // 토큰에서 + public List getRolesFromToken(String token) { + Claims claims = getAllClaimsFromToken(token); + + // "roles"라는 이름의 클레임에서 리스트를 꺼냄 + // 저장할 때 List으로 넣었다면, get("roles", List.class) 로 받는 것이 간단함 + List roles = claims.get("roles", List.class); + + // roles 가 null 일 수도 있으므로 안전 처리 + if (roles == null) { + return List.of(); // 빈 리스트 반환 + } + return roles; + } +} diff --git a/src/main/java/umc/codeplay/repository/MemberRepository.java b/src/main/java/umc/codeplay/repository/MemberRepository.java index d6edfa3..611ff78 100644 --- a/src/main/java/umc/codeplay/repository/MemberRepository.java +++ b/src/main/java/umc/codeplay/repository/MemberRepository.java @@ -1,7 +1,11 @@ package umc.codeplay.repository; +import java.util.Optional; + import org.springframework.data.jpa.repository.JpaRepository; import umc.codeplay.domain.Member; -public interface MemberRepository extends JpaRepository {} +public interface MemberRepository extends JpaRepository { + Optional findByEmail(String email); +} diff --git a/src/main/java/umc/codeplay/service/MemberService.java b/src/main/java/umc/codeplay/service/MemberService.java index 6495bf0..48d1bc4 100644 --- a/src/main/java/umc/codeplay/service/MemberService.java +++ b/src/main/java/umc/codeplay/service/MemberService.java @@ -5,6 +5,8 @@ import lombok.RequiredArgsConstructor; +import umc.codeplay.apiPayLoad.code.status.ErrorStatus; +import umc.codeplay.apiPayLoad.exception.handler.GeneralHandler; import umc.codeplay.converter.MemberConverter; import umc.codeplay.domain.Member; import umc.codeplay.dto.MemberRequestDTO; @@ -14,13 +16,17 @@ @RequiredArgsConstructor public class MemberService { - private final MemberRepository memberRepository; - private final PasswordEncoder passwordEncoder; + private final MemberRepository memberRepository; + private final PasswordEncoder passwordEncoder; - public Member joinMember(MemberRequestDTO.JoinDto request) { + public Member joinMember(MemberRequestDTO.JoinDto request) { - Member newMember = MemberConverter.toMember(request); - newMember.encodePassword(passwordEncoder.encode(request.getPassword())); - return memberRepository.save(newMember); - } + if (memberRepository.findByEmail(request.getEmail()).isPresent()) { + throw new GeneralHandler(ErrorStatus.MEMBER_ALREADY_EXISTS); + } + + Member newMember = MemberConverter.toMember(request); + newMember.encodePassword(passwordEncoder.encode(request.getPassword())); + return memberRepository.save(newMember); + } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f5b3116..136705f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,7 +1,28 @@ spring: application: name: codeplay + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/codeplay_test + username: spring + password: minmin8809! + sql: + init: + mode: never # 데이터베이스 초기화 비활성화 config: import: - optional:file:env/local-db.env[.properties] # .env.properties ? ???? ????? + + jpa: + hibernate: + ddl-auto: create # Hibernate 엔티티 스키마 자동 업데이트 + properties: + jakarta.persistence.sharedCache.mode: ALL + hibernate: + dialect: org.hibernate.dialect.MySQLDialect + show_sql: true + format_sql: true + use_sql_comments: true + default_batch_fetch_size: 1000 # 배치 크기 설정 (성능 최적화) + # hbm2ddl.auto는 spring.jpa.hibernate.ddl-auto로 이동 \ No newline at end of file diff --git a/src/test/java/umc/codeplay/CodeplayApplicationTests.java b/src/test/java/umc/codeplay/CodeplayApplicationTests.java index a14fe25..63f4f28 100644 --- a/src/test/java/umc/codeplay/CodeplayApplicationTests.java +++ b/src/test/java/umc/codeplay/CodeplayApplicationTests.java @@ -11,6 +11,6 @@ @ComponentScan(basePackages = "umc.codeplay") class CodeplayApplicationTests { - @Test - void contextLoads() {} + @Test + void contextLoads() {} } From f9f7cb415dff94decda7ce33cfe59309eb662202 Mon Sep 17 00:00:00 2001 From: Kiara <80676180+2020147542@users.noreply.github.com> Date: Sat, 11 Jan 2025 19:15:45 +0900 Subject: [PATCH 12/19] Docker compose (#27) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: read me 수정 * chore: docker compose 사용하여 db 세팅 완료 * docs: db 세팅 readme 수정 --- README.md | 10 ++- build.gradle | 133 ++++++++++++++--------------- env/local.env | 6 +- mysql/.env | 5 ++ mysql/docker-compose.yml | 15 ++++ src/main/resources/application.yml | 16 ++-- 6 files changed, 106 insertions(+), 79 deletions(-) create mode 100644 mysql/.env create mode 100644 mysql/docker-compose.yml diff --git a/README.md b/README.md index 833c362..c1a8421 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,10 @@ # CodePlay-BE -CodePlay Spring Boot + +## CodePlay Spring Boot 파트 팀원 + +- 강슬미(@2020147542), 김민형(@johnjal), 서지민(@SeoJimin1234), 이찬우(@chan0831) + +## ⚡️변경사항 확인 바람⚡️ + +- [Docker를 이용한 DB 세팅 방법 확인하기](https://github.com/UMC-CodePlay/CodePlay-BE/discussions/28) +- [자동 스타일 포맷터 사용법 바로가기](https://github.com/UMC-CodePlay/CodePlay-BE/discussions/3#discussioncomment-11796830) diff --git a/build.gradle b/build.gradle index ace43d1..9288b52 100644 --- a/build.gradle +++ b/build.gradle @@ -1,108 +1,105 @@ plugins { - id 'java' - id 'org.springframework.boot' version '3.3.7' - id 'io.spring.dependency-management' version '1.1.7' - id 'com.diffplug.spotless' version '6.23.3' + id 'java' + id 'org.springframework.boot' version '3.3.7' + id 'io.spring.dependency-management' version '1.1.7' + id 'com.diffplug.spotless' version '6.23.3' } group = 'umc' version = '0.0.1-SNAPSHOT' java { - toolchain { - languageVersion = JavaLanguageVersion.of(17) - } + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } } configurations { - compileOnly { - extendsFrom annotationProcessor - } + compileOnly { + extendsFrom annotationProcessor + } } repositories { - mavenCentral() + mavenCentral() } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-web' - compileOnly 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' - // mysql 사용시 주석 해제 - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - runtimeOnly 'com.mysql:mysql-connector-j' + // mysql 사용시 주석 해제 + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + runtimeOnly 'com.mysql:mysql-connector-j' - // .env 사용 - implementation 'io.github.cdimascio:java-dotenv:5.2.2' + // .env 사용 + implementation 'io.github.cdimascio:java-dotenv:5.2.2' - // 테스트 - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' - testImplementation 'io.rest-assured:rest-assured:5.3.1' - testRuntimeOnly 'com.h2database:h2' + // 테스트 + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + testImplementation 'io.rest-assured:rest-assured:5.3.1' + testRuntimeOnly 'com.h2database:h2' - // 스웨거 - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + // 스웨거 + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - // 스프링 시큐리티 - implementation 'org.springframework.boot:spring-boot-starter-security' - testImplementation 'org.springframework.security:spring-security-test' + // 스프링 시큐리티 + implementation 'org.springframework.boot:spring-boot-starter-security' + testImplementation 'org.springframework.security:spring-security-test' - // thymeleaf 에서 시큐리티 동작 (필요 없음) -// implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.1.RELEASE' + // jwt + implementation 'io.jsonwebtoken:jjwt-api:0.11.5' + runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' + runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5' - // jwt - implementation 'io.jsonwebtoken:jjwt-api:0.11.5' - runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' - runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5' - - // validation - implementation 'org.springframework.boot:spring-boot-starter-validation' + // validation + implementation 'org.springframework.boot:spring-boot-starter-validation' } tasks.named('test') { - useJUnitPlatform() + useJUnitPlatform() } tasks.register('installLocalGitHook', Copy) { - from("${rootProject.rootDir}/.github/hooks") - into("${rootProject.rootDir}/.git/hooks") + from("${rootProject.rootDir}/.github/hooks") + into("${rootProject.rootDir}/.git/hooks") - eachFile { - mode = 0755 - } + eachFile { + mode = 0755 + } - onlyIf { - !file("${rootProject.rootDir}/.git/hooks/pre-commit").exists() - } + onlyIf { + !file("${rootProject.rootDir}/.git/hooks/pre-commit").exists() + } - doLast { - println 'pre-commit 훅이 성공적으로 설치되었습니다.' - } + doLast { + println 'pre-commit 훅이 성공적으로 설치되었습니다.' + } } spotless { - java { - googleJavaFormat().aosp() // Google Java 포맷 적용 - importOrder( - 'java|javax|jakarta', - 'org.springframework', - 'lombok', - '', - 'org.junit|org.mockito', - '\\#', - '\\#org.junit' - ) // 이 순서로 import문 정렬 - removeUnusedImports() // 사용하지 않는 import문 제거 - trimTrailingWhitespace() // 각 라인 끝의 공백 제거 - endWithNewline() // 파일 끝에 항상 새로운 줄 추가 - formatAnnotations() // 어노테이션 정렬 - } + java { + googleJavaFormat().aosp() // Google Java 포맷 적용 + importOrder( + 'java|javax|jakarta', + 'org.springframework', + 'lombok', + '', + 'org.junit|org.mockito', + '\\#', + '\\#org.junit' + ) // 이 순서로 import문 정렬 + removeUnusedImports() // 사용하지 않는 import문 제거 + trimTrailingWhitespace() // 각 라인 끝의 공백 제거 + endWithNewline() // 파일 끝에 항상 새로운 줄 추가 + formatAnnotations() // 어노테이션 정렬 + } } tasks.named('compileJava') { - dependsOn 'installLocalGitHook' - dependsOn 'spotlessApply' + dependsOn 'installLocalGitHook' + dependsOn 'spotlessApply' } diff --git a/env/local.env b/env/local.env index 6be0624..cee8264 100644 --- a/env/local.env +++ b/env/local.env @@ -1,7 +1,7 @@ # MySQL 설정 -DB_URL= -MYSQL_USERNAME= -MYSQL_PASSWORD= +DB_URL=jdbc:mysql://localhost:3306/codeplay_local +MYSQL_USERNAME=codeplay +MYSQL_PASSWORD=QWER1234QWER1234XCVBNMASDFGH # Spring Boot 설정 diff --git a/mysql/.env b/mysql/.env new file mode 100644 index 0000000..d578ea8 --- /dev/null +++ b/mysql/.env @@ -0,0 +1,5 @@ +MYSQL_DATABASE=codeplay_local +MYSQL_USER=codeplay +MYSQL_PASSWORD=QWER1234QWER1234XCVBNMASDFGH +MYSQL_ROOT_PASSWORD=QWER1234QWER1234XCVBNMASDFGH +TZ=Asia/Seoul diff --git a/mysql/docker-compose.yml b/mysql/docker-compose.yml new file mode 100644 index 0000000..b5ffa6c --- /dev/null +++ b/mysql/docker-compose.yml @@ -0,0 +1,15 @@ +name: CodePlayDB + +services: + mysql: + container_name: mysql + image: mysql:latest + ports: + - 3306:3306 + volumes: + - data:/var/lib/mysql # Docker 볼륨 사용 + env_file: .env + restart: always + +volumes: + data: \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 136705f..4b22d6e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,19 +1,21 @@ spring: application: name: codeplay + + config: + import: + - optional:file:env/local.env[.properties] + datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/codeplay_test - username: spring - password: minmin8809! + url: ${DB_URL} + username: ${MYSQL_USERNAME} + password: ${MYSQL_PASSWORD} + sql: init: mode: never # 데이터베이스 초기화 비활성화 - config: - import: - - optional:file:env/local-db.env[.properties] # .env.properties ? ???? ????? - jpa: hibernate: ddl-auto: create # Hibernate 엔티티 스키마 자동 업데이트 From 94023301b58da44542c385f73824c94eeba4fd55 Mon Sep 17 00:00:00 2001 From: Kiara <80676180+2020147542@users.noreply.github.com> Date: Sat, 11 Jan 2025 19:40:36 +0900 Subject: [PATCH 13/19] =?UTF-8?q?=ED=99=98=EA=B2=BD=EB=B3=80=EC=88=98=20.e?= =?UTF-8?q?nv=EB=A1=9C=20=EC=98=AE=EA=B9=80=20(#29)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * .env에 환경 변수 추가 * [style] 스타일 수정 --- env/local.env | 1 + .../umc/codeplay/apiPayLoad/ApiResponse.java | 1 - .../codeplay/apiPayLoad/code/ErrorReasonDTO.java | 2 +- .../umc/codeplay/apiPayLoad/code/ReasonDTO.java | 2 +- src/main/java/umc/codeplay/jwt/JwtUtil.java | 16 +++++++++++----- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/env/local.env b/env/local.env index cee8264..d071728 100644 --- a/env/local.env +++ b/env/local.env @@ -4,6 +4,7 @@ MYSQL_USERNAME=codeplay MYSQL_PASSWORD=QWER1234QWER1234XCVBNMASDFGH # Spring Boot 설정 +JWT_SECRET=qwertyuiopokjhSDFGHJKIUYTREDCVBNMKIJKJHGFHYTRFCVBGFDSXCVBHH # AWS S3 settings diff --git a/src/main/java/umc/codeplay/apiPayLoad/ApiResponse.java b/src/main/java/umc/codeplay/apiPayLoad/ApiResponse.java index bd6cea8..eb02ee1 100644 --- a/src/main/java/umc/codeplay/apiPayLoad/ApiResponse.java +++ b/src/main/java/umc/codeplay/apiPayLoad/ApiResponse.java @@ -24,7 +24,6 @@ public class ApiResponse { private T result; // 성공한 경우 응답 생성 - public static ApiResponse onSuccess(T result) { return new ApiResponse<>( true, SuccessStatus._OK.getCode(), SuccessStatus._OK.getMessage(), result); diff --git a/src/main/java/umc/codeplay/apiPayLoad/code/ErrorReasonDTO.java b/src/main/java/umc/codeplay/apiPayLoad/code/ErrorReasonDTO.java index 7916e0f..83b0bcc 100644 --- a/src/main/java/umc/codeplay/apiPayLoad/code/ErrorReasonDTO.java +++ b/src/main/java/umc/codeplay/apiPayLoad/code/ErrorReasonDTO.java @@ -7,7 +7,7 @@ @Getter @Builder -public class ErrorReasonDTO { // ?? +public class ErrorReasonDTO { private HttpStatus httpStatus; diff --git a/src/main/java/umc/codeplay/apiPayLoad/code/ReasonDTO.java b/src/main/java/umc/codeplay/apiPayLoad/code/ReasonDTO.java index d15f42e..ae41f19 100644 --- a/src/main/java/umc/codeplay/apiPayLoad/code/ReasonDTO.java +++ b/src/main/java/umc/codeplay/apiPayLoad/code/ReasonDTO.java @@ -7,7 +7,7 @@ @Getter @Builder -public class ReasonDTO { // ?? +public class ReasonDTO { private HttpStatus httpStatus; diff --git a/src/main/java/umc/codeplay/jwt/JwtUtil.java b/src/main/java/umc/codeplay/jwt/JwtUtil.java index 1df8ca6..a44d03a 100644 --- a/src/main/java/umc/codeplay/jwt/JwtUtil.java +++ b/src/main/java/umc/codeplay/jwt/JwtUtil.java @@ -5,20 +5,24 @@ import java.util.Date; import java.util.List; +import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.GrantedAuthority; import org.springframework.stereotype.Component; -import io.jsonwebtoken.*; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.JwtException; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; import io.jsonwebtoken.security.Keys; @Component public class JwtUtil { - // 숨겨야합니다 - private final String SECRET_KEY = "thisisthesecretkeyverylongsecretkey"; + private final String SECRET_KEY; - // 30분 만료 - private final long EXPIRATION_TIME = 1000 * 60 * 30; + public JwtUtil(@Value("${JWT_SECRET}") String secretKey) { + this.SECRET_KEY = secretKey; + } private Key getSigningKey() { return Keys.hmacShaKeyFor(SECRET_KEY.getBytes()); @@ -34,6 +38,8 @@ public String generateToken( .map(GrantedAuthority::getAuthority) // "ROLE_ADMIN" 등 .toList(); + // 30분 만료 + long EXPIRATION_TIME = 1000 * 60 * 30L; return Jwts.builder() .setSubject(username) // 사용자 식별 정보 .setIssuedAt(now) From 51944f4656797a6d23b58f987c689477184a2427 Mon Sep 17 00:00:00 2001 From: Minhyung Kim Date: Sat, 18 Jan 2025 11:58:26 +0900 Subject: [PATCH 14/19] =?UTF-8?q?[feat]=20=EB=A6=AC=ED=94=84=EB=A0=88?= =?UTF-8?q?=EC=8B=9C=20=ED=86=A0=ED=81=B0=20(#49)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Authorization feature * Authentication feature implemented * bug fix * refresh token * minor issues fixed --- .../apiPayLoad/code/status/ErrorStatus.java | 3 +- .../umc/codeplay/config/SecurityConfig.java | 4 +- .../codeplay/controller/AuthController.java | 47 +++++++++++++++++-- .../codeplay/converter/MemberConverter.java | 9 +++- .../umc/codeplay/dto/MemberResponseDTO.java | 1 + .../codeplay/jwt/JwtAuthenticationFilter.java | 3 +- src/main/java/umc/codeplay/jwt/JwtUtil.java | 31 +++++++++++- src/main/resources/application.yml | 8 ++-- 8 files changed, 91 insertions(+), 15 deletions(-) diff --git a/src/main/java/umc/codeplay/apiPayLoad/code/status/ErrorStatus.java b/src/main/java/umc/codeplay/apiPayLoad/code/status/ErrorStatus.java index d60254d..df8f9a0 100644 --- a/src/main/java/umc/codeplay/apiPayLoad/code/status/ErrorStatus.java +++ b/src/main/java/umc/codeplay/apiPayLoad/code/status/ErrorStatus.java @@ -22,7 +22,8 @@ public enum ErrorStatus implements BaseErrorCode { MEMBER_ALREADY_EXISTS(HttpStatus.BAD_REQUEST, "MEMBER401", "유저가 이미 존재합니다."), NOT_AUTHORIZED(HttpStatus.BAD_REQUEST, "AUTH400", "인증되지 않은 요청입니다."), - ID_OR_PASSWORD_WRONG(HttpStatus.BAD_REQUEST, "AUTH401", "아이디 혹은 비밀번호가 잘못되었습니다."); + ID_OR_PASSWORD_WRONG(HttpStatus.BAD_REQUEST, "AUTH401", "아이디 혹은 비밀번호가 잘못되었습니다."), + INVALID_REFRESH_TOKEN(HttpStatus.BAD_REQUEST, "AUTH402", "유효하지 않은 리프레시 토큰입니다."); private final HttpStatus httpStatus; private final String code; diff --git a/src/main/java/umc/codeplay/config/SecurityConfig.java b/src/main/java/umc/codeplay/config/SecurityConfig.java index 1006984..44b51f2 100644 --- a/src/main/java/umc/codeplay/config/SecurityConfig.java +++ b/src/main/java/umc/codeplay/config/SecurityConfig.java @@ -60,6 +60,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti auth // 로그인, 회원가입 등 토큰 없이 접근해야 하는 API 허용 .requestMatchers( + "/auth/refresh", "/auth/signup", "/auth/login", "/v2/api-docs", @@ -78,7 +79,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti .authenticated()) // 폼 로그인 등 기본 기능 비활성화 (JWT 만 쓰려면) .formLogin(Customizer.withDefaults()) - // .formLogin(form -> form.disable()) // 더 엄격하게 폼 로그인 완전히 비활성화할 수도 있음 + // .formLogin(form -> form.disable()) // 더 엄격하게 + // 폼 로그인 완전히 비활성화할 수도 있음 .logout(AbstractHttpConfigurer::disable); // 커스텀 JWT 필터 추가 diff --git a/src/main/java/umc/codeplay/controller/AuthController.java b/src/main/java/umc/codeplay/controller/AuthController.java index 544cb60..a082dae 100644 --- a/src/main/java/umc/codeplay/controller/AuthController.java +++ b/src/main/java/umc/codeplay/controller/AuthController.java @@ -1,16 +1,19 @@ package umc.codeplay.controller; import java.util.Collection; +import java.util.stream.Collectors; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import lombok.RequiredArgsConstructor; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; import umc.codeplay.apiPayLoad.ApiResponse; import umc.codeplay.apiPayLoad.code.status.ErrorStatus; import umc.codeplay.apiPayLoad.exception.handler.GeneralHandler; @@ -47,8 +50,11 @@ public ApiResponse login( // 인증에 성공했다면, JWT 토큰 생성 후 반환 String token = jwtUtil.generateToken(authentication.getName(), authorities); + String refreshToken = + jwtUtil.generateRefreshToken(authentication.getName(), authorities); return ApiResponse.onSuccess( - MemberConverter.toLoginResultDTO(request.getEmail(), token)); // 예시로 토큰만 문자열로 반환 + MemberConverter.toLoginResultDTO( + request.getEmail(), token, refreshToken)); // 예시로 토큰만 문자열로 반환 } catch (Exception e) { throw new GeneralHandler(ErrorStatus.ID_OR_PASSWORD_WRONG); } @@ -63,8 +69,39 @@ public ApiResponse join( return ApiResponse.onSuccess(newJoinResult); } - // @GetMapping("/test") - // public ApiResponse test() { - // return ApiResponse.onSuccess(null); - // } + @PostMapping("/refresh") + public ApiResponse refresh( + @RequestHeader("Refresh-Token") String refreshToken, + @RequestParam("email") String email) { + // 리프레시 토큰 유효성 검사 + if (jwtUtil.validateToken(refreshToken) + && (jwtUtil.getTypeFromToken(refreshToken).equals("refresh"))) { + // 리프레시 토큰에서 사용자명 추출 + String usernameFromToken = jwtUtil.getUsernameFromToken(refreshToken); + + if (!email.equals(usernameFromToken)) { + throw new GeneralHandler(ErrorStatus.INVALID_REFRESH_TOKEN); + } + + // 사용자 권한 정보 가져오기 + Collection authorities = + jwtUtil.getRolesFromToken(refreshToken).stream() + .map(SimpleGrantedAuthority::new) + .collect(Collectors.toList()); + + // 새로운 액세스 토큰 생성 + String newAccessToken = jwtUtil.generateToken(usernameFromToken, authorities); + + return ApiResponse.onSuccess( + MemberConverter.toLoginResultDTO(usernameFromToken, newAccessToken, null)); + } else { + throw new GeneralHandler(ErrorStatus.INVALID_REFRESH_TOKEN); + } + } + + @SecurityRequirement(name = "JWT TOKEN") + @GetMapping("/test") + public ApiResponse test() { + return ApiResponse.onSuccess("test"); + } } diff --git a/src/main/java/umc/codeplay/converter/MemberConverter.java b/src/main/java/umc/codeplay/converter/MemberConverter.java index 3c750d5..7c5c0b8 100644 --- a/src/main/java/umc/codeplay/converter/MemberConverter.java +++ b/src/main/java/umc/codeplay/converter/MemberConverter.java @@ -20,8 +20,13 @@ public static MemberResponseDTO.JoinResultDTO toJoinResultDTO(Member member) { return MemberResponseDTO.JoinResultDTO.builder().id(member.getId()).build(); } - public static MemberResponseDTO.LoginResultDTO toLoginResultDTO(String email, String token) { + public static MemberResponseDTO.LoginResultDTO toLoginResultDTO( + String email, String token, String refreshToken) { - return MemberResponseDTO.LoginResultDTO.builder().email(email).token(token).build(); + return MemberResponseDTO.LoginResultDTO.builder() + .email(email) + .token(token) + .refreshToken(refreshToken) + .build(); } } diff --git a/src/main/java/umc/codeplay/dto/MemberResponseDTO.java b/src/main/java/umc/codeplay/dto/MemberResponseDTO.java index 4b2f811..dd2a4b2 100644 --- a/src/main/java/umc/codeplay/dto/MemberResponseDTO.java +++ b/src/main/java/umc/codeplay/dto/MemberResponseDTO.java @@ -22,5 +22,6 @@ public static class JoinResultDTO { public static class LoginResultDTO { String email; String token; + String refreshToken; } } diff --git a/src/main/java/umc/codeplay/jwt/JwtAuthenticationFilter.java b/src/main/java/umc/codeplay/jwt/JwtAuthenticationFilter.java index 22a567f..9251fb2 100644 --- a/src/main/java/umc/codeplay/jwt/JwtAuthenticationFilter.java +++ b/src/main/java/umc/codeplay/jwt/JwtAuthenticationFilter.java @@ -32,7 +32,8 @@ protected void doFilterInternal( String token = authHeader.substring(7); // 2. 토큰 유효성 검사 - if (jwtUtil.validateToken(token)) { + if (jwtUtil.validateToken(token) + && (jwtUtil.getTypeFromToken(token).equals("access"))) { // 3. 토큰에서 사용자명 추출 String username = jwtUtil.getUsernameFromToken(token); diff --git a/src/main/java/umc/codeplay/jwt/JwtUtil.java b/src/main/java/umc/codeplay/jwt/JwtUtil.java index a44d03a..466e4fb 100644 --- a/src/main/java/umc/codeplay/jwt/JwtUtil.java +++ b/src/main/java/umc/codeplay/jwt/JwtUtil.java @@ -43,6 +43,7 @@ public String generateToken( return Jwts.builder() .setSubject(username) // 사용자 식별 정보 .setIssuedAt(now) + .claim("type", "access") .claim("roles", roleNames) // 발급 시간 .setExpiration(new Date(now.getTime() + EXPIRATION_TIME)) // 만료 시간 .signWith(getSigningKey(), SignatureAlgorithm.HS256) // 서명 (HS256 알고리즘) @@ -73,7 +74,7 @@ public boolean validateToken(String token) { // 토큰 클레임 요청 private Claims getAllClaimsFromToken(String token) { return Jwts.parserBuilder() - .setSigningKey(SECRET_KEY) // 서명 검증을 위한 키 설정 + .setSigningKey(getSigningKey()) // 서명 검증을 위한 키 설정 .build() .parseClaimsJws(token) .getBody(); @@ -93,4 +94,32 @@ public List getRolesFromToken(String token) { } return roles; } + + // JWT 리프레시 토큰 생성 + public String generateRefreshToken( + String username, Collection authorities) { + Date now = new Date(); + + List roleNames = + authorities.stream() + .map(GrantedAuthority::getAuthority) // "ROLE_ADMIN" 등 + .toList(); + + // 1일 만료 + long EXPIRATION_TIME = 1000 * 60 * 60 * 24L; + return Jwts.builder() + .setSubject(username) // 사용자 식별 정보 + .setIssuedAt(now) + .claim("type", "refresh") + .claim("roles", roleNames) // 역할 정보 추가 + .setExpiration(new Date(now.getTime() + EXPIRATION_TIME)) // 만료 시간 + .signWith(getSigningKey(), SignatureAlgorithm.HS256) // 서명 (HS256 알고리즘) + .compact(); + } + + // 토큰에서 type 추출 + public String getTypeFromToken(String token) { + Claims claims = getAllClaimsFromToken(token); + return claims.get("type", String.class); + } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 4b22d6e..df5a644 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -12,13 +12,13 @@ spring: username: ${MYSQL_USERNAME} password: ${MYSQL_PASSWORD} - sql: - init: - mode: never # 데이터베이스 초기화 비활성화 + sql: + init: + mode: never # 데이터베이스 초기화 비활성화 jpa: hibernate: - ddl-auto: create # Hibernate 엔티티 스키마 자동 업데이트 + ddl-auto: update # Hibernate 엔티티 스키마 자동 업데이트 properties: jakarta.persistence.sharedCache.mode: ALL hibernate: From 4525a2108160272d7e8a2bacd7aa18fde0cbb441 Mon Sep 17 00:00:00 2001 From: Kiara <80676180+2020147542@users.noreply.github.com> Date: Sat, 18 Jan 2025 19:45:57 +0900 Subject: [PATCH 15/19] =?UTF-8?q?[Feat]=20=EB=B0=B0=ED=8F=AC=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=20=EC=84=A4=EC=A0=95=20=EB=B0=8F=20docker=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=83=9D=EC=84=B1=20(#50)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Feat] 배포 환경 설정 및 docker 파일 생성 * [Feat] 배포 docker compose 파일 수정 * [Feat] local 환경 변수 제거 --- .github/workflows/docker-deploy.yml | 59 ++++++++++++++++++++++ build.gradle | 16 ++++++ docker/deploy/docker-compose.yml | 41 +++++++++++++++ {mysql => docker/local}/docker-compose.yml | 2 +- mysql/.env => env/local-db.env | 0 env/{local.env => local-spring.env} | 0 env/prod-db.env | 5 ++ env/prod-spring.env | 14 +++++ src/main/resources/application-prod.yml | 29 +++++++++++ src/main/resources/application.yml | 5 +- 10 files changed, 167 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/docker-deploy.yml create mode 100644 docker/deploy/docker-compose.yml rename {mysql => docker/local}/docker-compose.yml (85%) rename mysql/.env => env/local-db.env (100%) rename env/{local.env => local-spring.env} (100%) create mode 100644 env/prod-db.env create mode 100644 env/prod-spring.env create mode 100644 src/main/resources/application-prod.yml diff --git a/.github/workflows/docker-deploy.yml b/.github/workflows/docker-deploy.yml new file mode 100644 index 0000000..e2a5fdf --- /dev/null +++ b/.github/workflows/docker-deploy.yml @@ -0,0 +1,59 @@ +name: Build and Push Docker Image to ECR and Deploy on EC2 + +on: + push: + branches: + - main + +jobs: + build-and-push: + runs-on: ubuntu-latest + + steps: + - name: ✔️ 리포지토리 가져오기 + uses: actions/checkout@v4 + + - name: ✔️ JDK 17 설치 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + + - name: ✔️ Gradle 명령 실행 권한 설정 + run: chmod +x gradlew + + - name: ✔️ Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v2 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: ${{ secrets.AWS_DEFAULT_REGION }} + + - name: ✔️ Amazon ECR에 로그인 + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 + + - name: ✔️ Docker Image 빌드 및 ECR에 push + env: + ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} + ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY_NAME }} + IMAGE_TAG: ${{ github.sha }} + run: | + ./gradlew jib \ + -Djib.to.image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG + + run-images-on-ec2: + needs: build-and-push + runs-on: ubuntu-latest + + steps: + - name: ✔️ EC2 접속 및 배포 스크립트 실행 + uses: appleboy/ssh-action@v0.1.6 + with: + host: ${{ secrets.SSH_HOST_NAME }} + username: ${{ secrets.SSH_USER_NAME }} + key: ${{ secrets.SSH_PRIVATE_KEY }} + port: ${{ secrets.SSH_PORT }} + script: | + cd deploy-script + sh ./deploy.sh \ No newline at end of file diff --git a/build.gradle b/build.gradle index 9288b52..5f5c061 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,7 @@ plugins { id 'org.springframework.boot' version '3.3.7' id 'io.spring.dependency-management' version '1.1.7' id 'com.diffplug.spotless' version '6.23.3' + id 'com.google.cloud.tools.jib' version '3.4.3' } group = 'umc' @@ -103,3 +104,18 @@ tasks.named('compileJava') { dependsOn 'installLocalGitHook' dependsOn 'spotlessApply' } + +jib { + from { + image = 'openjdk:17-alpine' + } + to { + image = 'code-play-image' + tags = ['latest'] + } + container { + jvmFlags = ['-Xms512m'] + format = 'OCI' + creationTime = 'USE_CURRENT_TIMESTAMP' + } +} diff --git a/docker/deploy/docker-compose.yml b/docker/deploy/docker-compose.yml new file mode 100644 index 0000000..66811a0 --- /dev/null +++ b/docker/deploy/docker-compose.yml @@ -0,0 +1,41 @@ +name: CodePlay + +services: + database: + container_name: codeplay-db + image: mysql:latest + env_file: prod-db.env + volumes: + - /home/ubuntu/deploy-db:/var/lib/mysql + ports: + - "3306:3306" + networks: + - umc_code_play + command: [ "--character-set-server=utf8mb4","--collation-server=utf8mb4_unicode_ci" ] # MySQL 서버가 실행될 때 사용할 문자셋 및 정렬 규칙 지정 + restart: always + healthcheck: + test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ] + interval: 10s + timeout: 5s + retries: 5 + + application: + container_name: codeplay-app + image: code-play-image:latest + env_file: prod-spring.env + ports: + - "8080:8080" + networks: + - umc_code_play + restart: always + depends_on: + - database + healthcheck: + test: [ "CMD", "curl", "-f", "http://localhost:8080/actuator/health" ] + interval: 20s + timeout: 10s + retries: 5 + +networks: + umc_code_play: + driver: bridge # "브리지 네트워크"를 자동 생성하고 컨테이너 간 통신이 가능하도록 설정 \ No newline at end of file diff --git a/mysql/docker-compose.yml b/docker/local/docker-compose.yml similarity index 85% rename from mysql/docker-compose.yml rename to docker/local/docker-compose.yml index b5ffa6c..4bb63ad 100644 --- a/mysql/docker-compose.yml +++ b/docker/local/docker-compose.yml @@ -8,7 +8,7 @@ services: - 3306:3306 volumes: - data:/var/lib/mysql # Docker 볼륨 사용 - env_file: .env + env_file: ../../env/local-db.env restart: always volumes: diff --git a/mysql/.env b/env/local-db.env similarity index 100% rename from mysql/.env rename to env/local-db.env diff --git a/env/local.env b/env/local-spring.env similarity index 100% rename from env/local.env rename to env/local-spring.env diff --git a/env/prod-db.env b/env/prod-db.env new file mode 100644 index 0000000..5bc2231 --- /dev/null +++ b/env/prod-db.env @@ -0,0 +1,5 @@ +MYSQL_DATABASE=codeplay_prod +MYSQL_USER=codeplay +MYSQL_PASSWORD=QWER1234QWER1234XCVBNMASDFGH +MYSQL_ROOT_PASSWORD=QWER1234QWER1234XCVBNMASDFGH +TZ=Asia/Seoul \ No newline at end of file diff --git a/env/prod-spring.env b/env/prod-spring.env new file mode 100644 index 0000000..b335105 --- /dev/null +++ b/env/prod-spring.env @@ -0,0 +1,14 @@ +# MySQL 설정 +DB_URL=jdbc:mysql://codeplay-db:3306/codeplay_prod?useSSL=false&allowPublicKeyRetrieval=true +MYSQL_USERNAME=codeplay +MYSQL_PASSWORD=QWER1234QWER1234XCVBNMASDFGH + +# Spring Boot 설정 +SPRING_PROFILES_ACTIVE=prod +JWT_SECRET=qwertyuiopokjhSDFGHJKIUYTREDCVBNMKIJKJHGFHYTRFCVBGFDSXCVBHH + +# AWS S3 settings + +# Kakao settings + +# Google settings \ No newline at end of file diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml new file mode 100644 index 0000000..e1c85a5 --- /dev/null +++ b/src/main/resources/application-prod.yml @@ -0,0 +1,29 @@ +spring: + application: + name: codeplay + + config: + import: + - optional:file:env/prod-spring.env[.properties] + + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: ${DB_URL} + username: ${MYSQL_USERNAME} + password: ${MYSQL_PASSWORD} + + sql: + init: + mode: never # 데이터베이스 초기화 비활성화 + + jpa: + hibernate: + ddl-auto: update # Hibernate 엔티티 스키마 자동 업데이트 + properties: + jakarta.persistence.sharedCache.mode: ALL + hibernate: + dialect: org.hibernate.dialect.MySQLDialect + show_sql: true + format_sql: true + use_sql_comments: true + default_batch_fetch_size: 1000 # 배치 크기 설정 (성능 최적화) \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index df5a644..30d35b5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,7 +4,7 @@ spring: config: import: - - optional:file:env/local.env[.properties] + - optional:file:env/local-spring.env[.properties] datasource: driver-class-name: com.mysql.cj.jdbc.Driver @@ -26,5 +26,4 @@ spring: show_sql: true format_sql: true use_sql_comments: true - default_batch_fetch_size: 1000 # 배치 크기 설정 (성능 최적화) - # hbm2ddl.auto는 spring.jpa.hibernate.ddl-auto로 이동 \ No newline at end of file + default_batch_fetch_size: 1000 # 배치 크기 설정 (성능 최적화) \ No newline at end of file From 2298f63958808ded39b657da971dd77773f10aa4 Mon Sep 17 00:00:00 2001 From: Kiara <80676180+2020147542@users.noreply.github.com> Date: Sat, 18 Jan 2025 23:06:52 +0900 Subject: [PATCH 16/19] [Chore] Docker setting (#53) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Feat] 배포 환경 설정 및 docker 파일 생성 * [Feat] 배포 docker compose 파일 수정 * [Feat] local 환경 변수 제거 * [Docs] Readme 수정 * [Chore] 배포 docker 파일 변경 및 health check api 추가 --- README.md | 1 + docker/deploy/deploy.sh | 23 +++++++++++++++++++ docker/deploy/docker-compose.yml | 4 ++-- .../umc/codeplay/config/SecurityConfig.java | 1 + .../umc/codeplay/controller/HealthCheck.java | 13 +++++++++++ 5 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 docker/deploy/deploy.sh create mode 100644 src/main/java/umc/codeplay/controller/HealthCheck.java diff --git a/README.md b/README.md index c1a8421..9e9b9e2 100644 --- a/README.md +++ b/README.md @@ -6,5 +6,6 @@ ## ⚡️변경사항 확인 바람⚡️ +- [배포 과정 설명](https://github.com/UMC-CodePlay/CodePlay-BE/discussions/52) - [Docker를 이용한 DB 세팅 방법 확인하기](https://github.com/UMC-CodePlay/CodePlay-BE/discussions/28) - [자동 스타일 포맷터 사용법 바로가기](https://github.com/UMC-CodePlay/CodePlay-BE/discussions/3#discussioncomment-11796830) diff --git a/docker/deploy/deploy.sh b/docker/deploy/deploy.sh new file mode 100644 index 0000000..32e0e1c --- /dev/null +++ b/docker/deploy/deploy.sh @@ -0,0 +1,23 @@ +# ECR에서 최신 이미지 pull +echo "ECR에 있는 이미지 불러오기" +if ! docker pull 120569606420.dkr.ecr.ap-northeast-2.amazonaws.com/umc/code-play:latest; then + echo "이미지 불러오기에 실패했습니다." + exit 1 +fi + +# Docker compose down으로 기존 컨테이너 중지 및 삭제 +echo "Docker compose down 실행" +docker compose down + +# Docker compose up 실행 +echo "Docker compose up 실행" +if ! docker compose up -d; then + echo "컨테이너 실행에 실패했습니다" + exit 1 +fi + +# dangling 이미지 삭제 +echo "dangling 이미지 삭제" +docker image prune -f + +echo "모든 작업이 완료되었습니다." \ No newline at end of file diff --git a/docker/deploy/docker-compose.yml b/docker/deploy/docker-compose.yml index 66811a0..bac4dc5 100644 --- a/docker/deploy/docker-compose.yml +++ b/docker/deploy/docker-compose.yml @@ -21,7 +21,7 @@ services: application: container_name: codeplay-app - image: code-play-image:latest + image: 120569606420.dkr.ecr.ap-northeast-2.amazonaws.com/umc/code-play:latest env_file: prod-spring.env ports: - "8080:8080" @@ -31,7 +31,7 @@ services: depends_on: - database healthcheck: - test: [ "CMD", "curl", "-f", "http://localhost:8080/actuator/health" ] + test: [ "CMD", "curl", "-f", "http://localhost:8080/health" ] interval: 20s timeout: 10s retries: 5 diff --git a/src/main/java/umc/codeplay/config/SecurityConfig.java b/src/main/java/umc/codeplay/config/SecurityConfig.java index 44b51f2..fca2218 100644 --- a/src/main/java/umc/codeplay/config/SecurityConfig.java +++ b/src/main/java/umc/codeplay/config/SecurityConfig.java @@ -60,6 +60,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti auth // 로그인, 회원가입 등 토큰 없이 접근해야 하는 API 허용 .requestMatchers( + "/health", "/auth/refresh", "/auth/signup", "/auth/login", diff --git a/src/main/java/umc/codeplay/controller/HealthCheck.java b/src/main/java/umc/codeplay/controller/HealthCheck.java new file mode 100644 index 0000000..e2b002a --- /dev/null +++ b/src/main/java/umc/codeplay/controller/HealthCheck.java @@ -0,0 +1,13 @@ +package umc.codeplay.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HealthCheck { + + @GetMapping("/health") + public String healthCheck() { + return "OK"; + } +} From 321fc61ca8d1e2d74044a8390078e5f279670148 Mon Sep 17 00:00:00 2001 From: Kiara <80676180+2020147542@users.noreply.github.com> Date: Sat, 18 Jan 2025 23:26:40 +0900 Subject: [PATCH 17/19] =?UTF-8?q?[Chore]=20github=20action=20=EB=B0=B0?= =?UTF-8?q?=ED=8F=AC=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20(#55)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Feat] 배포 환경 설정 및 docker 파일 생성 * [Feat] 배포 docker compose 파일 수정 * [Feat] local 환경 변수 제거 * [Docs] Readme 수정 * [Chore] 배포 docker 파일 변경 및 health check api 추가 * [Chore] github action push -> pr로 변경 --- .github/workflows/docker-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-deploy.yml b/.github/workflows/docker-deploy.yml index e2a5fdf..3ca259b 100644 --- a/.github/workflows/docker-deploy.yml +++ b/.github/workflows/docker-deploy.yml @@ -1,7 +1,7 @@ name: Build and Push Docker Image to ECR and Deploy on EC2 on: - push: + pull_request: branches: - main From 65aceba1414454e1a9395d2b2d775cba61c9f9a6 Mon Sep 17 00:00:00 2001 From: Kiara <80676180+2020147542@users.noreply.github.com> Date: Sun, 19 Jan 2025 02:32:55 +0900 Subject: [PATCH 18/19] =?UTF-8?q?[fix]=20responseEntity=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=20(#57)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/umc/codeplay/controller/HealthCheck.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/umc/codeplay/controller/HealthCheck.java b/src/main/java/umc/codeplay/controller/HealthCheck.java index e2b002a..c8f7bcc 100644 --- a/src/main/java/umc/codeplay/controller/HealthCheck.java +++ b/src/main/java/umc/codeplay/controller/HealthCheck.java @@ -1,5 +1,6 @@ package umc.codeplay.controller; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -7,7 +8,7 @@ public class HealthCheck { @GetMapping("/health") - public String healthCheck() { - return "OK"; + public ResponseEntity healthCheck() { + return ResponseEntity.ok("UMC 7th CodePlay Well Connected!"); } } From 19b30b72b6c99583b2f4a7be23743d4016423ff2 Mon Sep 17 00:00:00 2001 From: Kiara <80676180+2020147542@users.noreply.github.com> Date: Sun, 19 Jan 2025 03:08:22 +0900 Subject: [PATCH 19/19] =?UTF-8?q?[Feat]=20client=20=EC=9A=94=EC=B2=AD?= =?UTF-8?q?=EC=8B=9C=20cors=20=EC=A0=84=EC=B2=B4=20=ED=97=88=EC=9A=A9?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=84=A4=EC=A0=95=20(#59)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/umc/codeplay/config/WebConfig.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/main/java/umc/codeplay/config/WebConfig.java diff --git a/src/main/java/umc/codeplay/config/WebConfig.java b/src/main/java/umc/codeplay/config/WebConfig.java new file mode 100644 index 0000000..92b8e81 --- /dev/null +++ b/src/main/java/umc/codeplay/config/WebConfig.java @@ -0,0 +1,23 @@ +package umc.codeplay.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebConfig implements WebMvcConfigurer { + + private static final String[] ALLOWED_METHOD_NAMES = { + "GET", "HEAD", "POST", "PUT", "DELETE", "TRACE", "OPTIONS", "PATCH" + }; + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") // 모든 경로에 대해서 cors 허용 + .allowedOrigins("*") // 모든 출처로 부터 요청 허용 - TODO: 변경해야 함 + .allowedMethods(ALLOWED_METHOD_NAMES) + .allowedHeaders("Content-Type", "Authorization") + .maxAge(3600); // 캐싱 시간 설정 + // .exposedHeaders("Authorization") // 클라이언트가 접근할 수 있는 헤더 + } +}