From 2ed4aa5e47e339693cad10ffbf1dfacc33bc1a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Mon, 11 Dec 2023 17:17:01 +0900 Subject: [PATCH 1/3] =?UTF-8?q?3=EB=B6=84=20=EC=9D=B4=EB=82=B4=20=EA=B2=80?= =?UTF-8?q?=EC=A6=9D=20=EB=B2=84=EA=B7=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/palnet/biz/api/bas/laanc/service/BasLaancService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..866d64b1 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 @@ -697,7 +697,7 @@ 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); From ec12f0ba58c1c4b811403c8627157ec1c4114808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Mon, 11 Dec 2023 17:33:10 +0900 Subject: [PATCH 2/3] qr log --- .../com/palnet/biz/api/bas/laanc/service/BasLaancService.java | 3 ++- .../java/com/palnet/biz/api/external/service/TsService.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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 866d64b1..b871ccd0 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코드 조회 실패"); 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); From fab634f7b852323e196f44c6c171f76c520b2322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9E=AC=EC=9A=B0?= <박재우@host.docker.internal> Date: Mon, 11 Dec 2023 17:43:56 +0900 Subject: [PATCH 3/3] =?UTF-8?q?QR=EC=BD=94=EB=93=9C=20=EB=A7=8C=EB=A3=8C?= =?UTF-8?q?=EC=8B=9C=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/palnet/biz/api/bas/laanc/service/BasLaancService.java | 2 +- pav-server/src/main/java/com/palnet/comn/code/ErrorCode.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 b871ccd0..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 @@ -704,7 +704,7 @@ public class BasLaancService { 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/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;