From 40015b773c72b7374aed50a4ba1fef7cc178b756 Mon Sep 17 00:00:00 2001 From: ddongseop Date: Fri, 5 Jan 2024 16:43:56 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20[DEPLOY]=20local,=20dev=20?= =?UTF-8?q?=ED=99=98=EA=B2=BD=20=EB=B6=84=EB=A6=AC=20#23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- Dockerfile | 2 +- .../global/config/SecurityConfig.java | 2 +- src/main/resources/application-dev.yml | 33 ++++++++++++++++ src/main/resources/application-local.yml | 31 +++++++++++++++ src/main/resources/application.yml | 39 +++---------------- 6 files changed, 72 insertions(+), 38 deletions(-) create mode 100644 src/main/resources/application-dev.yml create mode 100644 src/main/resources/application-local.yml diff --git a/.gitignore b/.gitignore index 3fb6f63..44fcb81 100644 --- a/.gitignore +++ b/.gitignore @@ -41,5 +41,4 @@ out/ ### Config ### application-secret.properties -scripts/ -application.yaml +application.yaml \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index c46ebe0..fd80a41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,4 +27,4 @@ ENV AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} ENV AWS_OUTPUT_FORMAT=${AWS_OUTPUT_FORMAT} # 컨테이너 실행 시 Java 애플리케이션 실행 -CMD ["java", "-Duser.timezone=Asia/Seoul", "-jar", "lequuServer.jar"] \ No newline at end of file +CMD ["java", "-Duser.timezone=Asia/Seoul", "-jar", "-Dspring.profiles.active=dev", "lequuServer.jar"] \ No newline at end of file diff --git a/src/main/java/org/sopt/lequuServer/global/config/SecurityConfig.java b/src/main/java/org/sopt/lequuServer/global/config/SecurityConfig.java index fee0184..c5058fc 100644 --- a/src/main/java/org/sopt/lequuServer/global/config/SecurityConfig.java +++ b/src/main/java/org/sopt/lequuServer/global/config/SecurityConfig.java @@ -23,7 +23,7 @@ public class SecurityConfig { private static final String[] AUTH_WHITELIST = { "/kakao/**", "/loading", "/error", "/login", "/reissue", "/test/**", "/health", "/actuator/health", - "/images/**" + "/images/**", "/" }; @Bean diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 0000000..46bfa9d --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,33 @@ +spring: + config: + activate: + on-profile: local + + datasource: + driver-class-name: ${DB_NAME_DEV} + url: ${DB_URL_DEV} + username: ${DB_USER_DEV} + password: ${DB_PW_DEV} + + jpa: + show-sql: true + hibernate: + ddl-auto: update + properties: + hibernate: + format_sql: true + show_sql: true + default_batch_fetch_size: 500 + + data: + redis: + host: redis + port: 6379 + +kakao: + client-id: ${KAKAO_ID} + authorization-grant-type: authorization_code + redirect-uri: ${KAKAO_REDIRECT_DEV} + +server: + address: 0.0.0.0 \ No newline at end of file diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml new file mode 100644 index 0000000..2a6e297 --- /dev/null +++ b/src/main/resources/application-local.yml @@ -0,0 +1,31 @@ +spring: + config: + activate: + on-profile: local + import: optional:application-secret.properties + + datasource: + driver-class-name: ${DB_NAME_LOCAL} + url: ${DB_URL_LOCAL} + username: ${DB_USER_LOCAL} + password: ${DB_PW_LOCAL} + + jpa: + show-sql: true + hibernate: + ddl-auto: create + properties: + hibernate: + format_sql: true + show_sql: true + default_batch_fetch_size: 500 + + data: + redis: + host: localhost + port: 6379 + +kakao: + client-id: ${KAKAO_ID} + authorization-grant-type: authorization_code + redirect-uri: ${KAKAO_REDIRECT_LOCAL} \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 99c9c2b..09a9a17 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,22 +1,6 @@ -server: - address: 0.0.0.0 - spring: - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://${DATABASE_ENDPOINT_URL}:3306/${DATABASE_NAME}?serverTimezone=UTC&characterEncoding=UTF-8 - username: ${DATABASE_USER} - password: ${DATABASE_PASSWORD} - - jpa: - show-sql: true - hibernate: - ddl-auto: update - properties: - hibernate: - format_sql: true - show_sql: true - default_batch_fetch_size: 500 + profiles: + active: local servlet: multipart: @@ -24,13 +8,8 @@ spring: max-file-size: 3MB max-request-size: 5MB - data: - redis: - host: redis - port: 6379 - - config: - import: optional:application-secret.properties +jwt: + secret: ${JWT_SECRET} cloud: aws: @@ -38,12 +17,4 @@ cloud: accessKey: ${ACCESS_KEY} secretKey: ${SECRET_KEY} aws-region: ap-northeast-2 - s3-bucket-name: ${BUCKET_NAME} - -kakao: - client-id: ${KAKAO_ID} - authorization-grant-type: authorization_code - redirect-uri: ${KAKAO_REDIRECT} - -jwt: - secret: ${JWT_SECRET} + s3-bucket-name: ${BUCKET_NAME} \ No newline at end of file