From aeea09e63e77619cf1d37b11b3d822e4d548c460 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Fri, 22 Nov 2024 10:58:39 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B3=B4=EC=95=88=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=A7=84=ED=96=89=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cert/ip/service/MberCertLoginLogVO.java | 8 ++++ .../service/impl/CertLoginLogServiceImpl.java | 14 +++--- .../cert/phone/web/CertPhoneController.java | 10 +++-- .../let/uat/uia/web/EgovMypageController.java | 9 +++- .../let/cert/MjonCertLoginLog_SQL_mysql.xml | 8 +++- .../WEB-INF/jsp/web/com/webCommonHeader.jsp | 38 ++++++++++++++++ .../WEB-INF/jsp/web/user/mberSecureLogin.jsp | 43 ++++++++++++++++--- 7 files changed, 110 insertions(+), 20 deletions(-) diff --git a/src/main/java/itn/let/cert/ip/service/MberCertLoginLogVO.java b/src/main/java/itn/let/cert/ip/service/MberCertLoginLogVO.java index b261e90f..6ad79286 100644 --- a/src/main/java/itn/let/cert/ip/service/MberCertLoginLogVO.java +++ b/src/main/java/itn/let/cert/ip/service/MberCertLoginLogVO.java @@ -30,6 +30,8 @@ public class MberCertLoginLogVO extends UserDefaultVO{ private String loginDevice; private String loginDt; + private String secuLoginFlag; + public String getCertLoginId() { return certLoginId; @@ -61,6 +63,12 @@ public class MberCertLoginLogVO extends UserDefaultVO{ public void setLoginDt(String loginDt) { this.loginDt = loginDt; } + public String getSecuLoginFlag() { + return secuLoginFlag; + } + public void setSecuLoginFlag(String secuLoginFlag) { + this.secuLoginFlag = secuLoginFlag; + } diff --git a/src/main/java/itn/let/cert/ip/service/impl/CertLoginLogServiceImpl.java b/src/main/java/itn/let/cert/ip/service/impl/CertLoginLogServiceImpl.java index d052ce9b..07a90c1b 100644 --- a/src/main/java/itn/let/cert/ip/service/impl/CertLoginLogServiceImpl.java +++ b/src/main/java/itn/let/cert/ip/service/impl/CertLoginLogServiceImpl.java @@ -51,18 +51,18 @@ public class CertLoginLogServiceImpl extends EgovAbstractServiceImpl implements public void insertCertLoginLog(MberCertLoginLogVO mberCertLoginLogVO, HttpServletRequest request) throws FdlException { - int count = certLoginLogDAO.checkLoginIpExists(mberCertLoginLogVO); - - if (count > 0) { - // 이미 존재하면 UPDATE - certLoginLogDAO.updateCertLoginLog(mberCertLoginLogVO); - } else { +// int count = certLoginLogDAO.checkLoginIpExists(mberCertLoginLogVO); +// +// if (count > 0) { +// // 이미 존재하면 UPDATE +// certLoginLogDAO.updateCertLoginLog(mberCertLoginLogVO); +// } else { mberCertLoginLogVO.setCertLoginId(certLoginLogIdGnrService.getNextStringId()); mberCertLoginLogVO.setLoginDevice(getDevice(request)); certLoginLogDAO.insertCertLoginLog(mberCertLoginLogVO); - } +// } } private String getDevice(HttpServletRequest request) { diff --git a/src/main/java/itn/let/cert/phone/web/CertPhoneController.java b/src/main/java/itn/let/cert/phone/web/CertPhoneController.java index 16b7205b..4bef193e 100644 --- a/src/main/java/itn/let/cert/phone/web/CertPhoneController.java +++ b/src/main/java/itn/let/cert/phone/web/CertPhoneController.java @@ -122,7 +122,9 @@ public class CertPhoneController { if(StringUtils.isEmpty(userId)) return ResponseEntity.ok().body(new StatusResponse(HttpStatus.BAD_REQUEST, "로그인 후 이용해 주세요", LocalDateTime.now())); } mberCertPhoneVO.setFrstRegisterId(userId); - mberCertPhoneVO.setMberId(userId); + if(StringUtils.isEmpty(mberCertPhoneVO.getMberId()) ) { + mberCertPhoneVO.setMberId(userId); + } return ResponseEntity.ok().body(certPhoneService.updateMberCertPhone(mberCertPhoneVO)); @@ -142,8 +144,10 @@ public class CertPhoneController { if(StringUtils.isEmpty(userId)) return ResponseEntity.ok().body(new StatusResponse(HttpStatus.BAD_REQUEST, "로그인 후 이용해 주세요", LocalDateTime.now())); } mberCertPhoneVO.setLastUpdusrId(userId); - mberCertPhoneVO.setMberId(userId); - + + if(StringUtils.isEmpty(mberCertPhoneVO.getMberId()) ) { + mberCertPhoneVO.setMberId(userId); + } return ResponseEntity.ok().body(certPhoneService.deleteCertPhone(mberCertPhoneVO)); diff --git a/src/main/java/itn/let/uat/uia/web/EgovMypageController.java b/src/main/java/itn/let/uat/uia/web/EgovMypageController.java index 27592d5d..694c3e53 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovMypageController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovMypageController.java @@ -2951,6 +2951,10 @@ public class EgovMypageController { return "redirect:/web/user/login/login.do"; } + // secuLoginFlag 값을 Model에 추가 + model.addAttribute("secuLoginFlag", mberCertLoginLogVO.getSecuLoginFlag()); + System.out.println(mberCertLoginLogVO.getSecuLoginFlag()); + //로그인 권한정보 불러오기 String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); @@ -3022,7 +3026,10 @@ public class EgovMypageController { model.addAttribute("mberManageVO", userManageService.selectUserInfo(mberManageVO)); - model.addAttribute("pageTab", "mberSecureLogin"); + model.addAttribute("pageTab", "mberSecureLogin"); + + + return "web/user/mberSecureLogin"; } diff --git a/src/main/resources/egovframework/sqlmap/let/cert/MjonCertLoginLog_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/cert/MjonCertLoginLog_SQL_mysql.xml index afc29c29..6f4bd427 100644 --- a/src/main/resources/egovframework/sqlmap/let/cert/MjonCertLoginLog_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/cert/MjonCertLoginLog_SQL_mysql.xml @@ -18,8 +18,12 @@ COUNT(CERT_LOGIN_ID) OVER() AS totCnt , CERT_LOGIN_ID as certLoginId , LOGIN_ID as loginId - , LOGIN_IP as loginIp - , LOGIN_DEVICE as loginDevice + , LOGIN_IP as loginIp + , CASE + WHEN LOGIN_DEVICE = 'D' THEN 'PC' + WHEN LOGIN_DEVICE IN ('M', 'T') THEN '모바일' + ELSE 'PC' + END AS loginDevice , DATE_FORMAT(LOGIN_DT,'%Y-%m-%d %T') as loginDt FROM LETTNGNRLMBER_CERT_LOGIN_LOG_IP WHERE 1=1 diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index b3bc00cd..5be03b57 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -41,6 +41,42 @@ + +