Merge pull request #581 from woowacourse-teams/release/test

hotfix: 토큰 시간 변경 및 워크 플로우 수정

.github/workflows/merge_current_to_dev_ci.yml

@@ -0,0 +1,31 @@
+name: merge current branch into dev branches CI
+
+on:
+  push:
+    branches:
+      - 'release/**'
+      - 'hotfix/**'
+
+jobs:
+  merge-branch:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: merge current branch -> dev_backend
+      uses: devmasx/merge-branch@master
+      with:
+        type: now
+        target_branch: dev_backend
+        message: Merge release or hotfix into dev_backend
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: merge current branch -> dev_android
+      uses: devmasx/merge-branch@master
+      with:
+        type: now
+        target_branch: dev_android
+        message: Merge release or hotfix into dev_android
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+

backend/src/main/java/com/now/naaga/auth/infrastructure/jwt/AuthTokenGenerator.java

@@ -13,9 +13,9 @@
 
 @Component
 public class AuthTokenGenerator {
-
-    private static final long ACCESS_TOKEN_EXPIRE_TIME = 1000L * 20; // 20초
-    private static final long REFRESH_TOKEN_EXPIRE_TIME = 1000L * 60 * 1; // 1분
+    
+    private static final long ACCESS_TOKEN_EXPIRE_TIME = 1000L * 60 * 60 * 24 * 30; // 30일
+    private static final long REFRESH_TOKEN_EXPIRE_TIME = 1000L * 60 * 60 * 24 * 30; // 30일
 
     private final JwtProvider jwtProvider;