Merge pull request #55 from pknu-wap/Deploy/#52

Deploy/#52 - Refresh 토큰으로 인한 Github Repo Secret & 서버 .env 파일 수정
pknu-wap · Dec 8, 2024 · 8a6783b · 8a6783b
2 parents 22bd899 + 65b446a
commit 8a6783b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -5,7 +5,7 @@ on:
     branches: [ "develop" ]
   pull_request:
     branches: [ "develop" ]
-
+  
 permissions:
   contents: read
 
@@ -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

diff --git 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}