From 29bf17be1daa767e35bbe58fc628ce0d94a375db Mon Sep 17 00:00:00 2001 From: lkd9125 Date: Tue, 12 Sep 2023 14:38:29 +0900 Subject: [PATCH] =?UTF-8?q?Instant=20=ED=83=80=EC=9E=85=20=ED=8C=8C?= =?UTF-8?q?=EB=9D=BC=EB=AF=B8=ED=84=B0=20=EC=BB=A8=EB=B2=84=ED=84=B0=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80,=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EC=95=94=ED=98=B8=ED=99=94=20=ED=95=B4?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AcntCrtfyhpController.java | 6 ++--- .../crtfyhp/service/AcntCrtfyhpService.java | 9 ++++--- .../biz/config/StringToInstantBinding.java | 27 +++++++------------ .../palnet/biz/jpa/entity/PtyTermsBas.java | 19 ++++++------- 4 files changed, 27 insertions(+), 34 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/biz/api/acnt/crtfyhp/controller/AcntCrtfyhpController.java b/pav-server/src/main/java/com/palnet/biz/api/acnt/crtfyhp/controller/AcntCrtfyhpController.java index fc47b74..357a796 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/acnt/crtfyhp/controller/AcntCrtfyhpController.java +++ b/pav-server/src/main/java/com/palnet/biz/api/acnt/crtfyhp/controller/AcntCrtfyhpController.java @@ -48,12 +48,11 @@ public class AcntCrtfyhpController { @Tag(name = "휴대폰 인증 관리", description = "회원 휴대폰 인증 관련 API") @ApiImplicitParam(name = "hnpo",value = "휴대폰번호", dataTypeClass = String.class) public ResponseEntity send(String hpno) { - - + Map resultMap = new HashMap(); try { - + if(hpno == null) { return ResponseEntity.status(HttpStatus.OK) .body(new ErrorResponse(RSErrorCode.ER_PARAM)); @@ -81,7 +80,6 @@ public class AcntCrtfyhpController { } return ResponseEntity.ok().body(new SuccessResponse(resultMap)); - } diff --git a/pav-server/src/main/java/com/palnet/biz/api/acnt/crtfyhp/service/AcntCrtfyhpService.java b/pav-server/src/main/java/com/palnet/biz/api/acnt/crtfyhp/service/AcntCrtfyhpService.java index 4072b1c..fe2be9b 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/acnt/crtfyhp/service/AcntCrtfyhpService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/acnt/crtfyhp/service/AcntCrtfyhpService.java @@ -209,9 +209,10 @@ public class AcntCrtfyhpService { } public boolean certifNum(String memberName, String hpno) throws Exception{ - String name = EncryptUtils.encrypt(memberName); +// String name = EncryptUtils.encrypt(memberName); String phone = EncryptUtils.encrypt(hpno); - boolean certifNum = cstmrQuery.certifNum(name , phone); + + boolean certifNum = cstmrQuery.certifNum(memberName , phone); if(certifNum) { registerSend(hpno); } @@ -219,9 +220,9 @@ public class AcntCrtfyhpService { } public String findUserId(String memberName, String hpno) throws Exception{ - String name = EncryptUtils.encrypt(memberName); +// String name = EncryptUtils.encrypt(memberName); String phone = EncryptUtils.encrypt(hpno); - String resultFindId = cstmrQuery.findUserId(name,phone); + String resultFindId = cstmrQuery.findUserId(memberName,phone); return resultFindId; } diff --git a/pav-server/src/main/java/com/palnet/biz/config/StringToInstantBinding.java b/pav-server/src/main/java/com/palnet/biz/config/StringToInstantBinding.java index 52b6324..f7c6cdc 100644 --- a/pav-server/src/main/java/com/palnet/biz/config/StringToInstantBinding.java +++ b/pav-server/src/main/java/com/palnet/biz/config/StringToInstantBinding.java @@ -19,27 +19,20 @@ public class StringToInstantBinding implements Converter { log.error("StringToInstantBinding - convert()"); log.error("date -> {}", date); - if(date.length() == 10){ - date += "T00:00:00Z"; - try { - return Instant.parse(date); - } catch (Exception e) { - e.printStackTrace(); - } - } else { - try { - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - LocalDateTime localDateTime = LocalDateTime.parse(date, formatter); - - return localDateTime.atZone(ZoneId.of("UTC")).toInstant(); - } catch (Exception e){ - e.printStackTrace(); - } + DateTimeFormatter formatter; + if(date.length() == 10) formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + else formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + try { + LocalDateTime localDateTime = LocalDateTime.parse(date, formatter); + + return localDateTime.atZone(ZoneId.of("UTC")).toInstant(); + } catch (Exception e){ + e.printStackTrace(); + return null; } - return null; } } diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyTermsBas.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyTermsBas.java index 486577f..1e11aa9 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyTermsBas.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyTermsBas.java @@ -2,6 +2,7 @@ package com.palnet.biz.jpa.entity; import java.io.Serializable; import javax.persistence.*; +import java.time.Instant; import java.util.Date; @@ -21,14 +22,14 @@ public class PtyTermsBas implements Serializable { @Column(name="CREATE_DT", columnDefinition = "TIMESTAMP") - private Date createDt; + private Instant createDt; @Column(name="CREATE_USER_ID") private String createUserId; @Column(name="ESTBSH_DATE", columnDefinition = "TIMESTAMP") - private Date estbshDate; + private Instant estbshDate; @Column(name="LAST_TXN_YN") private String lastTxnYn; @@ -41,7 +42,7 @@ public class PtyTermsBas implements Serializable { @Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP") - private Date updateDt; + private Instant updateDt; @Column(name="UPDATE_USER_ID") private String updateUserId; @@ -57,11 +58,11 @@ public class PtyTermsBas implements Serializable { this.termsSno = termsSno; } - public Date getCreateDt() { + public Instant getCreateDt() { return this.createDt; } - public void setCreateDt(Date createDt) { + public void setCreateDt(Instant createDt) { this.createDt = createDt; } @@ -73,11 +74,11 @@ public class PtyTermsBas implements Serializable { this.createUserId = createUserId; } - public Date getEstbshDate() { + public Instant getEstbshDate() { return this.estbshDate; } - public void setEstbshDate(Date estbshDate) { + public void setEstbshDate(Instant estbshDate) { this.estbshDate = estbshDate; } @@ -105,11 +106,11 @@ public class PtyTermsBas implements Serializable { this.termsCtgryCd = termsCtgryCd; } - public Date getUpdateDt() { + public Instant getUpdateDt() { return this.updateDt; } - public void setUpdateDt(Date updateDt) { + public void setUpdateDt(Instant updateDt) { this.updateDt = updateDt; }