From b3760d8617f38bd66cd719a4ccd0eccc9987c0dd Mon Sep 17 00:00:00 2001 From: kbyunghoon Date: Tue, 18 Feb 2025 15:46:37 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=EC=A7=80=EB=8F=84=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=EB=B3=84=20=EC=B0=A8=EB=9F=89=20=EB=8C=80=EC=88=98=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=202=EB=B0=B0=EB=A1=9C=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicle/infrastructure/mybatis/MyBatisVehicleInfoMapper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/monicar-control-center/src/main/java/org/controlcenter/vehicle/infrastructure/mybatis/MyBatisVehicleInfoMapper.java b/monicar-control-center/src/main/java/org/controlcenter/vehicle/infrastructure/mybatis/MyBatisVehicleInfoMapper.java index ae561e2..3420869 100644 --- a/monicar-control-center/src/main/java/org/controlcenter/vehicle/infrastructure/mybatis/MyBatisVehicleInfoMapper.java +++ b/monicar-control-center/src/main/java/org/controlcenter/vehicle/infrastructure/mybatis/MyBatisVehicleInfoMapper.java @@ -236,6 +236,7 @@ WITH filtered_events AS ( ) latest ON ve.vehicle_id = latest.vehicle_id AND ve.event_at = latest.latest_event_at + GROUP BY ve.vehicle_id ) SELECT COUNT(vi.vehicle_id) AS allVehicles, From 00dccd604ba7d4b0fb3b2d8373299621d2008e3a Mon Sep 17 00:00:00 2001 From: kbyunghoon Date: Tue, 18 Feb 2025 15:46:49 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=EC=B0=A8=EB=9F=89=20=EC=9E=90?= =?UTF-8?q?=EB=8F=99=EC=99=84=EC=84=B1=20=EC=8B=9C=20=EC=B0=A8=EB=9F=89=20?= =?UTF-8?q?ID=20=ED=82=A4=EA=B0=92=20vehilceId=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/dto/SimpleVehicleInformationResponse.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monicar-control-center/src/main/java/org/controlcenter/vehicle/presentation/dto/SimpleVehicleInformationResponse.java b/monicar-control-center/src/main/java/org/controlcenter/vehicle/presentation/dto/SimpleVehicleInformationResponse.java index dc4e778..a801c6f 100644 --- a/monicar-control-center/src/main/java/org/controlcenter/vehicle/presentation/dto/SimpleVehicleInformationResponse.java +++ b/monicar-control-center/src/main/java/org/controlcenter/vehicle/presentation/dto/SimpleVehicleInformationResponse.java @@ -7,12 +7,12 @@ @Builder public record SimpleVehicleInformationResponse( - long id, + long vehicleId, String vehicleNumber ) { public static SimpleVehicleInformationResponse from(VehicleInformationDocument doc) { return SimpleVehicleInformationResponse.builder() - .id(doc.getId()) + .vehicleId(doc.getId()) .vehicleNumber(doc.getVehicleNumber()) .build(); } From 167bf05517d85be88fcee02a350e4e0b375b51c6 Mon Sep 17 00:00:00 2001 From: kbyunghoon Date: Tue, 18 Feb 2025 16:00:35 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=EC=9A=94=EC=B2=AD=20=EC=8B=9C=20?= =?UTF-8?q?=EB=A6=AC=ED=94=84=EB=A0=88=EC=8B=9C=ED=86=A0=ED=81=B0=20?= =?UTF-8?q?=EB=A0=88=EB=94=94=EC=8A=A4=20=EA=B2=80=EC=A6=9D=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/controlcenter/common/security/JWTFilter.java | 3 +-- .../java/org/controlcenter/common/util/JWTTokenValidator.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/monicar-control-center/src/main/java/org/controlcenter/common/security/JWTFilter.java b/monicar-control-center/src/main/java/org/controlcenter/common/security/JWTFilter.java index 9924180..3966de6 100644 --- a/monicar-control-center/src/main/java/org/controlcenter/common/security/JWTFilter.java +++ b/monicar-control-center/src/main/java/org/controlcenter/common/security/JWTFilter.java @@ -70,8 +70,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse return; } catch (BusinessException e) { response.addHeader("Set-Cookie", cookieUtil.createAccessTokenCookie("", 0L).toString()); - response.addHeader("Set-Cookie", - cookieUtil.createRefreshTokenCookie("", 0L).toString()); + response.addHeader("Set-Cookie", cookieUtil.createRefreshTokenCookie("", 0L).toString()); errorHandler.writeErrorResponse(response, e.getErrorCode()); return; diff --git a/monicar-control-center/src/main/java/org/controlcenter/common/util/JWTTokenValidator.java b/monicar-control-center/src/main/java/org/controlcenter/common/util/JWTTokenValidator.java index b5b2acf..c1eb1cb 100644 --- a/monicar-control-center/src/main/java/org/controlcenter/common/util/JWTTokenValidator.java +++ b/monicar-control-center/src/main/java/org/controlcenter/common/util/JWTTokenValidator.java @@ -26,7 +26,7 @@ public void validateTokens(String accessToken, String refreshToken) { throw new BusinessException(FORBIDDEN_ERROR); } - if (!redisUtil.isRefreshTokenValid(extractUserIdFromAccessToken(refreshToken))) { + if (!redisUtil.getRefreshToken(extractUserIdFromAccessToken(refreshToken)).equals(refreshToken)) { throw new BusinessException(FORBIDDEN_ERROR); }