From 05c6f350681195c59ef124389a07238e51fd639c Mon Sep 17 00:00:00 2001 From: Zepelown Date: Sun, 8 Dec 2024 15:21:06 +0900 Subject: [PATCH 1/4] =?UTF-8?q?refactor:=20application-prod=20=EC=96=91?= =?UTF-8?q?=EC=8B=9D=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wabi/src/main/resources/application-prod.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wabi/src/main/resources/application-prod.properties b/wabi/src/main/resources/application-prod.properties index d25bc9b..fd5fe02 100644 --- a/wabi/src/main/resources/application-prod.properties +++ b/wabi/src/main/resources/application-prod.properties @@ -8,6 +8,6 @@ logging.level.org.springframework.security=DEBUG logging.level.org.springframework.web=DEBUG logging.level.org.springframework.http=DEBUG jwt.secret-key=${JWT.KEY} -jwt.expiration-minutes=${JWT.EXPIRATION.MINUTES} -jwt.refresh-expiration-hours= ${JWT.REFRESH.EXPIRATION.HOURS} -jwt.issuer=${JWT.ISSUER} +jwt.expiration-minutes=${JWT_EXPIRATION_MINUTES} +jwt.refresh-expiration-hours= ${JWT_REFRESH_EXPIRATION_HOURS} +jwt.issuer=${JWT_ISSUER} From ad7acd825b81a3221d7e28e6c65152d61aae1ef8 Mon Sep 17 00:00:00 2001 From: SeongWonYoon Date: Sun, 8 Dec 2024 15:24:54 +0900 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20Github=20Action=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=EB=90=9C=20secret=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 77b011c..061e9c5 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -41,8 +41,9 @@ jobs: echo "SPRING_DATASOURCE_USERNAME=${{ secrets.SPRING_DATASOURCE_USERNAME }}" >> ./env.properties echo "SPRING_DATASOURCE_PASSWORD=${{ secrets.SPRING_DATASOURCE_PASSWORD }}" >> ./env.properties echo "JWT_KEY=${{ secrets.JWT_KEY }}" >> ./env.properties - echo "JWT.EXPIRATION.HOURS=${{ secrets.JWT_EXPIRATION_HOURS }}" >> ./env.properties - echo "JWT.ISSUER=${{ secrets.JWT_ISSUER }}" >> ./env.properties + echo "JWT_EXPIRATION_MINUTES=${{ secrets.JWT_EXPIRATION_MINUTES }}" >> ./env.properties + echo "JWT_REFRESH_EXPIRATION_HOURS=${{ secrets.JWT_REFRESH_EXPIRATION_HOURS }}" >> ./env.properties + echo "JWT_ISSUER=${{ secrets.JWT_ISSUER }}" >> ./env.properties shell: bash # Gradle build (Test 제외) @@ -83,7 +84,8 @@ jobs: echo "SPRING_DATASOURCE_USERNAME=${{ secrets.SPRING_DATASOURCE_USERNAME }}" | sudo tee -a .env > /dev/null echo "SPRING_DATASOURCE_PASSWORD=${{ secrets.SPRING_DATASOURCE_PASSWORD }}" | sudo tee -a .env > /dev/null echo "JWT_KEY=${{ secrets.JWT_KEY }}" | sudo tee -a .env > /dev/null - echo "JWT_EXPIRATION_HOURS=${{ secrets.JWT_EXPIRATION_HOURS }}" | sudo tee -a .env > /dev/null + echo "JWT_EXPIRATION_MINUTES=${{ secrets.JWT_EXPIRATION_MINUTES }}" | sudo tee -a .env > /dev/null + echo "JWT_REFRESH_EXPIRATION_HOURS=${{ secrets.JWT_REFRESH_EXPIRATION_HOURS }}" | sudo tee -a .env > /dev/null echo "JWT_ISSUER=${{ secrets.JWT_ISSUER }}" | sudo tee -a .env > /dev/null echo "DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }}" | sudo tee -a .env > /dev/null echo "DOCKERHUB_REPOSITORY=${{ secrets.DOCKERHUB_REPOSITORY }}" | sudo tee -a .env > /dev/null From faa98e93f2d7dcb120e2f7c4eee823a73e5b2fe4 Mon Sep 17 00:00:00 2001 From: SeongWonYoon Date: Sun, 8 Dec 2024 15:26:23 +0900 Subject: [PATCH 3/4] =?UTF-8?q?test:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EC=9A=A9=20github=20action?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 061e9c5..8d79d25 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -2,9 +2,9 @@ name: Deploy on: push: - branches: [ "develop" ] + branches: [ "Deploy/#52" ] pull_request: - branches: [ "develop" ] + branches: [ "Deploy/#52" ] permissions: contents: read From 65b446ac5ca123d72544a2dbcfeb61b74cf5de01 Mon Sep 17 00:00:00 2001 From: SeongWonYoon Date: Sun, 8 Dec 2024 15:39:59 +0900 Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EC=9A=A9=20=EB=B8=8C=EB=9E=9C=EC=B9=98=EC=97=90=EC=84=9C=20dev?= =?UTF-8?q?elop=20=EB=B8=8C=EB=9E=9C=EC=B9=98=20=EB=82=B4=EC=9A=A9?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 8d79d25..35fd967 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -2,10 +2,10 @@ name: Deploy on: push: - branches: [ "Deploy/#52" ] + branches: [ "develop" ] pull_request: - branches: [ "Deploy/#52" ] - + branches: [ "develop" ] + permissions: contents: read