diff --git a/.DS_Store b/.DS_Store index 24a5b01..5620907 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml new file mode 100644 index 0000000..7af115f --- /dev/null +++ b/.github/workflows/dev_deploy.yml @@ -0,0 +1,71 @@ +name: CI/CD Pipeline + +on: + push: + branches: [ develop ] # develop 브랜치에 push가 일어날 때 실행 + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 # 저장소 코드 체크아웃 + + - name: Set up JDK 17 # Java 개발 킷 설정 + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' + + - name: Grant execute permission for gradlew # gradlew 실행 권한 부여 + run: chmod +x gradlew + + - name: Create application.yml from Secrets # GitHub Secrets에서 application.yml 생성 + run: | + echo "$APPLICATION_YML" > application.yml + env: + APPLICATION_YML: ${{ secrets.APPLICATION_YML }} # GitHub Secrets에서 가져오기 + + - name: Build with Gradle # Gradle을 사용하여 프로젝트 빌드 + uses: gradle/gradle-build-action@v2 + with: + arguments: build + + - name: Upload build artifact # 빌드된 아티팩트 업로드 + uses: actions/upload-artifact@v4 + with: + name: mapmoriesServer + path: build/libs/*.jar + + deploy: + needs: build # build 작업이 성공적으로 완료된 후 실행 + runs-on: ubuntu-latest + + steps: + - name: Download build artifact # 이전 단계에서 업로드한 아티팩트 다운로드 + uses: actions/download-artifact@v4 + with: + name: mapmoriesServer + path: build/libs/ + + - name: Deploy to EC2 # EC2에 배포 + env: + EC2_SSH_KEY: ${{ secrets.EC2_SSH_KEY }} + EC2_USERNAME: ${{ secrets.EC2_USERNAME }} + EC2_HOST: ${{ secrets.EC2_HOST }} # GitHub Secrets에서 가져오기 + run: | + echo "$EC2_SSH_KEY" > private_key.pem + chmod 600 private_key.pem + + # JAR 파일 전송 + jar_file=$(find build/libs -name '*.jar' ! -name '*plain.jar' | head -n 1) + scp -i private_key.pem -o StrictHostKeyChecking=no "$jar_file" $EC2_USERNAME@$EC2_HOST:/home/$EC2_USERNAME/umc7thServer.jar + + # 애플리케이션 재시작 + ssh -i private_key.pem -o StrictHostKeyChecking=no $EC2_USERNAME@$EC2_HOST " + pgrep java | xargs -r kill -15 + sleep 10 + nohup java -jar /home/$EC2_USERNAME/umc7thServer.jar --spring.config.location=/home/$EC2_USERNAME/application.yml > app.log 2>&1 & + " + + rm -f private_key.pem # 민감한 정보 삭제 \ No newline at end of file diff --git a/build.gradle b/build.gradle index c7f0854..8f7169c 100644 --- a/build.gradle +++ b/build.gradle @@ -55,3 +55,11 @@ dependencies { tasks.named('test') { useJUnitPlatform() } + +tasks.test { + testLogging { + showExceptions = true + exceptionFormat "full" + showStackTraces true + } +} \ No newline at end of file diff --git a/demo/.gitattributes b/demo/.gitattributes deleted file mode 100644 index 8af972c..0000000 --- a/demo/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -/gradlew text eol=lf -*.bat text eol=crlf -*.jar binary diff --git a/demo/.gitignore b/demo/.gitignore deleted file mode 100644 index def2dcf..0000000 --- a/demo/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -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 ### -application.yml -.idea -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ diff --git a/demo/build.gradle b/demo/build.gradle deleted file mode 100644 index 28e67eb..0000000 --- a/demo/build.gradle +++ /dev/null @@ -1,42 +0,0 @@ -plugins { - id 'java' - id 'org.springframework.boot' version '3.4.1' - id 'io.spring.dependency-management' version '1.1.7' -} - -group = 'com.example' -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-security' - implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6' - compileOnly 'org.projectlombok:lombok' - runtimeOnly 'com.mysql:mysql-connector-j' - annotationProcessor 'org.projectlombok:lombok' - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.security:spring-security-test' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' -} - -tasks.named('test') { - useJUnitPlatform() -} diff --git a/demo/gradle/wrapper/gradle-wrapper.jar b/demo/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index a4b76b9..0000000 Binary files a/demo/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/demo/gradle/wrapper/gradle-wrapper.properties b/demo/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index e2847c8..0000000 --- a/demo/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -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/demo/gradlew b/demo/gradlew deleted file mode 100755 index f5feea6..0000000 --- a/demo/gradlew +++ /dev/null @@ -1,252 +0,0 @@ -#!/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/demo/gradlew.bat b/demo/gradlew.bat deleted file mode 100644 index 9d21a21..0000000 --- a/demo/gradlew.bat +++ /dev/null @@ -1,94 +0,0 @@ -@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/demo/settings.gradle b/demo/settings.gradle deleted file mode 100644 index 0a383dd..0000000 --- a/demo/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'demo' diff --git a/demo/src/main/java/com/example/demo/MapmoriesApplication.java b/demo/src/main/java/com/example/demo/MapmoriesApplication.java deleted file mode 100644 index 3e0df92..0000000 --- a/demo/src/main/java/com/example/demo/MapmoriesApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.demo; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class MapmoriesApplication { - - public static void main(String[] args) { - SpringApplication.run(MapmoriesApplication.class, args); - } - -} diff --git a/demo/src/main/resources/application.properties b/demo/src/main/resources/application.properties deleted file mode 100644 index d9148fe..0000000 --- a/demo/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.application.name=mapmories diff --git a/demo/src/test/java/com/example/demo/MapmoriesApplicationTests.java b/demo/src/test/java/com/example/demo/MapmoriesApplicationTests.java deleted file mode 100644 index 35ec969..0000000 --- a/demo/src/test/java/com/example/demo/MapmoriesApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.demo; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class MapmoriesApplicationTests { - - @Test - void contextLoads() { - } - -} diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000..4a44f65 Binary files /dev/null and b/src/.DS_Store differ diff --git a/src/main/.DS_Store b/src/main/.DS_Store new file mode 100644 index 0000000..4321b11 Binary files /dev/null and b/src/main/.DS_Store differ diff --git a/src/main/java/com/example/demo/converter/DiaryConverter.java b/src/main/java/com/example/demo/converter/DiaryConverter.java index 254e7eb..04e8cff 100644 --- a/src/main/java/com/example/demo/converter/DiaryConverter.java +++ b/src/main/java/com/example/demo/converter/DiaryConverter.java @@ -11,6 +11,7 @@ public class DiaryConverter { public static Diary toDiary(DiaryRequestDto diaryRequestDto) { Diary diary = new Diary(); diary.setDiaryId(diaryRequestDto.getDiaryId()); // diaryId 포함 + diary.setCountry(diaryRequestDto.getCountry()); diary.setDate(diaryRequestDto.getDate()); diary.setTitle(diaryRequestDto.getTitle()); diary.setContent(diaryRequestDto.getContent()); @@ -23,6 +24,7 @@ public static Diary toDiary(DiaryRequestDto diaryRequestDto) { public static DiaryResponseDto toDto(Diary diary) { return DiaryResponseDto.builder() .diaryId(diary.getDiaryId()) + .country(diary.getCountry()) .title(diary.getTitle()) .content(diary.getContent()) .imgUrl(diary.getImgUrl()) diff --git a/src/main/java/com/example/demo/domain/Diary.java b/src/main/java/com/example/demo/domain/Diary.java index 11cb07b..72ac550 100644 --- a/src/main/java/com/example/demo/domain/Diary.java +++ b/src/main/java/com/example/demo/domain/Diary.java @@ -23,6 +23,8 @@ public class Diary { // @Column(nullable = false) private LocalDate date; // 작성 날짜 + private String country; + //@Column(nullable = false) private String title; // 제목 diff --git a/src/main/java/com/example/demo/dto/DiaryRequestDto.java b/src/main/java/com/example/demo/dto/DiaryRequestDto.java index 9a0125e..c4bc2a8 100644 --- a/src/main/java/com/example/demo/dto/DiaryRequestDto.java +++ b/src/main/java/com/example/demo/dto/DiaryRequestDto.java @@ -9,6 +9,7 @@ @Setter public class DiaryRequestDto { private Long diaryId; + private String country; private String title; private String content; private String imgUrl; diff --git a/src/main/java/com/example/demo/dto/DiaryResponseDto.java b/src/main/java/com/example/demo/dto/DiaryResponseDto.java index 2e394ba..df813ff 100644 --- a/src/main/java/com/example/demo/dto/DiaryResponseDto.java +++ b/src/main/java/com/example/demo/dto/DiaryResponseDto.java @@ -11,6 +11,7 @@ @Builder public class DiaryResponseDto { private Long diaryId; + private String country; private String title; private String content; private String imgUrl; diff --git a/src/main/java/com/example/demo/service/DiaryService.java b/src/main/java/com/example/demo/service/DiaryService.java index ec7d071..62f12ce 100644 --- a/src/main/java/com/example/demo/service/DiaryService.java +++ b/src/main/java/com/example/demo/service/DiaryService.java @@ -35,7 +35,7 @@ public Diary createDiary(DiaryRequestDto diaryRequestDto, Long userId) { } // 3. 필수 항목 누락시 예외 발생 - if (diaryRequestDto.getDate() == null || diaryRequestDto.getTitle() == null || diaryRequestDto.getContent() == null + if (diaryRequestDto.getDate() == null || diaryRequestDto.getCountry() == null || diaryRequestDto.getTitle() == null || diaryRequestDto.getContent() == null || diaryRequestDto.getIsOpen() == null || diaryRequestDto.getIsCollaborative() == null) { throw new CustomException(ErrorStatus.MISSING_ESSENTIAL_ELEMENTS.getMessage(), ErrorStatus.MISSING_ESSENTIAL_ELEMENTS.getHttpStatus().value()); @@ -43,6 +43,7 @@ public Diary createDiary(DiaryRequestDto diaryRequestDto, Long userId) { // 4. 다이어리 정보 업데이트 existingDiary.setDate(diaryRequestDto.getDate()); + existingDiary.setCountry(diaryRequestDto.getCountry()); existingDiary.setTitle(diaryRequestDto.getTitle()); existingDiary.setContent(diaryRequestDto.getContent()); existingDiary.setImgUrl(diaryRequestDto.getImgUrl()); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index 025d190..0000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,35 +0,0 @@ -spring.application.name=mapmories - -spring.security.user.name=user -spring.security.user.password={noop}password # ??? x, ?? ?? - -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://3.92.135.74:3306/mapmories?maxAllowedPacket=134217728 - -spring.datasource.username=root -spring.datasource.password=20250202 - -firebase.projectId=mapmories-e0aa7 - - -spring.jpa.show-sql=true -spring.jpa.hibergnate.ddl-auto=update -spring.jpa.properties.hibernate.format_sql=true -spring.jpa.database-platform=org.hibernate.dialect.MySQL8Dialect - -spring.jpa.properties.hibernate.show_sql=true -spring.jpa.properties.hibernate.use_sql_comments=true -spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl - -spring.jwt.secret=vmfhaltmskdlstkfkdgodyroqkfwkdbalroqkfwkdbalaaaaaaaaaaaaaaaabbbbb - -logging.level.org.springframework.security=DEBUG -logging.level.org.springframework.web=DEBUG - -spring.datasource.hikari.maximum-pool-size=10 -spring.datasource.hikari.minimum-idle=2 -spring.datasource.hikari.connection-timeout=30000 -spring.datasource.hikari.max-lifetime=1800000 - -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect -spring.jpa.properties.hibernate.default_batch_fetch_size=1000 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..e69de29