diff --git a/.ebextensions/00-makeFiles.config b/.ebextensions/00-makeFiles.config index 7cdf32c..99b2bea 100644 --- a/.ebextensions/00-makeFiles.config +++ b/.ebextensions/00-makeFiles.config @@ -9,4 +9,4 @@ files: # run app killall java - java -Dfile.encoding=UTF-8 -jar $JAR_PATH \ No newline at end of file + java -Dfile.encoding=UTF-8 -Dspring.profiles.active=$SPRING_PROFILE -jar $JAR_PATH \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2a62bb1..66589fe 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -20,6 +20,14 @@ jobs: java-version: '11' distribution: 'temurin' + #Create dotenv file + - name: Make env properties + run: | + touch ./src/main/resources/application-prod.yml + echo "$ENV_PROPERTIES" > ./src/main/resources/application-prod.yml + env: + ENV_PROPERTIES: ${{ secrets.ENV_PROPERTIES }} + #Grant gradlew Permission - name: Grant execute permission for gradlew run: chmod +x ./gradlew @@ -55,7 +63,7 @@ jobs: aws_access_key: ${{ secrets.AWS_ACCESS_KEY_ID }} aws_secret_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} application_name: naechinso - environment_name: Naechinso-env + environment_name: Naechinso-env-1 version_label: github-action-${{ steps.current-time.outputs.formattedTime }} region: ap-northeast-2 deployment_package: deploy/deploy.zip diff --git a/.gitignore b/.gitignore index 0dd81fc..0021bf5 100644 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,8 @@ out/ ### dotenv ### .env.* -.env \ No newline at end of file +.env +!**/src/main/resources/application-**.yml +src/main/resources/application-dev.yml +src/main/resources/application-local.yml +src/main/resources/application-prod.yml \ No newline at end of file diff --git a/.platform/nginx/nginx.conf b/.platform/nginx/nginx.conf index 55e64ea..e604b45 100644 --- a/.platform/nginx/nginx.conf +++ b/.platform/nginx/nginx.conf @@ -25,7 +25,7 @@ http { } upstream springboot { - server 127.0.0.1:8080; + server localhost:8080; keepalive 1024; } @@ -34,7 +34,7 @@ http { listen [::]:80 default_server; location / { - proxy_pass https://api.naechinso.com; + proxy_pass http://springboot; proxy_http_version 1.1; proxy_set_header Connection $connection_upgrade; proxy_set_header Upgrade $http_upgrade; diff --git a/src/main/java/com/tikitaka/naechinso/domain/sms/SmsCertificationServiceImpl.java b/src/main/java/com/tikitaka/naechinso/domain/sms/SmsCertificationServiceImpl.java index d7981d7..8011186 100644 --- a/src/main/java/com/tikitaka/naechinso/domain/sms/SmsCertificationServiceImpl.java +++ b/src/main/java/com/tikitaka/naechinso/domain/sms/SmsCertificationServiceImpl.java @@ -41,7 +41,7 @@ public class SmsCertificationServiceImpl implements SmsCertificationService { private final String VERIFICATION_PREFIX = "sms:"; private final int VERIFICATION_TIME_LIMIT = 3 * 60; - @Value("${SPRING_PROFILE}") + @Value("${spring.profiles.active}") private String springProfile; /** diff --git a/src/main/java/com/tikitaka/naechinso/global/config/security/jwt/JwtTokenProvider.java b/src/main/java/com/tikitaka/naechinso/global/config/security/jwt/JwtTokenProvider.java index 050ff29..063c0c2 100644 --- a/src/main/java/com/tikitaka/naechinso/global/config/security/jwt/JwtTokenProvider.java +++ b/src/main/java/com/tikitaka/naechinso/global/config/security/jwt/JwtTokenProvider.java @@ -32,7 +32,7 @@ public class JwtTokenProvider { private final RedisService redisService; /** 토큰 비밀 키 */ - @Value("${JWT_SECRET_KEY}") + @Value("${jwt.secret-key}") private String JWT_SECRET; /** 토큰 유효 시간 (ms) */ diff --git a/src/main/java/com/tikitaka/naechinso/infra/sms/SmsServiceImpl.java b/src/main/java/com/tikitaka/naechinso/infra/sms/SmsServiceImpl.java index fae77b9..e3be5ed 100644 --- a/src/main/java/com/tikitaka/naechinso/infra/sms/SmsServiceImpl.java +++ b/src/main/java/com/tikitaka/naechinso/infra/sms/SmsServiceImpl.java @@ -25,13 +25,13 @@ @RequiredArgsConstructor public class SmsServiceImpl implements SmsService { private final WebClient webClient; - @Value("${NAVER_ACCESS_KEY}") + @Value("${naver.sms.access-key}") private String accessKey; - @Value("${NAVER_SECRET_KEY}") + @Value("${naver.sms.secret-key}") private String secretKey; - @Value("${NAVER_SMS_ID}") + @Value("${naver.sms.id}") private String serviceId; - @Value("${NAVER_SMS_PHONE_NUMBER}") + @Value("${naver.sms.phone}") private String senderNumber; /** diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml deleted file mode 100644 index 88277d3..0000000 --- a/src/main/resources/application-dev.yml +++ /dev/null @@ -1,24 +0,0 @@ -server: - port: 8081 - -spring: - # .env import - config: - activate: - on-profile: dev - datasource: - redis: - host: ${REDIS_HOST} - port: ${REDIS_PORT} - - jpa: - # local - create - # update - dev - # none - prod - hibernate: - ddl-auto: update - properties: - hibernate: - show_sql: false - format_sql: false - diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml deleted file mode 100644 index 2bad291..0000000 --- a/src/main/resources/application-local.yml +++ /dev/null @@ -1,24 +0,0 @@ -server: - port: 8080 - -spring: - # .env import - config: - activate: - on-profile: local - datasource: - redis: - host: localhost - port: 6379 - - jpa: - # local - create - # update - dev - # none - prod - hibernate: - ddl-auto: create - properties: - hibernate: - show_sql: true - format_sql: true - diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml deleted file mode 100644 index 3e765b8..0000000 --- a/src/main/resources/application-prod.yml +++ /dev/null @@ -1,24 +0,0 @@ -server: - port: 8082 - -spring: - # .env import - config: - activate: - on-profile: local - datasource: - redis: - host: ${REDIS_HOST} - port: ${REDIS_PORT} - - jpa: - # local - create - # update - dev - # none - prod - hibernate: - ddl-auto: none - properties: - hibernate: - show_sql: false - format_sql: false - diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 295832a..32b0692 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,17 +1,11 @@ server: - port: ${PORT:8080} + port: 8080 spring: profiles: - active: ${SPRING_PROFILE} - # .env import - config: - import: optional:file:.env[.properties] + active: local # Using POSTGRESQL datasource: - url: jdbc:postgresql://${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} - username: ${POSTGRES_USER} - password: ${POSTGRES_PASSWORD} driver-class-name: org.postgresql.Driver jpa: