diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 3b47ae3..f41f486 100644 --- 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 \ No newline at end of file + sudo docker image prune -f + sudo docker exec -i -t redis redis-cli \ No newline at end of file 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 index 7eda671..857f5f1 100644 --- 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 index 632226f..b76b083 100644 --- 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 index 6502a92..c02534b 100644 --- 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