diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancService.java b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancService.java index 798aaae1..791bfe23 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancService.java @@ -676,6 +676,7 @@ public class BasLaancService { comConfirmBasRepository.save(comConfirmBas); + log.info(">>> confirmKey [GENERATED] ", confirmKey); return BasLaancQrcodeRs.builder() .qrcode(qr) .confirmKey(confirmKey) @@ -685,7 +686,7 @@ public class BasLaancService { // QR code 확인 public PilotValidRs checkQrcode(String confirmKey) { - + log.info(">>> confirmKey : {}", confirmKey); String userIdByToken = jwtTokenUtil.getUserIdByToken(); ComConfirmBas entity = comConfirmBasRepository.findFirstByConfirmKeyOrderByCreateDtDesc(confirmKey); if(entity == null) throw new CustomException(ErrorCode.DATA_NOTFIND, "QR코드 조회 실패"); @@ -697,13 +698,13 @@ public class BasLaancService { // TODO 일자 검증 - 3분 초과 Instant createDt = entity.getCreateDt().plus(3, ChronoUnit.MINUTES); - boolean flag = !createDt.isAfter(Instant.now()); + boolean flag = !createDt.isBefore(Instant.now()); if (!flag) { entity.setStatus("EXPIRED"); entity.setUpdateUserId(userIdByToken); comConfirmBasRepository.save(entity); comConfirmBasRepository.flush(); - throw new CustomException(ErrorCode.FAIL, "QR 기간 만료"); + throw new CustomException(ErrorCode.QR_EXPIRED, "QR 기간 만료"); } PilotValidRs rs = null; diff --git a/pav-server/src/main/java/com/palnet/biz/api/external/service/TsService.java b/pav-server/src/main/java/com/palnet/biz/api/external/service/TsService.java index 0caeb110..e705fc97 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/external/service/TsService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/external/service/TsService.java @@ -159,6 +159,7 @@ public class TsService { // QR return url public void vcCallback(TsQrcodeRs rs) { String rspCode = rs.getRspCode(); + log.info(">>> confirmKey [RECEIVED/FAILED]: {}", rs.getRqID()); ComConfirmBas entity = comConfirmBasRepository.findFirstByConfirmKey(rs.getRqID()); if (entity != null) { String rsJsonStr = JsonUtils.toJson(rs); diff --git a/pav-server/src/main/java/com/palnet/comn/code/ErrorCode.java b/pav-server/src/main/java/com/palnet/comn/code/ErrorCode.java index 59115320..62d0c65d 100644 --- a/pav-server/src/main/java/com/palnet/comn/code/ErrorCode.java +++ b/pav-server/src/main/java/com/palnet/comn/code/ErrorCode.java @@ -28,8 +28,10 @@ public enum ErrorCode { TS_SERVER_ERROR("TS500", "서버 연결이 되지 않습니다."), // call측 network exception 처리 TS_NT_LAZY("TS501", "네트워크 연결이 지연 됩니다."), // call측 network exception 처리 TS_AUTH_KEY("TS600", "인증키가 유효하지 않습니다."), - TS_ETC("TS700", "기타 오류"); // 기 정의된 내용이 아닌 기타 오류인 경우 + TS_ETC("TS700", "기타 오류"), // 기 정의된 내용이 아닌 기타 오류인 경우 + // QR 관련 ERROR CODE + QR_EXPIRED("QR001", "QR코드 유효기간이 만료되었습니다"); private final String code; private final String message;