diff --git a/src/main/java/itn/let/cert/phone/service/CertPhoneService.java b/src/main/java/itn/let/cert/phone/service/CertPhoneService.java index db97802c..42b80989 100644 --- a/src/main/java/itn/let/cert/phone/service/CertPhoneService.java +++ b/src/main/java/itn/let/cert/phone/service/CertPhoneService.java @@ -7,6 +7,7 @@ import itn.let.uat.uia.web.SendLogVO; public interface CertPhoneService { + // public List selectMberCertPhoneList(String userId); // // public StatusResponse insertMberCertPhoneInfo(MberCertPhoneVO mberCertPhoneVO); @@ -21,11 +22,13 @@ public interface CertPhoneService { public StatusResponse selectMberCertPhoneList(MberCertPhoneVO mberCertPhoneVO); - public StatusResponse insertCertPhone(MberCertPhoneVO mberCertPhoneVO); + public StatusResponse insertCertPhone(MberCertPhoneVO mberCertPhoneVO, String moblphonNo); public StatusResponse deleteCertPhone(MberCertPhoneVO mberCertPhoneVO); public List selectMberCertPhoneList(String userId); + + public StatusResponse selectMberCertPhoneListWhereUserId(String userId); public StatusResponse updateMberCertPhone(MberCertPhoneVO mberCertPhoneVO); @@ -34,6 +37,7 @@ public interface CertPhoneService { + } diff --git a/src/main/java/itn/let/cert/phone/service/impl/CertPhoneServiceImpl.java b/src/main/java/itn/let/cert/phone/service/impl/CertPhoneServiceImpl.java index c2faf188..bf9296bf 100644 --- a/src/main/java/itn/let/cert/phone/service/impl/CertPhoneServiceImpl.java +++ b/src/main/java/itn/let/cert/phone/service/impl/CertPhoneServiceImpl.java @@ -28,10 +28,10 @@ public class CertPhoneServiceImpl extends EgovAbstractServiceImpl implements Cer @Override - public StatusResponse insertCertPhone(MberCertPhoneVO mberCertPhoneVO) { - MberCertPhoneVO mberCertIpListVO = certPhoneDAO.findByCertPhoneInfo(mberCertPhoneVO); - if(mberCertIpListVO != null) { - return new StatusResponse(HttpStatus.CONFLICT, "중복 IP입니다.", LocalDateTime.now()); + public StatusResponse insertCertPhone(MberCertPhoneVO mberCertPhoneVO, String moblphonNo) { + MberCertPhoneVO mberCertPhoneListVO = certPhoneDAO.findByCertPhoneInfo(mberCertPhoneVO); + if(mberCertPhoneListVO != null || mberCertPhoneListVO.getMbtlnum().equals(moblphonNo) ) { + return new StatusResponse(HttpStatus.CONFLICT, "중복 번호입니다.", LocalDateTime.now()); } certPhoneDAO.insertCertPhone(mberCertPhoneVO); return new StatusResponse(HttpStatus.OK, "등록 하였습니다.", LocalDateTime.now()); @@ -59,6 +59,14 @@ public class CertPhoneServiceImpl extends EgovAbstractServiceImpl implements Cer } + @Override + public StatusResponse selectMberCertPhoneListWhereUserId(String userId) { + return new StatusResponse(HttpStatus.OK, certPhoneDAO.selectMberCertPhoneList(userId), LocalDateTime.now()); + } + + + + @Override public StatusResponse updateMberCertPhone(MberCertPhoneVO mberCertPhoneVO) { certPhoneDAO.updateMberCertPhone(mberCertPhoneVO); @@ -79,7 +87,7 @@ public class CertPhoneServiceImpl extends EgovAbstractServiceImpl implements Cer return new StatusResponse(HttpStatus.OK, "", LocalDateTime.now()); } - + } 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 497102e3..aaabf8c8 100644 --- a/src/main/java/itn/let/cert/phone/web/CertPhoneController.java +++ b/src/main/java/itn/let/cert/phone/web/CertPhoneController.java @@ -65,8 +65,8 @@ public class CertPhoneController { if(StringUtils.isEmpty(userId)) return ResponseEntity.ok().body(new StatusResponse(HttpStatus.BAD_REQUEST, "로그인 후 이용해 주세요", LocalDateTime.now())); } mberCertPhoneVO.setMberId(userId); - - return ResponseEntity.ok().body(certPhoneService.selectMberCertPhoneList(mberCertPhoneVO)); + + return ResponseEntity.ok().body(certPhoneService.selectMberCertPhoneListWhereUserId(userId)); } @RequestMapping(value = {"/cert/phone/findByCertPhoneInfo.do"}) @@ -100,9 +100,9 @@ public class CertPhoneController { } mberCertPhoneVO.setFrstRegisterId(userId); mberCertPhoneVO.setMberId(userId); + - - return ResponseEntity.ok().body(certPhoneService.insertCertPhone(mberCertPhoneVO)); + return ResponseEntity.ok().body(certPhoneService.insertCertPhone(mberCertPhoneVO, loginVO.getMoblphonNo())); } @RequestMapping(value = {"/cert/phone/updateCertPhone.do"}) @@ -119,6 +119,7 @@ public class CertPhoneController { if(StringUtils.isEmpty(userId)) return ResponseEntity.ok().body(new StatusResponse(HttpStatus.BAD_REQUEST, "로그인 후 이용해 주세요", LocalDateTime.now())); } mberCertPhoneVO.setFrstRegisterId(userId); + mberCertPhoneVO.setMberId(userId); return ResponseEntity.ok().body(certPhoneService.updateMberCertPhone(mberCertPhoneVO)); @@ -138,6 +139,7 @@ public class CertPhoneController { if(StringUtils.isEmpty(userId)) return ResponseEntity.ok().body(new StatusResponse(HttpStatus.BAD_REQUEST, "로그인 후 이용해 주세요", LocalDateTime.now())); } mberCertPhoneVO.setLastUpdusrId(userId); + mberCertPhoneVO.setMberId(userId); @@ -160,15 +162,16 @@ public class CertPhoneController { } mberCertPhoneVO.setMberId(userId); + // 번호 중복 확인 + MberCertPhoneVO mberCertIpListVO = (MberCertPhoneVO) certPhoneService.findByCertPhoneInfo(mberCertPhoneVO).getObject(); + if(mberCertIpListVO != null || loginVO.getMoblphonNo().equals(mberCertPhoneVO.getMbtlnum()) ) { + return ResponseEntity.ok().body(new StatusResponse(HttpStatus.CONFLICT, "등록된 번호입니다.", LocalDateTime.now())); + } - - - MjonMsgVO mjonMsgVO = new MjonMsgVO(); mjonMsgVO.setCallTo(mberCertPhoneVO.getMbtlnum()); MjonMsgReturnVO returnVO = mjonMsgDataService.sendSysMsgData(mjonMsgVO); - String resultSts = returnVO.getSendMsgCnt(); String resultBlockSts = returnVO.getSendMsgBlockCnt(); 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 764ffb77..89320850 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovMypageController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovMypageController.java @@ -450,25 +450,6 @@ public class EgovMypageController { } - { - /** - * 보안인증 본인인증 기능추가 - * 20241120 원영현 과장 추가 - * */ - KmcCertChecker kmcCertCheck = new KmcCertChecker(); - - //kmc 본인인증 실/개발 서버 구분 - String serverNm = ""; - if(request.getServerName().contains("192.168.0.60") || request.getServerName().contains("localhost")) { - serverNm = request.getScheme() + "://192.168.0.60:8085"; - }else{ - serverNm = request.getScheme() + "://www.munjaon.co.kr"; - } - - AuthCertVO certVO = kmcCertCheck.authCertCheckNine(serverNm + "/web/user/selectSecurityAuthn.do", loginVO.getId()); - model.addAttribute("certVO", certVO); - } - return "web/user/mberInfoIndex"; } @@ -2953,6 +2934,26 @@ public class EgovMypageController { if(loginVO == null) { return "redirect:/web/user/login/login.do"; } + + + { + /** + * 보안인증 본인인증 기능추가 + * 20241120 원영현 과장 추가 + * */ + KmcCertChecker kmcCertCheck = new KmcCertChecker(); + + //kmc 본인인증 실/개발 서버 구분 + String serverNm = ""; + if(request.getServerName().contains("192.168.0.60") || request.getServerName().contains("localhost")) { + serverNm = request.getScheme() + "://192.168.0.60:8085"; + }else{ + serverNm = request.getScheme() + "://www.munjaon.co.kr"; + } + + AuthCertVO certVO = kmcCertCheck.authCertCheckNine(serverNm + "/web/user/selectSecurityAuthn.do", loginVO.getId()); + model.addAttribute("certVO", certVO); + } model.addAttribute("pageTab", "mberSecureLogin"); return "web/user/mberSecureLogin"; diff --git a/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp b/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp index 78b4db94..b20ca1fd 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp @@ -476,10 +476,9 @@ function callTo() { 회원님 반갑습니다

-<%-- --%> - - -<%-- --%> + + +
나의
단가
@@ -582,119 +581,6 @@ function callTo() {
- - - - - - - - - - - - -

이용내역

diff --git a/src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp b/src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp index 5ad88a44..b718be59 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp @@ -3,6 +3,7 @@ <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +
@@ -425,6 +590,7 @@ function deleteRow(p_ip){

최근 변경일시 : 2024-11-01 12:49

+ ON OFF
@@ -433,23 +599,23 @@ function deleteRow(p_ip){ -
-
-

보안로그인

-
- 현재 접속중인 IP : 000.000.000.00 [허용 IP] -
-
+ + + + + + + -
-

최근 변경일시 : 2024-11-01 12:49

+ + -
- ON - OFF -
-
-
+ + + + + + @@ -463,13 +629,13 @@ function deleteRow(p_ip){
-
+
- + - + @@ -544,7 +710,7 @@ function deleteRow(p_ip){
-

로그인 내역 로그인 내역은 최대 90일까지만 보관됩니다.

+

로그인 내역 로그인 내역은 최대 3개월까지만 보관됩니다.