From 1d4ef6d4ad2c946280d93458fabf126e9aaaed72 Mon Sep 17 00:00:00 2001 From: gengminy Date: Tue, 20 Sep 2022 17:50:22 +0900 Subject: [PATCH 01/11] =?UTF-8?q?:rocket:=20fix(prod):=20nginx=20conf=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20#5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 2 +- .platform/nginx/nginx.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2a62bb1..4d33953 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,7 +3,7 @@ name: beanstalk-springboot-deploy on: push: branches: - - main + - dev workflow_dispatch: jobs: diff --git a/.platform/nginx/nginx.conf b/.platform/nginx/nginx.conf index 55e64ea..4b3528c 100644 --- a/.platform/nginx/nginx.conf +++ b/.platform/nginx/nginx.conf @@ -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; From 1645270b324a8a6867a25aa021fed242eb2ac950 Mon Sep 17 00:00:00 2001 From: gengminy Date: Wed, 21 Sep 2022 15:05:59 +0900 Subject: [PATCH 02/11] =?UTF-8?q?:hammer:=20fix(prod):=20Github=20Actions?= =?UTF-8?q?=20dotenv=20=EC=83=9D=EC=84=B1=20=EC=B6=94=EA=B0=80=20#5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4d33953..93adf75 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 file + run: | + touch ./.env + echo "$ENV_PROPERTIES" > ./.env + env: + ENV_PROPERTIES_DEV: ${{ secrets.ENV_PROPERTIES }} + #Grant gradlew Permission - name: Grant execute permission for gradlew run: chmod +x ./gradlew From 52ed761e1c139e54b5304ce69da4a190c996f6ed Mon Sep 17 00:00:00 2001 From: gengminy Date: Wed, 21 Sep 2022 15:10:06 +0900 Subject: [PATCH 03/11] =?UTF-8?q?:hammer:=20fix(prod):=20Github=20Actions?= =?UTF-8?q?=20dotenv=20=EC=83=9D=EC=84=B1=20=EC=B6=94=EA=B0=80=20#5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 2 +- .platform/nginx/nginx.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 93adf75..5ab330b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -63,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/.platform/nginx/nginx.conf b/.platform/nginx/nginx.conf index 4b3528c..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; } From 59d40da8c3a2b0d6404df2ef19089daa63caf306 Mon Sep 17 00:00:00 2001 From: gengminy Date: Wed, 21 Sep 2022 15:31:08 +0900 Subject: [PATCH 04/11] =?UTF-8?q?:hammer:=20fix(prod):=20Github=20Actions?= =?UTF-8?q?=20dotenv=20=EC=83=9D=EC=84=B1=20=EC=B6=94=EA=B0=80=20#5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 2 +- src/main/resources/application-dev.yml | 2 +- src/main/resources/application-prod.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5ab330b..0cc1972 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -26,7 +26,7 @@ jobs: touch ./.env echo "$ENV_PROPERTIES" > ./.env env: - ENV_PROPERTIES_DEV: ${{ secrets.ENV_PROPERTIES }} + ENV_PROPERTIES: ${{ secrets.ENV_PROPERTIES }} #Grant gradlew Permission - name: Grant execute permission for gradlew diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 88277d3..ba53f76 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8081 + port: 8080 spring: # .env import diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 3e765b8..fbb4147 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,5 +1,5 @@ server: - port: 8082 + port: 8080 spring: # .env import From b8af90ba4686704a3ece13e7fd1106f19fa143cc Mon Sep 17 00:00:00 2001 From: gengminy Date: Wed, 21 Sep 2022 16:01:25 +0900 Subject: [PATCH 05/11] =?UTF-8?q?:hammer:=20fix(prod):=20Github=20Actions?= =?UTF-8?q?=20dotenv=20=EC=83=9D=EC=84=B1=20=EC=B6=94=EA=B0=80=20#5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 1 + src/main/resources/application-dev.yml | 3 --- src/main/resources/application-local.yml | 3 --- src/main/resources/application-prod.yml | 3 --- src/main/resources/application.yml | 2 +- 5 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0cc1972..1147b6a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -55,6 +55,7 @@ jobs: cp Procfile deploy/Procfile cp -r .ebextensions deploy/.ebextensions cp -r .platform deploy/.platform + cp .env deploy/.env cd deploy && zip -r deploy.zip . - name: Beanstalk Deploy diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index ba53f76..d778827 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,6 +1,3 @@ -server: - port: 8080 - spring: # .env import config: diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 2bad291..da9591d 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -1,6 +1,3 @@ -server: - port: 8080 - spring: # .env import config: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index fbb4147..2e01aa4 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,6 +1,3 @@ -server: - port: 8080 - spring: # .env import config: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 295832a..055bdff 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: ${PORT:8080} + port: 8080 spring: profiles: From e65f14a8a71d1ff655c2970c277dc499d4de49e2 Mon Sep 17 00:00:00 2001 From: gengminy Date: Wed, 21 Sep 2022 16:33:55 +0900 Subject: [PATCH 06/11] =?UTF-8?q?:hammer:=20fix(prod):=20Github=20Actions?= =?UTF-8?q?=20dotenv=20=EC=83=9D=EC=84=B1=20=EC=B6=94=EA=B0=80=20#5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .ebextensions/00-makeFiles.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ebextensions/00-makeFiles.config b/.ebextensions/00-makeFiles.config index 7cdf32c..a907280 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 --spring.config.import=optional:file:.env[.properties] -jar $JAR_PATH \ No newline at end of file From 382c4e0c7f8932c80aed675b618283fb3039d260 Mon Sep 17 00:00:00 2001 From: gengminy Date: Wed, 21 Sep 2022 17:22:09 +0900 Subject: [PATCH 07/11] =?UTF-8?q?:hammer:=20fix(prod):=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EB=B3=80=EC=88=98=20=EC=84=A4=EC=A0=95=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20#5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .ebextensions/00-makeFiles.config | 2 +- .github/workflows/deploy.yml | 7 +++---- .gitignore | 6 +++++- .../sms/SmsCertificationServiceImpl.java | 2 +- .../config/security/jwt/JwtTokenProvider.java | 2 +- .../naechinso/infra/sms/SmsServiceImpl.java | 8 +++---- src/main/resources/application-dev.yml | 21 ------------------- src/main/resources/application-local.yml | 21 ------------------- src/main/resources/application-prod.yml | 21 ------------------- src/main/resources/application.yml | 9 +++----- 10 files changed, 18 insertions(+), 81 deletions(-) delete mode 100644 src/main/resources/application-dev.yml delete mode 100644 src/main/resources/application-local.yml delete mode 100644 src/main/resources/application-prod.yml diff --git a/.ebextensions/00-makeFiles.config b/.ebextensions/00-makeFiles.config index a907280..3d64416 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 --spring.config.import=optional:file:.env[.properties] -jar $JAR_PATH \ No newline at end of file + java -Dfile.encoding=UTF-8 -Dspring.profiles.active=dev -jar $JAR_PATH \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1147b6a..f853a3a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -21,10 +21,10 @@ jobs: distribution: 'temurin' #Create dotenv file - - name: Make env file + - name: Make env properties run: | - touch ./.env - echo "$ENV_PROPERTIES" > ./.env + touch ./src/main/resources/application-dev.yml + echo "$ENV_PROPERTIES" > ./src/main/resources/application-dev.yml env: ENV_PROPERTIES: ${{ secrets.ENV_PROPERTIES }} @@ -55,7 +55,6 @@ jobs: cp Procfile deploy/Procfile cp -r .ebextensions deploy/.ebextensions cp -r .platform deploy/.platform - cp .env deploy/.env cd deploy && zip -r deploy.zip . - name: Beanstalk Deploy 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/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 d778827..0000000 --- a/src/main/resources/application-dev.yml +++ /dev/null @@ -1,21 +0,0 @@ -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 da9591d..0000000 --- a/src/main/resources/application-local.yml +++ /dev/null @@ -1,21 +0,0 @@ -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 2e01aa4..0000000 --- a/src/main/resources/application-prod.yml +++ /dev/null @@ -1,21 +0,0 @@ -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 055bdff..8d540e8 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,15 +3,12 @@ server: spring: profiles: - active: ${SPRING_PROFILE} + active: local # .env import - config: - import: optional:file:.env[.properties] +# config: +# import: optional:file:.env[.properties] # 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: From 2c19364971e8e3af9f7d82ee5b43a18fe14c277e Mon Sep 17 00:00:00 2001 From: gengminy Date: Wed, 21 Sep 2022 17:42:56 +0900 Subject: [PATCH 08/11] =?UTF-8?q?:hammer:=20fix(prod):=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EB=B3=80=EC=88=98=20=EC=84=A4=EC=A0=95=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20#5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8d540e8..32b0692 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,9 +4,6 @@ server: spring: profiles: active: local - # .env import -# config: -# import: optional:file:.env[.properties] # Using POSTGRESQL datasource: driver-class-name: org.postgresql.Driver From e6e7e7ad03f0485269fb779bc633b7db41be5770 Mon Sep 17 00:00:00 2001 From: gengminy Date: Wed, 21 Sep 2022 17:50:54 +0900 Subject: [PATCH 09/11] =?UTF-8?q?:hammer:=20fix(prod):=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EB=B3=80=EC=88=98=20=EC=84=A4=EC=A0=95=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20#5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .ebextensions/00-makeFiles.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ebextensions/00-makeFiles.config b/.ebextensions/00-makeFiles.config index 3d64416..7cec833 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 -Dspring.profiles.active=dev -jar $JAR_PATH \ No newline at end of file + java -Dfile.encoding=UTF-8 -Dspring.profiles.active=local -jar $JAR_PATH \ No newline at end of file From 30b8db4ab037c767e8402b6ceb7143141d5e1e0d Mon Sep 17 00:00:00 2001 From: gengminy Date: Wed, 21 Sep 2022 19:38:42 +0900 Subject: [PATCH 10/11] =?UTF-8?q?:hammer:=20fix(prod):=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EB=B3=80=EC=88=98=20=EC=84=A4=EC=A0=95=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20#5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .ebextensions/00-makeFiles.config | 2 +- .github/workflows/deploy.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ebextensions/00-makeFiles.config b/.ebextensions/00-makeFiles.config index 7cec833..4c25657 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 -Dspring.profiles.active=local -jar $JAR_PATH \ No newline at end of file + java -Dfile.encoding=UTF-8 -Dspring.profiles.active=prod -jar $JAR_PATH \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f853a3a..f67480a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,8 +23,8 @@ jobs: #Create dotenv file - name: Make env properties run: | - touch ./src/main/resources/application-dev.yml - echo "$ENV_PROPERTIES" > ./src/main/resources/application-dev.yml + touch ./src/main/resources/application-prod.yml + echo "$ENV_PROPERTIES" > ./src/main/resources/application-prod.yml env: ENV_PROPERTIES: ${{ secrets.ENV_PROPERTIES }} From 9d3a6e401d8603b8b2018af3ef7da94afba45cd4 Mon Sep 17 00:00:00 2001 From: gengminy Date: Wed, 21 Sep 2022 20:18:13 +0900 Subject: [PATCH 11/11] =?UTF-8?q?:rocket:=20feat(prod):=20=EB=B0=B0?= =?UTF-8?q?=ED=8F=AC=20=EC=84=B8=ED=8C=85=20=EC=99=84=EB=A3=8C=20#5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .ebextensions/00-makeFiles.config | 2 +- .github/workflows/deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ebextensions/00-makeFiles.config b/.ebextensions/00-makeFiles.config index 4c25657..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 -Dspring.profiles.active=prod -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 f67480a..66589fe 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,7 +3,7 @@ name: beanstalk-springboot-deploy on: push: branches: - - dev + - main workflow_dispatch: jobs: