Merge pull request #104 from EWHA-LUX/feature/#40

[Fix] redis host 변경, Redis CLI 실행
EWHA-LUX · May 28, 2024 · 4dbc681 · 4dbc681
2 parents 588422e + 3707f56
commit 4dbc681
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -90,4 +90,5 @@ jobs:
             sudo docker rm -f $(docker ps -qa)
             sudo docker pull ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPO }}
             sudo docker-compose up -d
-            sudo docker image prune -f
+            sudo docker image prune -f
+            sudo docker exec -i -t redis redis-cli
diff --git a/src/main/java/ewha/lux/once/domain/user/service/UserService.java b/src/main/java/ewha/lux/once/domain/user/service/UserService.java
@@ -130,7 +130,6 @@ public void postLogout(HttpServletRequest request, Users nowuser) throws CustomE
         redisService.setAccessBlackValueWithTTL(accessToken,"logout",expiration, TimeUnit.MILLISECONDS);
         // 리프레시 토큰 삭제
         redisService.deleteValue(REFRESH_TOKEN_PREFIX+nowuser.getId().toString());
-        System.out.println("왕왕왕왕왕");
     }
 
     public void deleteUsers(Users nowUser) throws CustomException {

diff --git a/src/main/java/ewha/lux/once/global/security/JwtProvider.java b/src/main/java/ewha/lux/once/global/security/JwtProvider.java
@@ -62,7 +62,9 @@ public Users extractUsersFromToken(String token) {
     // accessToken 만료 시간 반환
     public Long getExpiration(String token) {
         Claims claims = Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token).getBody();
-        return claims.getExpiration().getTime();
+        long expirationTime = claims.getExpiration().getTime();     // 만료 시간
+        long currentTime = System.currentTimeMillis();              // 현재 시간
+        return expirationTime - currentTime;                        // 남은 시간
     }
 
 

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -1,7 +1,7 @@
 spring:
   data:
     redis:
-      host: redis
+      host: ${EC2_IPV4}
       port: 6379
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver