From 51980d12b326a21cb7ebb0f8fcc3582878b23182 Mon Sep 17 00:00:00 2001 From: myname Date: Sun, 17 Nov 2024 02:45:52 +0900 Subject: [PATCH 01/63] =?UTF-8?q?2024-11-17=2002:45=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9E=90=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=EC=8B=9C=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EB=94=94/=EB=B9=84=EB=B2=88=20=EC=9D=B8=EC=A6=9D?= =?UTF-8?q?=EC=97=90=20=ED=95=B8=EB=93=9C=ED=8F=B0=20=EC=9D=B8=EC=A6=9D=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../msgdata/service/MjonMsgDataService.java | 1 + .../msgdata/service/impl/MjonMsgDataDAO.java | 4 + .../service/impl/MjonMsgDataServiceImpl.java | 5 + .../let/uat/uia/web/EgovLoginController.java | 927 +++++++++++++++++- .../sqlmap/let/msg/MjonMsgData_SQL_mysql.xml | 20 + .../WEB-INF/jsp/web/com/webCommonHeader.jsp | 3 + .../jsp/web/login/EgovLoginGnrlUsr.jsp | 290 +++++- 7 files changed, 1243 insertions(+), 7 deletions(-) diff --git a/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java b/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java index 16e0c9c8..39af3de7 100644 --- a/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java +++ b/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java @@ -94,6 +94,7 @@ public interface MjonMsgDataService { //시스템 문자발송 로그 조회 public SendLogVO selectSysMsgLog(SendLogVO sendLogVO) throws Exception; + public SendLogVO selectSysMsgLogCheck(SendLogVO sendLogVO) throws Exception; //주소록 그룹의 저장 주소 리스트 불러오기 public List selectMsgAddrListAjax(AddrVO addrVO) throws Exception; diff --git a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataDAO.java b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataDAO.java index 7177d40f..3701a684 100644 --- a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataDAO.java +++ b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataDAO.java @@ -202,6 +202,10 @@ public class MjonMsgDataDAO extends EgovAbstractDAO { return (SendLogVO) select("mjonMsgDAO.selectSysMsgLog",sendLogVO); } + public SendLogVO selectSysMsgLogCheck(SendLogVO sendLogVO) throws Exception{ + return (SendLogVO) select("mjonMsgDAO.selectSysMsgLogCheck",sendLogVO); + } + @SuppressWarnings("unchecked") public List selectMsgAddrListAjax(AddrVO addrVO) throws Exception{ diff --git a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java index 14834912..cd307bfe 100644 --- a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java +++ b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java @@ -2092,6 +2092,11 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M return mjonMsgDataDAO.selectSysMsgLog(sendLogVO); } + @Override + public SendLogVO selectSysMsgLogCheck(SendLogVO sendLogVO) throws Exception { + return mjonMsgDataDAO.selectSysMsgLogCheck(sendLogVO); + } + public List selectMsgAddrListAjax(AddrVO addrVO) throws Exception{ return mjonMsgDataDAO.selectMsgAddrListAjax(addrVO); diff --git a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java index 33526052..854cd46e 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java @@ -1463,7 +1463,596 @@ public class EgovLoginController { * @return result - 로그인결과(세션정보) * @exception Exception */ - @RequestMapping(value = "/web/user/login/actionSecurityLogin.do") + @RequestMapping(value = "/web/user/login/actionSecurityLogin_bak_00.do") + public String selectActionSecurityLoginWeb_bak(@ModelAttribute("loginVO") LoginVO loginVO, HttpServletResponse response, + HttpServletRequest request, @RequestParam Map commandMap, ModelMap model, + HttpSession session, RedirectAttributes redirectAttributes) throws Exception { + + String userIp = EgovClntInfo.getClntIP(request); + HackIpVO hackIpVO = new HackIpVO(); + hackIpVO.setAccessIp(userIp); + hackIpVO.setBlockYn("Y"); + if (null != hackIpService.selectHackIpVO(hackIpVO)) { + String message = "차단된 아이피입니다. 관리자에게 문의해 주십시요."; + redirectAttributes.addFlashAttribute("message", message); + return "redirect:/"; + } + + /*ScriptEngineManager engine = new ScriptEngineManager();*/ + + loginVO.setUserSe("USR"); + // 로그인 정보 check + + if (loginVO.getId() == null || loginVO.getPassword() == null) { + // 회원가입 시 로그인 처리 + LoginVO pLoginVO = (LoginVO) request.getAttribute("pLoginVO"); + if (pLoginVO == null) { + // RSA 키 생성 + initRsa(request); + /* return "redirect:/web/user/login/login.do"; */ + return "redirect:/"; + } else { + loginVO.setId(pLoginVO.getId()); + loginVO.setPassword(pLoginVO.getPassword()); + loginVO.setBeforeUrl(pLoginVO.getBeforeUrl()); + loginVO.setMessage(pLoginVO.getMessage()); + } + } + + // 1. 일반 로그인 처리 + PrivateKey privateKey = (PrivateKey) session.getAttribute(EgovLoginController.RSA_WEB_KEY); + if (privateKey == null) { + initRsa(request); + /*return "web/site/login/EgovLoginGnrlUsr";*/ + String message = "아이디와 비밀번호를 확인해주세요."; + redirectAttributes.addFlashAttribute("message", message); + System.out.println("======================================================"); + System.out.println("= RSA privateKey is null ="); + System.out.println("======================================================"); + return "redirect:/web/main/mainPage.do"; + } + + LoginVO resultVO; + // 복호화 + String id = ""; + try { + //아이디 복호화 후 소문자 변환 + id = decryptRsa(privateKey, loginVO.getId()).toLowerCase(); + } catch (Exception e) { + initRsa(request); + // return "redirect:/web/user/login/login.do"; + if (loginVO.getBeforeUrl().toString().contains("/web/user/login/login.do")) { + redirectAttributes.addFlashAttribute("fail", true); + return "redirect:/web/user/login/login.do"; + } + return "redirect:/"; + + } + String password = decryptRsa(privateKey, loginVO.getPassword()); + loginVO.setId(id); + loginVO.setIp(EgovClntInfo.getClntIP(request)); + loginVO.setPassword(password); + loginVO.setUserSe("GNR"); + loginVO.setStatusAll("Y"); // 신청대기중인 사용자까지 조회 + + //기업회원 가입중인지 체크 - 기존 로그인 select는 MBER_STTUS = 'Y'가 하드코딩이라 로그인 전 기업회원 가입중인지 선 체크 + //암호화 2번 방지를 위한 LoginVO 생성 + LoginVO loginCmpChkVO = new LoginVO(); + loginCmpChkVO.setId(id); + loginCmpChkVO.setIp(EgovClntInfo.getClntIP(request)); + loginCmpChkVO.setPassword(password); + loginCmpChkVO.setUserSe("GNR"); + loginCmpChkVO.setStatusAll("Y"); // 신청대기중인 사용자까지 조회 + loginCmpChkVO.setEmplyrSttusCode("A"); // 신청대기중인 사용자까지 조회 + LoginVO cmpHstResultVO = loginService.actionLoginCmpChk(loginCmpChkVO); + if(null != cmpHstResultVO.getId()) { + //기업회원 정보 마지막 내역 조회 + MberManageVO mberManageVO = new MberManageVO(); + mberManageVO.setMberId(loginVO.getId()); + MberManageVO cmpChangeManageVO = mberManageService.selectCmpUsrHst(mberManageVO); + if(null != cmpChangeManageVO) { + if("01".equals(cmpChangeManageVO.getHstType())) { //가장 마지막 내역이 기업회원 가입일 시 + if("01".equals(cmpChangeManageVO.getHstSttus()) || "03".equals(cmpChangeManageVO.getHstSttus()) ) { //가장 마지막 기업회원 가입이 신청 또는 반려 상태일 시 + redirectAttributes.addFlashAttribute("mberId", loginVO.getId()); + //addFlashAttribute 일회성으로 인하여 membershipAttachDocBefore.do 이동 후 + //membershipAttachDoc.do로 바로 submit하여 새로고침 시 정보 유지되게 끔 처리 + return "redirect:/web/user/login/membershipAttachDocBefore.do"; + } + } + } + } + //스팸처리 회원인지 mj_spam_member_info 해당 ID의 최근 1개 데이터 조회 + LoginVO loginSmiChkVO = new LoginVO(); + loginSmiChkVO.setId(id); + loginSmiChkVO.setIp(EgovClntInfo.getClntIP(request)); + loginSmiChkVO.setPassword(password); + loginSmiChkVO.setUserSe("GNR"); + loginSmiChkVO.setStatusAll("Y"); // 신청대기중인 사용자까지 조회 + loginSmiChkVO.setEmplyrSttusCode("B"); // 신청대기중인 사용자까지 조회 + LoginVO smiResultVO = loginService.actionLoginCmpChk(loginSmiChkVO); + if(null != smiResultVO.getId()) { + MberManageVO spamMberManageVO = new MberManageVO(); + spamMberManageVO.setMberId(loginVO.getId()); + MberManageVO spamMemberInfoVO = mberManageService.selectSpamMemberInfo(spamMberManageVO); + if(null != spamMemberInfoVO) { + redirectAttributes.addFlashAttribute("mberId", loginVO.getId()); + return "redirect:/web/user/login/loginRestrictionUseBefore.do"; + } + } + resultVO = loginService.actionLogin(loginVO); + LoginVO passMissVO = loginService.selectPassMiss(loginVO); + + String alertMessage = ""; + if (!"admin".equals(loginVO.getId())) { + //아이디가 존재 + if(passMissVO != null) { + // 로그인 실패 ( + if (null == resultVO.getId() && passMissVO.getPassMiss() < 5 ) { + loginService.updatePassMissPlus(loginVO); + alertMessage = egovMessageSource.getMessage("fail.common.login"); + + // 로그인 실패시 해킹의심 IP 테이블에 등록_아이디는 있지만 비밀번호가 틀린상황 + /// HackIpVO hackIpVO = new HackIpVO(); + hackIpVO.setHackUserId(loginVO.getId()); + hackIpVO.setAccessIp( EgovClntInfo.getClntIP(request)); + hackIpService.insertHackIp(hackIpVO); + if (loginVO.getBeforeUrl().toString().contains("/web/user/login/login.do")) { + redirectAttributes.addFlashAttribute("fail", true); + return "redirect:/web/user/login/login.do"; + } + + return goUserLoginPage(redirectAttributes, loginVO, request, model, alertMessage); + } else { + if (passMissVO.getPassMiss() >= 5) { + alertMessage = "패스워드가 5회 이상 틀려 로그인 할수 없습니다. 비밀번호를 재설정해주세요."; + return goUserPassMissPage(redirectAttributes, loginVO, request, model, alertMessage); + } /* + * else if("A".equals(resultVO.getEmplyrSttusCode())){ //신청상태 alertMessage = + * "신청하신 아이디가 현제 승인대기 상" + "태입니다."; return goUserLoginPage(redirectAttributes, + * request, model, alertMessage); }else + * if("B".equals(resultVO.getEmplyrSttusCode())){ //신청상태 alertMessage = + * "아이디가 차단상태가 되어 사용할수 없습니다."; return goUserLoginPage(redirectAttributes, + * request, model, alertMessage); } + */ + loginService.updatePassMissReset(loginVO); + } + } + //아이디 미존재 + else { + alertMessage = egovMessageSource.getMessage("fail.common.login"); + + // 로그인 실패시 해킹의심 IP 테이블에 등록_아이디없고 비밀번호도 틀린상황 + /// HackIpVO hackIpVO = new HackIpVO(); + hackIpVO.setHackUserId(loginVO.getId()); + hackIpVO.setAccessIp(EgovClntInfo.getClntIP(request)); + hackIpService.insertHackIp(hackIpVO); + if (loginVO.getBeforeUrl().toString().contains("/web/user/login/login.do")) { + redirectAttributes.addFlashAttribute("fail", true); + return "redirect:/web/user/login/login.do"; + } + + return goUserLoginPage(redirectAttributes, loginVO, request, model, alertMessage); + } + } + + + /* 일시 : 2023.07.26 + * 내용 : 로그인시 휴먼고객 redirect 기능 추가 + * 작업자 : 원영현 과장 + */ + + if(resultVO.getDormantYn().equals("Y") || resultVO.getDormantYn() == "Y") { + + return "redirect:/web/user/humanPage.do"; + } + + + + + boolean loginPolicyYn = true; + + // 접속IP + // userIp = EgovClntInfo.getClntIP(request); + + // resultVO.siteId 의 각 로그인 ip를 조회함 + if (resultVO != null && resultVO.getId() != null && !resultVO.getId().equals("") && loginPolicyYn) { + // 세션에다 ip 등록 + resultVO.setIp(userIp); + // 2. spring security 연동 + request.getSession().setAttribute("LoginVO", resultVO); + UsernamePasswordAuthenticationFilter springSecurity = null; + ApplicationContext act = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext()); + Map beans = act.getBeansOfType(UsernamePasswordAuthenticationFilter.class); + + if (beans.size() > 0) { + springSecurity = (UsernamePasswordAuthenticationFilter) beans.values().toArray()[0]; + springSecurity.setUsernameParameter("egov_security_username"); + springSecurity.setPasswordParameter("egov_security_password"); + springSecurity.setRequiresAuthenticationRequestMatcher(new AntPathRequestMatcher(request.getServletContext().getContextPath() + "/egov_security_login", "POST")); + } else { + throw new IllegalStateException("No AuthenticationProcessingFilter"); + } + + springSecurity.doFilter(new RequestWrapperForSecurity(request, resultVO.getUserSe() + resultVO.getId(), resultVO.getUniqId()), response, null); + { // 관리자 로그인 log 저장 + String uniqId = ""; + String ip = ""; + + /* Authenticated */ + LoginLog loginLog = new LoginLog(); + Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); + if (isAuthenticated.booleanValue()) { + LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + uniqId = user.getUniqId(); + ip = EgovClntInfo.getClntIP(request); + + HttpSession httpSession = request.getSession(true); + { + List siteManageList = new ArrayList(); + SiteManagerVO siteManagerVO = new SiteManagerVO(); + siteManagerVO.setFirstIndex(0); + siteManagerVO.setRecordCountPerPage(100); + siteManageList = egovSiteManagerService.selectSiteManagerList(siteManagerVO); + httpSession.setAttribute("siteManageList", siteManageList); + httpSession.setAttribute("loginId", user.getId()); // 자동완성 공통으로 쓰기위해 + httpSession.setAttribute("esntlId", user.getPassword()); + + // 최근검색어 조회 후 세션에 넣어줌 + /* + * UserManageVO tempUserManageVO = new UserManageVO(); + * tempUserManageVO.setEmplyrId(user.getId()); tempUserManageVO = + * userManageService.selectRecentSearchWord(tempUserManageVO); + * + * List lisRecentSearch = new ArrayList(); if(null != + * tempUserManageVO){ //ArrayList 로 세션 저장 + * Collections.addAll(lisRecentSearch,tempUserManageVO.getSearchWord().split("," + * )) ; } httpSession.setAttribute("recentSearch", lisRecentSearch) ; + */ + } + } + /* + * loginLog.setLoginId(uniqId); loginLog.setLoginIp(ip); + * loginLog.setLoginMthd("I"); // 로그인:I, 로그아웃:O loginLog.setErrOccrrAt("N"); + * loginLog.setErrorCode(""); //로그인은 관리자, PC만 됨 loginLog.setUserAt("U"); //사용자 + * loginLog.setDeviceType("P"); //PC loginLog.setProgrmFileNm("adminLogin"); + * loginLog.setMenuNm("관리자로그인"); loginLogService.logInsertLoginLog(loginLog); + */ + + loginVO.getId(); + loginVO.getIp(); + loginVO.setMessage("로그인 성공되었습니다."); + loginVO.setLoginYn("Y"); + loginService.insertActionLoginLog(loginVO); + } + + // 등급제 Start + // 회원별 등급 적용 + MberGrdVO mberGrdVO = new MberGrdVO(); + mberGrdVO.setMberId(loginVO.getId()); + mberGrdVO.setAmt("0"); + mberGrdVO.setMoid(""); + mberGrdService.mberGrdSaveByUserNoHist(mberGrdVO); + // End + + // 이벤트 결제 바로가기 로직 체크 Start + String goEventPay = (String) commandMap.get("goEventPay"); + System.out.println("goEventPay : " + goEventPay); + if (null != goEventPay && goEventPay.equals("Y")) { + // 이벤트 결제 바로가기 + if (goEventPay(loginVO) == true) { + loginVO.setBeforeUrl("/web/event/member/pay/PayView.do"); + } + } + // End + + String beforeUrl = (String) commandMap.get("beforeUrl"); + + // 로그인 전 URL 호출 시 + if (loginVO.getBeforeUrl() != null && !("").equals(loginVO.getBeforeUrl())) { + request.getSession().setAttribute("usrBeforeUrl", loginVO.getBeforeUrl()); + // 회원가입 시 메세지 처리 + if (loginVO.getMessage() != null && !("").equals(loginVO.getMessage())) { + request.getSession().setAttribute("registMessage", loginVO.getMessage()); + } + } + + // 개인키 삭제 + // 성공시 웹페이지 분기로 인해 session에 페이지 타입을 넣어준다. + request.getSession().setAttribute("pageType", "web"); + + return "blank"; // 성공 시 페이지.. (redirect 불가) + + // uat/uia/actionMain.do 실제 성공시 무조건 좌측 메소드로 감. + // return "forward:/web/main/mainPage.do"; + } else { + String message = egovMessageSource.getMessage("fail.common.login"); + redirectAttributes.addFlashAttribute("beforeUrl", loginVO.getBeforeUrl()); + redirectAttributes.addFlashAttribute("message", message); + return "redirect:/"; + } + } + + /** + * @Method Name : selectUserSttusAjax + * @작성일 : 2024. 3. 27. + * @작성자 : WYH + * @변경이력 : + * @Method 설명 : 회원상태 조회 (Y:일반회원, B:이용정지 회원, N:탈퇴회원) + */ + /* + @RequestMapping(value = { "/web/user/login/actionSecurityLoginAjax.do" }) + public ModelAndView actionSecurityLoginAjax(@ModelAttribute("loginVO") LoginVO loginVO, HttpServletResponse response, + HttpServletRequest request, @RequestParam Map commandMap, ModelMap model, + HttpSession session, RedirectAttributes redirectAttributes) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + String p_id = ""; + String p_pwd = ""; + + try { + //id, pwd 로그인 하고 결과와 hp 번호를 돌려주면 됨 + p_id = request.getParameter("id"); + p_pwd = request.getParameter("password"); + + + + String userId = mjonMsgVO.getUserId(); + String userSttus = userManageService.selectUserStatusInfoCheck(userId); + + modelAndView.addObject("status", "success"); + modelAndView.addObject("userSttus", userSttus); + + } catch (Exception e) { + modelAndView.addObject("status", "fail"); + modelAndView.addObject("msg", "인증에 실패하였습니다."); + } + + return modelAndView; + } + */ + + @RequestMapping(value = "/web/user/login/actionSecurityLoginBeforeHpAjax.do") + public ModelAndView selectActionSecurityLoginWebBeforeHp(@ModelAttribute("loginVO") LoginVO loginVO, HttpServletResponse response, + HttpServletRequest request, @RequestParam Map commandMap, ModelMap model, + HttpSession session, RedirectAttributes redirectAttributes) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + String userIp = EgovClntInfo.getClntIP(request); + HackIpVO hackIpVO = new HackIpVO(); + hackIpVO.setAccessIp(userIp); + hackIpVO.setBlockYn("Y"); + if (null != hackIpService.selectHackIpVO(hackIpVO)) { + String message = "차단된 아이피입니다. 관리자에게 문의해 주십시요."; + + modelAndView.addObject("status", "fail"); + modelAndView.addObject("msg", message); + return modelAndView; + + } + + /*ScriptEngineManager engine = new ScriptEngineManager();*/ + + loginVO.setUserSe("USR"); + // 로그인 정보 check + + if (loginVO.getId() == null || loginVO.getPassword() == null) { + // 회원가입 시 로그인 처리 + LoginVO pLoginVO = (LoginVO) request.getAttribute("pLoginVO"); + if (pLoginVO == null) { + // RSA 키 생성 + initRsa(request); + /* return "redirect:/web/user/login/login.do"; */ + //return "redirect:/"; + + String message = "로그인 실패했습니다."; + + modelAndView.addObject("status", "fail"); + modelAndView.addObject("msg", message); + return modelAndView; + + } else { + loginVO.setId(pLoginVO.getId()); + loginVO.setPassword(pLoginVO.getPassword()); + loginVO.setBeforeUrl(pLoginVO.getBeforeUrl()); + loginVO.setMessage(pLoginVO.getMessage()); + } + } + + // 1. 일반 로그인 처리 + PrivateKey privateKey = (PrivateKey) session.getAttribute(EgovLoginController.RSA_WEB_KEY); + if (privateKey == null) { + initRsa(request); + /*return "web/site/login/EgovLoginGnrlUsr";*/ + String message = "아이디와 비밀번호를 확인해주세요."; + redirectAttributes.addFlashAttribute("message", message); + System.out.println("======================================================"); + System.out.println("= RSA privateKey is null ="); + System.out.println("======================================================"); + + modelAndView.addObject("status", "fail"); + modelAndView.addObject("msg", message); + return modelAndView; + + } + + LoginVO resultVO; + // 복호화 + String id = ""; + try { + //아이디 복호화 후 소문자 변환 + id = decryptRsa(privateKey, loginVO.getId()).toLowerCase(); + } catch (Exception e) { + initRsa(request); + + String message = "로그인 실패했습니다."; + + modelAndView.addObject("status", "fail"); + modelAndView.addObject("msg", message); + return modelAndView; + + } + String password = decryptRsa(privateKey, loginVO.getPassword()); + loginVO.setId(id); + loginVO.setIp(EgovClntInfo.getClntIP(request)); + loginVO.setPassword(password); + loginVO.setUserSe("GNR"); + loginVO.setStatusAll("Y"); // 신청대기중인 사용자까지 조회 + + //기업회원 가입중인지 체크 - 기존 로그인 select는 MBER_STTUS = 'Y'가 하드코딩이라 로그인 전 기업회원 가입중인지 선 체크 + //암호화 2번 방지를 위한 LoginVO 생성 + LoginVO loginCmpChkVO = new LoginVO(); + loginCmpChkVO.setId(id); + loginCmpChkVO.setIp(EgovClntInfo.getClntIP(request)); + loginCmpChkVO.setPassword(password); + loginCmpChkVO.setUserSe("GNR"); + loginCmpChkVO.setStatusAll("Y"); // 신청대기중인 사용자까지 조회 + loginCmpChkVO.setEmplyrSttusCode("A"); // 신청대기중인 사용자까지 조회 + LoginVO cmpHstResultVO = loginService.actionLoginCmpChk(loginCmpChkVO); + if(null != cmpHstResultVO.getId()) { + //기업회원 정보 마지막 내역 조회 + MberManageVO mberManageVO = new MberManageVO(); + mberManageVO.setMberId(loginVO.getId()); + MberManageVO cmpChangeManageVO = mberManageService.selectCmpUsrHst(mberManageVO); + if(null != cmpChangeManageVO) { + if("01".equals(cmpChangeManageVO.getHstType())) { //가장 마지막 내역이 기업회원 가입일 시 + if("01".equals(cmpChangeManageVO.getHstSttus()) || "03".equals(cmpChangeManageVO.getHstSttus()) ) { //가장 마지막 기업회원 가입이 신청 또는 반려 상태일 시 + + String message = "기업회원 신청 또는 반려상태입니다."; + + modelAndView.addObject("status", "fail"); + modelAndView.addObject("msg", message); + return modelAndView; + + } + } + } + } + //스팸처리 회원인지 mj_spam_member_info 해당 ID의 최근 1개 데이터 조회 + LoginVO loginSmiChkVO = new LoginVO(); + loginSmiChkVO.setId(id); + loginSmiChkVO.setIp(EgovClntInfo.getClntIP(request)); + loginSmiChkVO.setPassword(password); + loginSmiChkVO.setUserSe("GNR"); + loginSmiChkVO.setStatusAll("Y"); // 신청대기중인 사용자까지 조회 + loginSmiChkVO.setEmplyrSttusCode("B"); // 신청대기중인 사용자까지 조회 + LoginVO smiResultVO = loginService.actionLoginCmpChk(loginSmiChkVO); + if(null != smiResultVO.getId()) { + MberManageVO spamMberManageVO = new MberManageVO(); + spamMberManageVO.setMberId(loginVO.getId()); + MberManageVO spamMemberInfoVO = mberManageService.selectSpamMemberInfo(spamMberManageVO); + if(null != spamMemberInfoVO) { + String message = "신청대기중인 상태입니다."; + + modelAndView.addObject("status", "fail"); + modelAndView.addObject("msg", message); + return modelAndView; + } + } + resultVO = loginService.actionLogin(loginVO); + LoginVO passMissVO = loginService.selectPassMiss(loginVO); + + String alertMessage = ""; + if (!"admin".equals(loginVO.getId())) { + //아이디가 존재 + if(passMissVO != null) { + // 로그인 실패 ( + if (null == resultVO.getId() && passMissVO.getPassMiss() < 5 ) { + loginService.updatePassMissPlus(loginVO); + alertMessage = egovMessageSource.getMessage("fail.common.login"); + + // 로그인 실패시 해킹의심 IP 테이블에 등록_아이디는 있지만 비밀번호가 틀린상황 + /// HackIpVO hackIpVO = new HackIpVO(); + hackIpVO.setHackUserId(loginVO.getId()); + hackIpVO.setAccessIp( EgovClntInfo.getClntIP(request)); + hackIpService.insertHackIp(hackIpVO); + if (loginVO.getBeforeUrl().toString().contains("/web/user/login/login.do")) { + String message = "로그인 실패했습니다."; + + modelAndView.addObject("status", "fail"); + modelAndView.addObject("msg", message); + return modelAndView; + } + + String message = "로그인 실패했습니다."; + + modelAndView.addObject("status", "fail"); + modelAndView.addObject("msg", message); + return modelAndView; + + } else { + if (passMissVO.getPassMiss() >= 5) { + //alertMessage = "패스워드가 5회 이상 틀려 로그인 할수 없습니다. 비밀번호를 재설정해주세요."; + String message = "패스워드가 5회 이상 틀려 로그인 할수 없습니다. 비밀번호를 재설정해주세요."; + + modelAndView.addObject("status", "fail"); + modelAndView.addObject("msg", message); + return modelAndView; + } /* + * else if("A".equals(resultVO.getEmplyrSttusCode())){ //신청상태 alertMessage = + * "신청하신 아이디가 현제 승인대기 상" + "태입니다."; return goUserLoginPage(redirectAttributes, + * request, model, alertMessage); }else + * if("B".equals(resultVO.getEmplyrSttusCode())){ //신청상태 alertMessage = + * "아이디가 차단상태가 되어 사용할수 없습니다."; return goUserLoginPage(redirectAttributes, + * request, model, alertMessage); } + */ + loginService.updatePassMissReset(loginVO); + } + } + //아이디 미존재 + else { + alertMessage = egovMessageSource.getMessage("fail.common.login"); + + // 로그인 실패시 해킹의심 IP 테이블에 등록_아이디없고 비밀번호도 틀린상황 + /// HackIpVO hackIpVO = new HackIpVO(); + hackIpVO.setHackUserId(loginVO.getId()); + hackIpVO.setAccessIp(EgovClntInfo.getClntIP(request)); + hackIpService.insertHackIp(hackIpVO); + if (loginVO.getBeforeUrl().toString().contains("/web/user/login/login.do")) { + String message = "로그인 실패했습니다."; + + modelAndView.addObject("status", "fail"); + modelAndView.addObject("msg", message); + return modelAndView; + } + + String message = "로그인 실패했습니다."; + + modelAndView.addObject("status", "fail"); + modelAndView.addObject("msg", message); + return modelAndView; + } + } + + + /* 일시 : 2023.07.26 + * 내용 : 로그인시 휴먼고객 redirect 기능 추가 + * 작업자 : 원영현 과장 + */ + + if(resultVO.getDormantYn().equals("Y") || resultVO.getDormantYn() == "Y") { + + String message = "휴면계정입니다."; + + modelAndView.addObject("status", "fail"); + modelAndView.addObject("msg", message); + return modelAndView; + } + + String message = "로그인 성공했습니다."; + + modelAndView.addObject("status", "success"); + modelAndView.addObject("msg", message); + modelAndView.addObject("data", resultVO); + + return modelAndView; + + + } + + @RequestMapping(value = "/web/user/login/actionSecurityLogin_ori_00.do") public String selectActionSecurityLoginWeb(@ModelAttribute("loginVO") LoginVO loginVO, HttpServletResponse response, HttpServletRequest request, @RequestParam Map commandMap, ModelMap model, HttpSession session, RedirectAttributes redirectAttributes) throws Exception { @@ -1772,6 +2361,340 @@ public class EgovLoginController { } } + + + @RequestMapping(value = "/web/user/login/actionSecurityLoginAfterHp.do") + public String selectActionSecurityLoginWebAfterHp(@ModelAttribute("loginVO") LoginVO loginVO, HttpServletResponse response, + HttpServletRequest request, @RequestParam Map commandMap, ModelMap model, + HttpSession session, RedirectAttributes redirectAttributes) throws Exception { + + String userIp = EgovClntInfo.getClntIP(request); + HackIpVO hackIpVO = new HackIpVO(); + hackIpVO.setAccessIp(userIp); + hackIpVO.setBlockYn("Y"); + if (null != hackIpService.selectHackIpVO(hackIpVO)) { + String message = "차단된 아이피입니다. 관리자에게 문의해 주십시요."; + redirectAttributes.addFlashAttribute("message", message); + return "redirect:/"; + } + + /*ScriptEngineManager engine = new ScriptEngineManager();*/ + + loginVO.setUserSe("USR"); + // 로그인 정보 check + + if (loginVO.getId() == null || loginVO.getPassword() == null) { + // 회원가입 시 로그인 처리 + LoginVO pLoginVO = (LoginVO) request.getAttribute("pLoginVO"); + if (pLoginVO == null) { + // RSA 키 생성 + initRsa(request); + /* return "redirect:/web/user/login/login.do"; */ + return "redirect:/"; + } else { + loginVO.setId(pLoginVO.getId()); + loginVO.setPassword(pLoginVO.getPassword()); + loginVO.setBeforeUrl(pLoginVO.getBeforeUrl()); + loginVO.setMessage(pLoginVO.getMessage()); + } + } + + // 1. 일반 로그인 처리 + PrivateKey privateKey = (PrivateKey) session.getAttribute(EgovLoginController.RSA_WEB_KEY); + if (privateKey == null) { + initRsa(request); + /*return "web/site/login/EgovLoginGnrlUsr";*/ + String message = "아이디와 비밀번호를 확인해주세요."; + redirectAttributes.addFlashAttribute("message", message); + System.out.println("======================================================"); + System.out.println("= RSA privateKey is null ="); + System.out.println("======================================================"); + return "redirect:/web/main/mainPage.do"; + } + + LoginVO resultVO; + // 복호화 + String id = ""; + try { + //아이디 복호화 후 소문자 변환 + id = decryptRsa(privateKey, loginVO.getId()).toLowerCase(); + } catch (Exception e) { + initRsa(request); + // return "redirect:/web/user/login/login.do"; + if (loginVO.getBeforeUrl().toString().contains("/web/user/login/login.do")) { + redirectAttributes.addFlashAttribute("fail", true); + return "redirect:/web/user/login/login.do"; + } + return "redirect:/"; + + } + + + //핸드폰 인증번호 확인 + String s_hp = request.getParameter("hp"); + String s_num = request.getParameter("num"); + + System.out.println(s_hp); + System.out.println(s_num); + System.out.println("s_num=============="); + + SendLogVO sendLogVO = new SendLogVO(); + sendLogVO.setSendId(id); + sendLogVO.setReceive(s_hp); + sendLogVO.setCheckNo(s_num); + + sendLogVO = mjonMsgDataService.selectSysMsgLogCheck(sendLogVO); + + if (sendLogVO==null) { + redirectAttributes.addFlashAttribute("fail2", true); + return "redirect:/web/user/login/login.do"; + } + + + String password = decryptRsa(privateKey, loginVO.getPassword()); + loginVO.setId(id); + loginVO.setIp(EgovClntInfo.getClntIP(request)); + loginVO.setPassword(password); + loginVO.setUserSe("GNR"); + loginVO.setStatusAll("Y"); // 신청대기중인 사용자까지 조회 + + //기업회원 가입중인지 체크 - 기존 로그인 select는 MBER_STTUS = 'Y'가 하드코딩이라 로그인 전 기업회원 가입중인지 선 체크 + //암호화 2번 방지를 위한 LoginVO 생성 + LoginVO loginCmpChkVO = new LoginVO(); + loginCmpChkVO.setId(id); + loginCmpChkVO.setIp(EgovClntInfo.getClntIP(request)); + loginCmpChkVO.setPassword(password); + loginCmpChkVO.setUserSe("GNR"); + loginCmpChkVO.setStatusAll("Y"); // 신청대기중인 사용자까지 조회 + loginCmpChkVO.setEmplyrSttusCode("A"); // 신청대기중인 사용자까지 조회 + LoginVO cmpHstResultVO = loginService.actionLoginCmpChk(loginCmpChkVO); + if(null != cmpHstResultVO.getId()) { + //기업회원 정보 마지막 내역 조회 + MberManageVO mberManageVO = new MberManageVO(); + mberManageVO.setMberId(loginVO.getId()); + MberManageVO cmpChangeManageVO = mberManageService.selectCmpUsrHst(mberManageVO); + if(null != cmpChangeManageVO) { + if("01".equals(cmpChangeManageVO.getHstType())) { //가장 마지막 내역이 기업회원 가입일 시 + if("01".equals(cmpChangeManageVO.getHstSttus()) || "03".equals(cmpChangeManageVO.getHstSttus()) ) { //가장 마지막 기업회원 가입이 신청 또는 반려 상태일 시 + redirectAttributes.addFlashAttribute("mberId", loginVO.getId()); + //addFlashAttribute 일회성으로 인하여 membershipAttachDocBefore.do 이동 후 + //membershipAttachDoc.do로 바로 submit하여 새로고침 시 정보 유지되게 끔 처리 + return "redirect:/web/user/login/membershipAttachDocBefore.do"; + } + } + } + } + //스팸처리 회원인지 mj_spam_member_info 해당 ID의 최근 1개 데이터 조회 + LoginVO loginSmiChkVO = new LoginVO(); + loginSmiChkVO.setId(id); + loginSmiChkVO.setIp(EgovClntInfo.getClntIP(request)); + loginSmiChkVO.setPassword(password); + loginSmiChkVO.setUserSe("GNR"); + loginSmiChkVO.setStatusAll("Y"); // 신청대기중인 사용자까지 조회 + loginSmiChkVO.setEmplyrSttusCode("B"); // 신청대기중인 사용자까지 조회 + LoginVO smiResultVO = loginService.actionLoginCmpChk(loginSmiChkVO); + if(null != smiResultVO.getId()) { + MberManageVO spamMberManageVO = new MberManageVO(); + spamMberManageVO.setMberId(loginVO.getId()); + MberManageVO spamMemberInfoVO = mberManageService.selectSpamMemberInfo(spamMberManageVO); + if(null != spamMemberInfoVO) { + redirectAttributes.addFlashAttribute("mberId", loginVO.getId()); + return "redirect:/web/user/login/loginRestrictionUseBefore.do"; + } + } + resultVO = loginService.actionLogin(loginVO); + LoginVO passMissVO = loginService.selectPassMiss(loginVO); + + String alertMessage = ""; + if (!"admin".equals(loginVO.getId())) { + //아이디가 존재 + if(passMissVO != null) { + // 로그인 실패 ( + if (null == resultVO.getId() && passMissVO.getPassMiss() < 5 ) { + loginService.updatePassMissPlus(loginVO); + alertMessage = egovMessageSource.getMessage("fail.common.login"); + + // 로그인 실패시 해킹의심 IP 테이블에 등록_아이디는 있지만 비밀번호가 틀린상황 + /// HackIpVO hackIpVO = new HackIpVO(); + hackIpVO.setHackUserId(loginVO.getId()); + hackIpVO.setAccessIp( EgovClntInfo.getClntIP(request)); + hackIpService.insertHackIp(hackIpVO); + if (loginVO.getBeforeUrl().toString().contains("/web/user/login/login.do")) { + redirectAttributes.addFlashAttribute("fail", true); + return "redirect:/web/user/login/login.do"; + } + + return goUserLoginPage(redirectAttributes, loginVO, request, model, alertMessage); + } else { + if (passMissVO.getPassMiss() >= 5) { + alertMessage = "패스워드가 5회 이상 틀려 로그인 할수 없습니다. 비밀번호를 재설정해주세요."; + return goUserPassMissPage(redirectAttributes, loginVO, request, model, alertMessage); + } /* + * else if("A".equals(resultVO.getEmplyrSttusCode())){ //신청상태 alertMessage = + * "신청하신 아이디가 현제 승인대기 상" + "태입니다."; return goUserLoginPage(redirectAttributes, + * request, model, alertMessage); }else + * if("B".equals(resultVO.getEmplyrSttusCode())){ //신청상태 alertMessage = + * "아이디가 차단상태가 되어 사용할수 없습니다."; return goUserLoginPage(redirectAttributes, + * request, model, alertMessage); } + */ + loginService.updatePassMissReset(loginVO); + } + } + //아이디 미존재 + else { + alertMessage = egovMessageSource.getMessage("fail.common.login"); + + // 로그인 실패시 해킹의심 IP 테이블에 등록_아이디없고 비밀번호도 틀린상황 + /// HackIpVO hackIpVO = new HackIpVO(); + hackIpVO.setHackUserId(loginVO.getId()); + hackIpVO.setAccessIp(EgovClntInfo.getClntIP(request)); + hackIpService.insertHackIp(hackIpVO); + if (loginVO.getBeforeUrl().toString().contains("/web/user/login/login.do")) { + redirectAttributes.addFlashAttribute("fail", true); + return "redirect:/web/user/login/login.do"; + } + + return goUserLoginPage(redirectAttributes, loginVO, request, model, alertMessage); + } + } + + + /* 일시 : 2023.07.26 + * 내용 : 로그인시 휴먼고객 redirect 기능 추가 + * 작업자 : 원영현 과장 + */ + + if(resultVO.getDormantYn().equals("Y") || resultVO.getDormantYn() == "Y") { + + return "redirect:/web/user/humanPage.do"; + } + + + + + boolean loginPolicyYn = true; + + // 접속IP + // userIp = EgovClntInfo.getClntIP(request); + + // resultVO.siteId 의 각 로그인 ip를 조회함 + if (resultVO != null && resultVO.getId() != null && !resultVO.getId().equals("") && loginPolicyYn) { + // 세션에다 ip 등록 + resultVO.setIp(userIp); + // 2. spring security 연동 + request.getSession().setAttribute("LoginVO", resultVO); + UsernamePasswordAuthenticationFilter springSecurity = null; + ApplicationContext act = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext()); + Map beans = act.getBeansOfType(UsernamePasswordAuthenticationFilter.class); + + if (beans.size() > 0) { + springSecurity = (UsernamePasswordAuthenticationFilter) beans.values().toArray()[0]; + springSecurity.setUsernameParameter("egov_security_username"); + springSecurity.setPasswordParameter("egov_security_password"); + springSecurity.setRequiresAuthenticationRequestMatcher(new AntPathRequestMatcher(request.getServletContext().getContextPath() + "/egov_security_login", "POST")); + } else { + throw new IllegalStateException("No AuthenticationProcessingFilter"); + } + + springSecurity.doFilter(new RequestWrapperForSecurity(request, resultVO.getUserSe() + resultVO.getId(), resultVO.getUniqId()), response, null); + { // 관리자 로그인 log 저장 + String uniqId = ""; + String ip = ""; + + /* Authenticated */ + LoginLog loginLog = new LoginLog(); + Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); + if (isAuthenticated.booleanValue()) { + LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + uniqId = user.getUniqId(); + ip = EgovClntInfo.getClntIP(request); + + HttpSession httpSession = request.getSession(true); + { + List siteManageList = new ArrayList(); + SiteManagerVO siteManagerVO = new SiteManagerVO(); + siteManagerVO.setFirstIndex(0); + siteManagerVO.setRecordCountPerPage(100); + siteManageList = egovSiteManagerService.selectSiteManagerList(siteManagerVO); + httpSession.setAttribute("siteManageList", siteManageList); + httpSession.setAttribute("loginId", user.getId()); // 자동완성 공통으로 쓰기위해 + httpSession.setAttribute("esntlId", user.getPassword()); + + // 최근검색어 조회 후 세션에 넣어줌 + /* + * UserManageVO tempUserManageVO = new UserManageVO(); + * tempUserManageVO.setEmplyrId(user.getId()); tempUserManageVO = + * userManageService.selectRecentSearchWord(tempUserManageVO); + * + * List lisRecentSearch = new ArrayList(); if(null != + * tempUserManageVO){ //ArrayList 로 세션 저장 + * Collections.addAll(lisRecentSearch,tempUserManageVO.getSearchWord().split("," + * )) ; } httpSession.setAttribute("recentSearch", lisRecentSearch) ; + */ + } + } + /* + * loginLog.setLoginId(uniqId); loginLog.setLoginIp(ip); + * loginLog.setLoginMthd("I"); // 로그인:I, 로그아웃:O loginLog.setErrOccrrAt("N"); + * loginLog.setErrorCode(""); //로그인은 관리자, PC만 됨 loginLog.setUserAt("U"); //사용자 + * loginLog.setDeviceType("P"); //PC loginLog.setProgrmFileNm("adminLogin"); + * loginLog.setMenuNm("관리자로그인"); loginLogService.logInsertLoginLog(loginLog); + */ + + loginVO.getId(); + loginVO.getIp(); + loginVO.setMessage("로그인 성공되었습니다."); + loginVO.setLoginYn("Y"); + loginService.insertActionLoginLog(loginVO); + } + + // 등급제 Start + // 회원별 등급 적용 + MberGrdVO mberGrdVO = new MberGrdVO(); + mberGrdVO.setMberId(loginVO.getId()); + mberGrdVO.setAmt("0"); + mberGrdVO.setMoid(""); + mberGrdService.mberGrdSaveByUserNoHist(mberGrdVO); + // End + + // 이벤트 결제 바로가기 로직 체크 Start + String goEventPay = (String) commandMap.get("goEventPay"); + System.out.println("goEventPay : " + goEventPay); + if (null != goEventPay && goEventPay.equals("Y")) { + // 이벤트 결제 바로가기 + if (goEventPay(loginVO) == true) { + loginVO.setBeforeUrl("/web/event/member/pay/PayView.do"); + } + } + // End + + String beforeUrl = (String) commandMap.get("beforeUrl"); + + // 로그인 전 URL 호출 시 + if (loginVO.getBeforeUrl() != null && !("").equals(loginVO.getBeforeUrl())) { + request.getSession().setAttribute("usrBeforeUrl", loginVO.getBeforeUrl()); + // 회원가입 시 메세지 처리 + if (loginVO.getMessage() != null && !("").equals(loginVO.getMessage())) { + request.getSession().setAttribute("registMessage", loginVO.getMessage()); + } + } + + // 개인키 삭제 + // 성공시 웹페이지 분기로 인해 session에 페이지 타입을 넣어준다. + request.getSession().setAttribute("pageType", "web"); + + return "blank"; // 성공 시 페이지.. (redirect 불가) + + // uat/uia/actionMain.do 실제 성공시 무조건 좌측 메소드로 감. + // return "forward:/web/main/mainPage.do"; + } else { + String message = egovMessageSource.getMessage("fail.common.login"); + redirectAttributes.addFlashAttribute("beforeUrl", loginVO.getBeforeUrl()); + redirectAttributes.addFlashAttribute("message", message); + return "redirect:/"; + } + } + // 이벤트 결제 바로가기 public boolean goEventPay(LoginVO loginVO) throws Exception { boolean goEventPay = false; @@ -2647,7 +3570,7 @@ public class EgovLoginController { String resultBlockSts = "0"; // 비밀번호 찾기 문자내용 - String contents = "[문자온] 비밀번호 변경 인증번호 : %code%"; + String contents = "[문자온] 인증번호 : %code%"; String code = ""; long seed = System.currentTimeMillis(); Random random = new Random(seed); diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml index 8deaf7af..03f1ee56 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml @@ -3702,6 +3702,26 @@ LIMIT 1 + + + +
@@ -294,9 +522,9 @@ function fn_click_banner_add_stat(bannerMenuCode){

문자온에 오신것을 환영합니다.
- 로그인 해주세요. + 로그인1 해주세요.

-
+
아이디
@@ -309,7 +537,7 @@ function fn_click_banner_add_stat(bannerMenuCode){
-
+
비밀번호
@@ -327,15 +555,61 @@ function fn_click_banner_add_stat(bannerMenuCode){
-
+

아이디 또는 비밀번호가 일치하지 않습니다.

-
+ +
+

+ 인증번호가 일치하지 않습니다. +

+
+ + +
+ + + + +
@@ -367,4 +641,10 @@ function fn_click_banner_add_stat(bannerMenuCode){
+
+ + + + +
\ No newline at end of file From 2b469070543a4d10132fb5d573ce1b0bd0ecda9c Mon Sep 17 00:00:00 2001 From: wyh Date: Mon, 18 Nov 2024 09:35:19 +0900 Subject: [PATCH 02/63] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20ID/PW=20?= =?UTF-8?q?=EC=9E=85=EB=A0=A5=EC=8B=9C=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=9D=B4=EB=8F=99=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp | 4 ++-- src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 0bb7697d..7ec061a8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -1587,9 +1587,9 @@ function actionLogin() { + + +
+
인증번호 등록
+
+ + + + + + + + + + + +
인증번호 + +
+
+ + +
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp b/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp index d9a59228..f3caaae5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp @@ -587,13 +587,15 @@ function fn_click_banner_add_stat(bannerMenuCode){
휴대폰번호
- + + +
From 4f2a0e28b687fd20f31c7c85f27879bdb7c1f39f Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Mon, 18 Nov 2024 20:20:36 +0900 Subject: [PATCH 06/63] =?UTF-8?q?=ED=9C=B4=EB=8C=80=ED=8F=B0=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=EB=8B=A4=EC=A4=91=EB=B2=88=ED=98=B8=20=EC=9D=B8?= =?UTF-8?q?=EC=A6=9D=20=EC=B2=B4=ED=81=AC=20=EB=A1=9C=EC=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../msgdata/service/MjonMsgDataService.java | 3 + .../msgdata/service/impl/MjonMsgDataDAO.java | 7 +- .../service/impl/MjonMsgDataServiceImpl.java | 5 + .../let/uat/uia/web/EgovLoginController.java | 43 +- .../impl/EgovUserManageServiceImpl.java | 626 +++++++++--------- .../sqlmap/let/msg/MjonMsgData_SQL_mysql.xml | 18 + .../jsp/web/login/EgovLoginGnrlUsr.jsp | 15 +- 7 files changed, 393 insertions(+), 324 deletions(-) diff --git a/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java b/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java index 80c55e34..9519ff67 100644 --- a/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java +++ b/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java @@ -184,6 +184,9 @@ public interface MjonMsgDataService { public StatusResponse insertMberCertPhoneInfo(MberCertPhoneVO mberCertPhoneVO); public StatusResponse deleteCertPhoneInfo(MberCertPhoneVO mberCertPhoneVO); + + public List selectMberCertPhoneListVO(MberCertPhoneVO mberCertPhoneVO); + } diff --git a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataDAO.java b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataDAO.java index 58a9d84f..8256a57e 100644 --- a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataDAO.java +++ b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataDAO.java @@ -205,7 +205,7 @@ public class MjonMsgDataDAO extends EgovAbstractDAO { } public SendLogVO selectSysMsgLogCheck(SendLogVO sendLogVO) throws Exception{ - return (SendLogVO) select("mjonMsgDAO.selectSysMsgLogCheck",sendLogVO); + return (SendLogVO) select("mjonMsgDAO.selectSysMsgLogCheck_new",sendLogVO); } @SuppressWarnings("unchecked") @@ -383,5 +383,10 @@ public class MjonMsgDataDAO extends EgovAbstractDAO { public void deleteCertPhoneInfo(MberCertPhoneVO mberCertPhoneVO) { update("mjonMsgDataDAO.deleteCertPhoneInfo", mberCertPhoneVO); } + + + public List selectMberCertPhoneListVO(MberCertPhoneVO mberCertPhoneVO) { + return (List) list("mjonMsgDataDAO.selectMberCertPhoneListVO", mberCertPhoneVO); + } } diff --git a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java index 2a28d396..f37602a9 100644 --- a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java +++ b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java @@ -3177,5 +3177,10 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M mjonMsgDataDAO.deleteCertPhoneInfo(mberCertPhoneVO); return new StatusResponse(HttpStatus.OK, "삭제하였습니다.", LocalDateTime.now()); } + + @Override + public List selectMberCertPhoneListVO(MberCertPhoneVO mberCertPhoneVO) { + return mjonMsgDataDAO.selectMberCertPhoneListVO(mberCertPhoneVO); + } } diff --git a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java index f3224563..f1016408 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java @@ -109,6 +109,7 @@ import itn.let.uat.uap.service.EgovLoginPolicyService; import itn.let.uat.uap.service.LoginPolicyVO; import itn.let.uat.uia.service.AuthCertVO; import itn.let.uat.uia.service.EgovLoginService; +import itn.let.uat.uia.service.MberCertPhoneVO; import itn.let.uss.umt.service.EgovMberManageService; import itn.let.uss.umt.service.EgovUserManageService; import itn.let.uss.umt.service.MberManageConfigVO; @@ -2043,9 +2044,23 @@ public class EgovLoginController { String message = "로그인 성공했습니다."; + + + + + /* 일시 : 2024.11.18 + * 내용 : 다중 인증번호 조회 + * 작업자 : 이호영 + */ + + + List mberCertPhoneList = mjonMsgDataService.selectMberCertPhoneList(resultVO.getId()); + + modelAndView.addObject("status", "success"); modelAndView.addObject("msg", message); modelAndView.addObject("data", resultVO); + modelAndView.addObject("mberCertPhoneList", mberCertPhoneList); return modelAndView; @@ -3580,6 +3595,11 @@ public class EgovLoginController { code = randomCode.append(Integer.toString(random.nextInt(10))).toString(); } contents = contents.replace("%code%", code); + System.out.println("contents : "+ contents); + System.out.println("contents : "+ contents); + System.out.println("contents : "+ contents); + System.out.println("contents : "+ contents); + System.out.println("contents : "+ contents); mjonMsgVO.setSmsTxt(contents); mjonMsgVO.setReserveYn("N"); @@ -3601,9 +3621,25 @@ public class EgovLoginController { userManageVO.setEmplyrNm(mjonMsgVO.getSearchNm()); userManageVO.setMoblphonNo(mjonMsgVO.getCallTo()); - List usedNmList = userManageService.selectUserIdAjax2(userManageVO); + + + + + + - boolean TorF = usedNmList.size() > 0 ? true : false; + MberCertPhoneVO mberCertPhoneVO = new MberCertPhoneVO(); + mberCertPhoneVO.setMbtlnum(mjonMsgVO.getCallTo()); + mberCertPhoneVO.setMberId(mjonMsgVO.getUserId()); + + + List mberCertPhoneList = mjonMsgDataService.selectMberCertPhoneListVO(mberCertPhoneVO); + + + + + + boolean TorF = mberCertPhoneList.size() > 0 ? true : false; if (!TorF) { @@ -3616,7 +3652,8 @@ public class EgovLoginController { return modelAndView; } - + + List usedNmList = userManageService.selectUserIdAjax2(userManageVO); if(!usedNmList.get(0).getMberSttus().equals("Y")) { String mberSttus = usedNmList.get(0).getMberSttus(); diff --git a/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java b/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java index 9743cfd4..74bbcaa3 100644 --- a/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java +++ b/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java @@ -43,12 +43,13 @@ import itn.let.utl.user.service.MjonNoticeSendUtil; /** * 사용자관리에 관한 비지니스 클래스를 정의한다. + * * @author 공통서비스 개발팀 조재영 * @since 2009.04.10 * @version 1.0 * @see * - * 
+ *      
  * << 개정이력(Modification Information) >>
  *
  *   수정일      수정자           수정내용
@@ -56,74 +57,75 @@ import itn.let.utl.user.service.MjonNoticeSendUtil;
  *   2009.04.10  조재영          최초 생성
  *   2011.08.31  JJY            경량환경 템플릿 커스터마이징버전 생성
  *
- * 

+ *
*/ @Service("userManageService") public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implements EgovUserManageService { /** userManageDAO */ - @Resource(name="userManageDAO") + @Resource(name = "userManageDAO") private UserManageDAO userManageDAO; @Resource(name = "egovAuthorGroupService") private EgovAuthorGroupService egovAuthorGroupService; - + /** mberManageDAO */ - @Resource(name="mberManageDAO") + @Resource(name = "mberManageDAO") private MberManageDAO mberManageDAO; @Resource(name = "faxDAO") public FaxDAO faxDao; - + /** entrprsManageDAO */ - //EBT-CUSTOMIZING//@Resource(name="entrprsManageDAO") - //EBT-CUSTOMIZING//private EntrprsManageDAO entrprsManageDAO; + // EBT-CUSTOMIZING//@Resource(name="entrprsManageDAO") + // EBT-CUSTOMIZING//private EntrprsManageDAO entrprsManageDAO; /** egovUsrCnfrmIdGnrService */ - @Resource(name="egovUsrCnfrmIdGnrService") + @Resource(name = "egovUsrCnfrmIdGnrService") private EgovIdGnrService idgenService; - - @Resource(name="siteManagerDAO") + + @Resource(name = "siteManagerDAO") SiteManagerDAO siteManagerDAO; - + @Resource(name = "MjonMsgDataService") - private MjonMsgDataService mjonMsgDataService; + private MjonMsgDataService mjonMsgDataService; @Resource(name = "egovMjonCashIdGnrService") - private EgovIdGnrService idgenMjonCashId; - - @Resource(name = "egovMjonPointIdGnrService") - private EgovIdGnrService idgenMjonPointId; + private EgovIdGnrService idgenMjonCashId; - @Resource(name="mjonPayDAO") + @Resource(name = "egovMjonPointIdGnrService") + private EgovIdGnrService idgenMjonPointId; + + @Resource(name = "mjonPayDAO") private MjonPayDAO mjonPayDAO; - + @Resource(name = "egovPgMoidGnrService") private EgovIdGnrService idgenPgMoid; - - @Resource(name="taxDAO") - private TaxDAO taxDAO; - + + @Resource(name = "taxDAO") + private TaxDAO taxDAO; + /** 알림전송 Util */ @Resource(name = "mjonNoticeSendUtil") private MjonNoticeSendUtil mjonNoticeSendUtil; - - @Resource(name="MjonCommon") + + @Resource(name = "MjonCommon") private MjonCommon mjonCommon; - - /** 사이트 설정 */ + + /** 사이트 설정 */ @Resource(name = "egovSiteManagerService") - EgovSiteManagerService egovSiteManagerService; - + EgovSiteManagerService egovSiteManagerService; + /** mberManageService */ @Resource(name = "mberManageService") private EgovMberManageService mberManageService; @Resource(name = "mjonMsgAgentStsService") - private MjonMsgAgentStsService mjonMsgAgentStsService; - + private MjonMsgAgentStsService mjonMsgAgentStsService; + /** * 입력한 사용자아이디의 중복여부를 체크하여 사용가능여부를 확인 + * * @param checkId 중복여부 확인대상 아이디 * @return 사용가능여부(아이디 사용회수 int) * @throws Exception @@ -135,38 +137,40 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement /** * 화면에 조회된 사용자의 정보를 데이터베이스에서 삭제 + * * @param checkedIdForDel 삭제대상 업무사용자아이디 * @throws Exception */ @Override - public void deleteUser(String checkedIdForDel) throws Exception{ + public void deleteUser(String checkedIdForDel) throws Exception { AuthorGroup authorGroup = new AuthorGroup(); - String [] delId = checkedIdForDel.split(","); - for (int i=0; i 업무사용자 목록정보 * @throws Exception @@ -236,6 +241,7 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement /** * 기 등록된 특정 사용자목록의 전체수를 확인 + * * @param userSearchVO 검색조건 * @return 총사용자갯수(int) * @throws Exception @@ -247,12 +253,13 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement /** * 화면에 조회된 사용자의 기본정보를 수정하여 항목의 정합성을 체크하고 수정된 데이터를 데이터베이스에 반영 + * * @param userManageVO 업무사용자 수정정보 * @throws Exception */ @Override public void updateUser(UserManageVO userManageVO) throws Exception { - //패스워드 암호화 + // 패스워드 암호화 String pass = EgovFileScrty.encryptPassword(userManageVO.getPassword(), userManageVO.getEmplyrId()); userManageVO.setPassword(pass); @@ -261,6 +268,7 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement /** * 사용자정보 수정시 히스토리 정보를 추가 + * * @param userManageVO 업무사용자 수정정보 * @return result 등록결과 * @throws Exception @@ -272,6 +280,7 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement /** * 업무사용자 암호 수정 + * * @param userManageVO 업무사용자 수정정보(비밀번호) * @throws Exception */ @@ -282,34 +291,35 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement /** * 사용자가 비밀번호를 기억하지 못할 때 비밀번호를 찾을 수 있도록 함 + * * @param passVO 업무사용자 암호 조회조건정보 * @return userManageVO 업무사용자 암호정보 * @throws Exception */ @Override - public UserManageVO selectPassword(UserManageVO passVO) throws Exception{ + public UserManageVO selectPassword(UserManageVO passVO) throws Exception { UserManageVO userManageVO = userManageDAO.selectPassword(passVO); return userManageVO; } - + @Override public List selectUserIdAjax(UserManageVO userManageVO) throws Exception { List userNmList = userManageDAO.selectUserIdAjax(userManageVO); return userNmList; } - + @Override public List selectUserIdAjax2(UserManageVO userManageVO) throws Exception { List userNmList = userManageDAO.selectUserIdAjax2(userManageVO); return userNmList; } - + @Override public int selectAdminIdAjax(UserManageVO userManageVO) throws Exception { return userManageDAO.selectAdminIdAjax(userManageVO); - + } - + @Override public int selectUserPWAjax(UserManageVO userManageVO) throws Exception { int userCount = userManageDAO.selectUserPWAjax(userManageVO); @@ -318,21 +328,18 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement @Override public void updateUserPWAjax(UserManageVO userManageVO) throws Exception { - //패스워드 암호화 + // 패스워드 암호화 String pass = EgovFileScrty.encryptPassword(userManageVO.getPassword(), userManageVO.getEmplyrId()); userManageVO.setPassword(pass); userManageDAO.updateUserPWAjax(userManageVO); - + // 페스워드 히스토리 등록 MberManageVO mberManageVO = new MberManageVO(); mberManageVO.setMberId(userManageVO.getEmplyrId()); mberManageVO.setPassword(pass); mberManageDAO.insertMberPWLog(mberManageVO); - + } - - - @Override public void updateUserSttusCode(UserManageVO userManageVO) throws Exception { @@ -353,13 +360,13 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement public UserManageVO selectRecentSearchWord(UserManageVO userManageVO) throws Exception { return userManageDAO.selectRecentSearchWord(userManageVO); } - + // 관리자 모바일환경 비번 저장여부 @Override public UserManageVO selectAdminMobilePwSaveCheck(UserManageVO userManageVO) throws Exception { return userManageDAO.selectAdminMobilePwSaveCheck(userManageVO); } - + @Override public void insertUpdateSearchWord(UserManageVO userManageVO) throws Exception { userManageDAO.insertUpdateSearchWord(userManageVO); @@ -367,7 +374,7 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement @Override public UserDefaultVO selectUserCount() throws Exception { - return userManageDAO.selectUserCount(); + return userManageDAO.selectUserCount(); } @Override @@ -384,29 +391,28 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement public UserManageVO selectUserPw2Ajax(UserManageVO userManageVO) throws Exception { return userManageDAO.selectUserPw2Ajax(userManageVO); } - + @Override - public UserManageVO selectAdminUserSmsCertCheck(UserManageVO userManageVO) throws Exception{ + public UserManageVO selectAdminUserSmsCertCheck(UserManageVO userManageVO) throws Exception { return userManageDAO.selectAdminUserSmsCertCheck(userManageVO); } - + @Override public UserManageVO selectAddrRequestMsgAjax(UserManageVO userManageVO) throws Exception { return userManageDAO.selectAddrRequestMsgAjax(userManageVO); } - + @Override - //관리자가 사용자의 비밀번호를 변경해주는 서비스 - public UserManageVO selectUserPwByAdminAjax(UserManageVO userManageVO) throws Exception{ + // 관리자가 사용자의 비밀번호를 변경해주는 서비스 + public UserManageVO selectUserPwByAdminAjax(UserManageVO userManageVO) throws Exception { return userManageDAO.selectUserPwByAdminAjax(userManageVO); } - + @Override public MberManageVO selectUserInfo(MberManageVO mberManageVO) throws Exception { return userManageDAO.selectUserInfo(mberManageVO); } - @Override public void updateUserInfo(MberManageVO mberManageVO) throws Exception { userManageDAO.updateUserInfo(mberManageVO); @@ -416,7 +422,7 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement public void updateSandResul(MberManageVO mberManageVO) throws Exception { userManageDAO.updateSandResul(mberManageVO); } - + @Override public void updateNoticet(MberManageVO mberManageVO) throws Exception { userManageDAO.updateNoticet(mberManageVO); @@ -426,119 +432,118 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement public void updateDeleteInfo(MberManageVO mberManageVO) throws Exception { userManageDAO.updateDeleteInfo(mberManageVO); } - - //발신번호 관리 본인인증 DI 값 받아오기 + + // 발신번호 관리 본인인증 DI 값 받아오기 @Override - public String selectUserMblDnById(String mberId) throws Exception{ + public String selectUserMblDnById(String mberId) throws Exception { return userManageDAO.selectUserMblDnById(mberId); } - - //발신번호 관리 본인인증 DI 값 받아오기 + + // 발신번호 관리 본인인증 DI 값 받아오기 @Override - public void updateCrtfcDnValue(UserManageVO userManageVO) throws Exception{ + public void updateCrtfcDnValue(UserManageVO userManageVO) throws Exception { userManageDAO.updateCrtfcDnValue(userManageVO); } // 다음 결제시 결제수단 SELECT @Override - public String selectNextPayMethod(String mberId) throws Exception{ + public String selectNextPayMethod(String mberId) throws Exception { return userManageDAO.selectNextPayMethod(mberId); } // 다음 결제시 결제수단 UPDATE @Override - public void updateNextPayMethod(UserManageVO userManageVO) throws Exception{ + public void updateNextPayMethod(UserManageVO userManageVO) throws Exception { userManageDAO.updateNextPayMethod(userManageVO); } - + @Override public int selectAdminDiChk(UserManageVO userManageVO) { return userManageDAO.selectAdminDiChk(userManageVO); } - + @Override - public boolean selectUserStatusInfo(String userId) throws Exception{ - - String mberSttus = userManageDAO.selectUserStatusInfo(userId); - + public boolean selectUserStatusInfo(String userId) throws Exception { + + String mberSttus = userManageDAO.selectUserStatusInfo(userId); + boolean status = true; - if(mberSttus.equals("B")) { + if (mberSttus.equals("B")) { status = false; } - + return status; } - + @Override public String selectUserStatusInfoCheck(String userId) throws Exception { - String mberSttus = userManageDAO.selectUserStatusInfo(userId); + String mberSttus = userManageDAO.selectUserStatusInfo(userId); return mberSttus; } - + // 결제 여부 @Override public int selectPayCountByUser(UserManageVO userManageVO) { return userManageDAO.selectPayCountByUser(userManageVO); } - + // 후불결제여부 @Override - public int selectUserAfterPayInfo(String userId) throws Exception{ + public int selectUserAfterPayInfo(String userId) throws Exception { return userManageDAO.selectUserAfterPayInfo(userId); - } - + } + @Override public UserManageVO selectAdminSmsNoticeYn(UserManageVO userManageVO) { return userManageDAO.selectAdminSmsNoticeYn(userManageVO); } - public void updateUserAdminSmsNoticeYn(UserManageVO userManageVO, String checkedIdForUpt) throws Exception { - if(!"".equals(checkedIdForUpt)) { - String [] uptId = checkedIdForUpt.split(","); - for (int i=0; i 슬랙, 문자 알림 No // B선 회원이 아닌경우 전송사 JJ로 변경 로직 포함 public void updateOneUserSmishingYnNotAlert(UserManageVO userManageVO) throws Exception { // 업데이트 userManageDAO.updateUserSmishingYn(userManageVO); - + /* - // B선 전송사 이용고객 => 전송사 JJ로 변경안함 - MberManageVO mberManageVO = new MberManageVO(); - mberManageVO.setMberId(userManageVO.getMberId()); - String blineCode = mberManageService.selectBlineCodeByMberId(mberManageVO); - if (blineCode != null && blineCode.equals("N")) { - // 전송사 JJ로 변경 - mberManageVO.setHotlineAgentName("첫결제 JJ"); - mberManageVO.setHotlineAgentCode("05"); - mberManageVO.setAdmUserId("admin"); - mjonMsgAgentStsService.updateMberHotlineAgentCodeInfo(mberManageVO); - } - */ - } - + * // B선 전송사 이용고객 => 전송사 JJ로 변경안함 MberManageVO mberManageVO = new + * MberManageVO(); mberManageVO.setMberId(userManageVO.getMberId()); String + * blineCode = mberManageService.selectBlineCodeByMberId(mberManageVO); if + * (blineCode != null && blineCode.equals("N")) { // 전송사 JJ로 변경 + * mberManageVO.setHotlineAgentName("첫결제 JJ"); + * mberManageVO.setHotlineAgentCode("05"); mberManageVO.setAdmUserId("admin"); + * mjonMsgAgentStsService.updateMberHotlineAgentCodeInfo(mberManageVO); } + */ + } + // 알림톡 스미싱의심 온/오프 public void updateUserAtSmishingYn(UserManageVO userManageVO, String checkedIdForUpt) throws Exception { - if(!"".equals(checkedIdForUpt)) { - String [] uptIdAll = checkedIdForUpt.split(","); + if (!"".equals(checkedIdForUpt)) { + String[] uptIdAll = checkedIdForUpt.split(","); String[] uptId = Arrays.stream(uptIdAll).distinct().toArray(String[]::new); - for (int i=0; i selectUserPrePaymentYnList(UserManageVO userManageVO) throws Exception { return userManageDAO.selectUserPrePaymentYnList(userManageVO); } - + // 후불제 회원 월 충전 한도금액 만큼 Cash, Point 충전하기 public void updateUserCashByAutoCash() throws Exception { List userPrePaymentYnList = userManageDAO.selectUserPrePaymentYnList(new UserManageVO()); - for (UserManageVO umVO: userPrePaymentYnList) { + for (UserManageVO umVO : userPrePaymentYnList) { if (umVO.getPaymentCash() > 0) { - - //이번달에 입력된 후불 결제요청 데이터가 있는지 확인 - 혹시나 중복 입력을 방지하기 위함 + + // 이번달에 입력된 후불 결제요청 데이터가 있는지 확인 - 혹시나 중복 입력을 방지하기 위함 int paymentCnt = userManageDAO.selectUserPrePaymentPGdataCount(umVO.getMberId()); - - if(paymentCnt > 0) continue; - - //회원 정보 조회 - MberManageVO mberManageVO = mberManageDAO.selectMber(umVO.getMberId()); //멤버ID에서 유니크ID로 수정 필요 + + if (paymentCnt > 0) + continue; + + // 회원 정보 조회 + MberManageVO mberManageVO = mberManageDAO.selectMber(umVO.getMberId()); // 멤버ID에서 유니크ID로 수정 필요 // CASH 값 넣기 MjonPayVO mjonPayVO = this.setAdvCashVO(umVO); - - //CASH 테이블 - mjonPayDAO.insertCash(mjonPayVO); - - //회원정보 CASH 업데이트 + + // CASH 테이블 + mjonPayDAO.insertCash(mjonPayVO); + + // 회원정보 CASH 업데이트 mjonPayDAO.updateMemberCash(mjonPayVO); /* - * JSPark 2023.01.10 => 포인트는 선충전하지 않음 - // point 값 넣기 - mjonPayVO = this.setAdvPointVO(umVO); - - //POINT 테이블 - mjonPayDAO.insertPoint(mjonPayVO); - - //회원정보 POINT 업데이트 - mjonPayDAO.updateMemberPoint(mjonPayVO); - */ - - //지난 달 사용금액 조회 + * JSPark 2023.01.10 => 포인트는 선충전하지 않음 // point 값 넣기 mjonPayVO = + * this.setAdvPointVO(umVO); + * + * //POINT 테이블 mjonPayDAO.insertPoint(mjonPayVO); + * + * //회원정보 POINT 업데이트 mjonPayDAO.updateMemberPoint(mjonPayVO); + */ + + // 지난 달 사용금액 조회 MjonPayVO payVO = mjonPayDAO.selectPrvMonthUseCash(umVO.getMberId()); - + mjonPayVO.setMoid(idgenPgMoid.getNextStringId()); mjonPayVO.setPgCode("INNOPAY"); mjonPayVO.setPgStatus("0"); - mjonPayVO.setCash(Float.parseFloat(payVO.getCashSum())); //실제충전금액(부가세제외) - - mjonPayVO.setPhone(mberManageVO.getMoblphonNo()); //휴대폰번호 - mjonPayVO.setUserName(mberManageVO.getMberNm()); //이름 - mjonPayVO.setBuyerName("결제전"); //추후 결제 시에 입금자명 수기입력 - - mjonPayVO.setTid(" "); //필수값이라 공백 처리 + mjonPayVO.setCash(Float.parseFloat(payVO.getCashSum())); // 실제충전금액(부가세제외) + + mjonPayVO.setPhone(mberManageVO.getMoblphonNo()); // 휴대폰번호 + mjonPayVO.setUserName(mberManageVO.getMberNm()); // 이름 + mjonPayVO.setBuyerName("결제전"); // 추후 결제 시에 입금자명 수기입력 + + mjonPayVO.setTid(" "); // 필수값이라 공백 처리 mjonPayVO.setResultCode("0000"); mjonPayVO.setResultMsg("후불결제 입금 전"); - + mjonPayVO.setPayMethod("AFTERPAY"); mjonPayVO.setGoodsName("후불결제"); - mjonPayVO.setAmt(payVO.getCashVatSum()); //결제액(부가세포함) + mjonPayVO.setAmt(payVO.getCashVatSum()); // 결제액(부가세포함) mjonPayVO.setUserId(umVO.getMberId()); - + Calendar cal = Calendar.getInstance(); SimpleDateFormat format = new SimpleDateFormat("yyyyMM"); - cal.add(cal.MONTH, - 1); //지난달 - - mjonPayVO.setCalcBaseM(format.format(cal.getTime())); //정산월 : 지난 달 - mjonPayVO.setAfterPayYn("Y"); //후불여부 + cal.add(cal.MONTH, -1); // 지난달 - //PG 테이블에 지난 사용량 누계 추가 + mjonPayVO.setCalcBaseM(format.format(cal.getTime())); // 정산월 : 지난 달 + mjonPayVO.setAfterPayYn("Y"); // 후불여부 + + // PG 테이블에 지난 사용량 누계 추가 mjonPayDAO.insertMjPg(mjonPayVO); - - //세금계산서 데이터 등록 + + // 세금계산서 데이터 등록 TaxVO taxVO = new TaxVO(); - if("B".equals(mberManageVO.getTaxbillAuto()) || "C".equals(mberManageVO.getTaxbillAuto())) { - - /*발행타입 1:소득공제 현금영수증 2:지출증빙 현금영수증 9:세금계산서*/ + if ("B".equals(mberManageVO.getTaxbillAuto()) || "C".equals(mberManageVO.getTaxbillAuto())) { + + /* 발행타입 1:소득공제 현금영수증 2:지출증빙 현금영수증 9:세금계산서 */ String rcptType; - String regNo=""; - - if("B".equals(mberManageVO.getTaxbillAuto())) { //세금계산서 기업 자동발행 + String regNo = ""; + + if ("B".equals(mberManageVO.getTaxbillAuto())) { // 세금계산서 기업 자동발행 rcptType = "9"; taxVO.setTaxTrgt("B"); - - regNo = mberManageVO.getTaxBizNo(); //사업자등록번호 - - taxVO.setCompanyName(mberManageVO.getTaxBzNm());//회사명 - taxVO.setRepName(mberManageVO.getTaxChrmNm());//대표자명 - taxVO.setAddr(mberManageVO.getTaxAddr());//세금계산서 주소 - - }else if("C".equals(mberManageVO.getTaxbillAuto())) { //세금계산서 개인 자동발행 + + regNo = mberManageVO.getTaxBizNo(); // 사업자등록번호 + + taxVO.setCompanyName(mberManageVO.getTaxBzNm());// 회사명 + taxVO.setRepName(mberManageVO.getTaxChrmNm());// 대표자명 + taxVO.setAddr(mberManageVO.getTaxAddr());// 세금계산서 주소 + + } else if ("C".equals(mberManageVO.getTaxbillAuto())) { // 세금계산서 개인 자동발행 rcptType = "9"; taxVO.setTaxTrgt("C"); /* - if(mberManageVO.getCandidateNo1() != null) { - String candiNo1 = mberManageVO.getCandidateNo1(); - String candiNo2 = mberManageVO.getCandidateNo2(); - - regNo = candiNo1 + candiNo2; //주민등록번호 - } - taxVO.setRepName(mberManageVO.getCandidateNm());//후보자 성명 - taxVO.setAddr(mberManageVO.getCandidateAddr());//후보자 주소 - */ + * if(mberManageVO.getCandidateNo1() != null) { String candiNo1 = + * mberManageVO.getCandidateNo1(); String candiNo2 = + * mberManageVO.getCandidateNo2(); + * + * regNo = candiNo1 + candiNo2; //주민등록번호 } + * taxVO.setRepName(mberManageVO.getCandidateNm());//후보자 성명 + * taxVO.setAddr(mberManageVO.getCandidateAddr());//후보자 주소 + */ regNo = mberManageVO.getTaxCIhidNum(); // 세금계산서 개인 주민등록번호 - taxVO.setRepName(mberManageVO.getTaxCNm()); //세금계산서 개인 성명 - taxVO.setAddr(mberManageVO.getTaxCAddr()); //세금계산서 개인 주소 - - } else { //현금영수증 자동발행 + taxVO.setRepName(mberManageVO.getTaxCNm()); // 세금계산서 개인 성명 + taxVO.setAddr(mberManageVO.getTaxCAddr()); // 세금계산서 개인 주소 + + } else { // 현금영수증 자동발행 rcptType = mberManageVO.getCashbillType(); } - taxVO.setMoid(mjonPayVO.getMoid()); //주문ID - taxVO.setRcptType(rcptType);//발행타입 - /*발행번호 개인세금계산서:주민등록번호 / 기업세금계산서:사업자번호 / 소득공제현금영수증:휴대폰번호 / 지출증빙현금영수증:사업자번호*/ + taxVO.setMoid(mjonPayVO.getMoid()); // 주문ID + taxVO.setRcptType(rcptType);// 발행타입 + /* 발행번호 개인세금계산서:주민등록번호 / 기업세금계산서:사업자번호 / 소득공제현금영수증:휴대폰번호 / 지출증빙현금영수증:사업자번호 */ taxVO.setRegNo(regNo); - taxVO.setEmail(mberManageVO.getTaxMngEmail());//담당자이메일 - taxVO.setPhone(mberManageVO.getTaxMngPhoneNum());//담당자 휴대폰번호 - taxVO.setConfirmYn("N"); //완료여부 + taxVO.setEmail(mberManageVO.getTaxMngEmail());// 담당자이메일 + taxVO.setPhone(mberManageVO.getTaxMngPhoneNum());// 담당자 휴대폰번호 + taxVO.setConfirmYn("N"); // 완료여부 taxVO.setFrstRegisterId(mberManageVO.getMberId()); - + taxDAO.insertCashBill(taxVO); // mjonPayDAO.insertMjTax(mjonPayVO); //PGTax 테이블 } - + } } - - } + + } /** * @param mjonPayVO * @return - * @throws Exception - * cash table 값 넣기 - * 2022.04.12 JSP => mjonPayVO.getMoid() => userId 사용 제거 (휴대폰결제에서만 사용) + * @throws Exception cash table 값 넣기 2022.04.12 JSP => mjonPayVO.getMoid() => + * userId 사용 제거 (휴대폰결제에서만 사용) */ - private MjonPayVO setAdvCashVO(UserManageVO userManageVO) throws Exception{ - - //캐쉬 테이블 변수 생성 + private MjonPayVO setAdvCashVO(UserManageVO userManageVO) throws Exception { + + // 캐쉬 테이블 변수 생성 MjonPayVO mjonPayVO = new MjonPayVO(); - mjonPayVO.setCashId(idgenMjonCashId.getNextStringId()) ; - mjonPayVO.setCash((float)userManageVO.getNowChargeCash()); // 자동 충전금액 - 전월 남은 금액 - mjonPayVO.setOrderId("ADVPAY"); // 선지급 + mjonPayVO.setCashId(idgenMjonCashId.getNextStringId()); + mjonPayVO.setCash((float) userManageVO.getNowChargeCash()); // 자동 충전금액 - 전월 남은 금액 + mjonPayVO.setOrderId("ADVPAY"); // 선지급 mjonPayVO.setUserId(userManageVO.getMberId()); mjonPayVO.setFrstRegisterId(userManageVO.getMberId()); - String memo = "후불제 회원 " + userManageVO.getNowChargeCash() + "원 충전" ; - mjonPayVO.setMemo(memo); //캐쉬메모 - + String memo = "후불제 회원 " + userManageVO.getNowChargeCash() + "원 충전"; + mjonPayVO.setMemo(memo); // 캐쉬메모 + return mjonPayVO; } @Override public Map selectFaxSendList(FaxGroupDataVO faxGroupDataVO) { - Map resultMap = new HashMap(); - - //기본 내림차순 정렬 - if(StringUtils.isEmpty(faxGroupDataVO.getSearchSortOrd())) { - - faxGroupDataVO.setSearchSortOrd("desc"); - faxGroupDataVO.setSearchSortCnd("doneDate"); - } - if(StringUtils.isEmpty(faxGroupDataVO.getSearchStartDate()) - && StringUtils.isEmpty(faxGroupDataVO.getSearchEndDate()) - ) { - faxGroupDataVO.setSearchStartDate(DateUtil.getTodayYearAndMonthAndFirstDay()); - faxGroupDataVO.setSearchEndDate(DateUtil.getTodayYearAndMonthAndLastDay()); - } - + // 기본 내림차순 정렬 + if (StringUtils.isEmpty(faxGroupDataVO.getSearchSortOrd())) { + + faxGroupDataVO.setSearchSortOrd("desc"); + faxGroupDataVO.setSearchSortCnd("doneDate"); + } + + if (StringUtils.isEmpty(faxGroupDataVO.getSearchStartDate()) + && StringUtils.isEmpty(faxGroupDataVO.getSearchEndDate())) { + faxGroupDataVO.setSearchStartDate(DateUtil.getTodayYearAndMonthAndFirstDay()); + faxGroupDataVO.setSearchEndDate(DateUtil.getTodayYearAndMonthAndLastDay()); + } + /** pageing */ PaginationInfo paginationInfo = new PaginationInfo(); paginationInfo.setCurrentPageNo(faxGroupDataVO.getPageIndex()); @@ -877,19 +872,18 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement List faxGroupListVO = faxDao.selectFaxSendList(faxGroupDataVO); try { Map faxPriceMap = faxDao.selectSentAndErrorPrice(faxGroupDataVO); - resultMap.put("faxPriceMap", faxPriceMap); - + resultMap.put("faxPriceMap", faxPriceMap); + } catch (Exception e) { e.printStackTrace(); // TODO: handle exception } - + paginationInfo.setTotalRecordCount(faxGroupListVO.size() > 0 ? faxGroupListVO.get(0).getTotCnt() : 0); resultMap.put("faxGroupListVO", faxGroupListVO); resultMap.put("paginationInfo", paginationInfo); return resultMap; } - } \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml index fa655e4a..dfac412f 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml @@ -3774,6 +3774,24 @@ AND CERT_USE_YN = 'Y' + + diff --git a/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp b/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp index f3caaae5..cab58bf2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp @@ -178,6 +178,8 @@ function actionLogin(){ success : function(data) { //alert(data.status); //alert(data.data.moblphonNo); + console.log('==========='); + console.log(data.mberCertPhoneList); if (data.status=="success"){ //번호인증팝업 띄우기 @@ -190,8 +192,14 @@ function actionLogin(){ $("#input_list_item_5").show(); $("#input_list_item_6").show(); - $("#hp_text2").val(data.data.moblphonNo); - +// $("#hp_text2").val(data.data.moblphonNo); + var $select = $('#hp_text2'); + data.mberCertPhoneList.forEach(function(item) { + $select.append($('
From 0b22c3160b9f75c4ecd8d1e2047727a4a72c86e1 Mon Sep 17 00:00:00 2001 From: kmg Date: Tue, 19 Nov 2024 17:39:16 +0900 Subject: [PATCH 13/63] =?UTF-8?q?2024/11/19=20=ED=8C=9D=EC=97=85=EC=88=98?= =?UTF-8?q?=EC=A0=95=201=EC=B0=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/web/main/mainPage.jsp | 34 ++++++++++++++++++- src/main/webapp/publish/css/popupLayer.css | 1 + 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp index 5e01be31..3f38cc74 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -1225,7 +1225,7 @@ function fn_click_banner_add_stat(bannerMenuCode){
- + + + +
+ +
+
+ 이용약관 개정 안내 변함없는 문자온 서비스 이용에 감사의 말씀 드립니다. 당사 이용약관이 개정되오니 서비스 이용에 참고하시기 바랍니다. 이용약관 공지사항 항상 최선의 서비스를 제공할 수 있도록 노력하겠습니다. 감사합니다. + + + +
+
+ + +
+
+ + +
+
+ 이용약관 개정 안내 변함없는 문자온 서비스 이용에 감사의 말씀 드립니다. 당사 이용약관이 개정되오니 서비스 이용에 참고하시기 바랍니다. 이용약관 공지사항 항상 최선의 서비스를 제공할 수 있도록 노력하겠습니다. 감사합니다. + + + +
+
+ + +
+
+
diff --git a/src/main/webapp/publish/css/popupLayer.css b/src/main/webapp/publish/css/popupLayer.css index 3fa3cc1f..d99c22d8 100644 --- a/src/main/webapp/publish/css/popupLayer.css +++ b/src/main/webapp/publish/css/popupLayer.css @@ -58,6 +58,7 @@ .layer_popup_wrap02 .layer_popup:first-child{margin-left: 0;} .layer_popup_wrap02 .layer_popup:last-child{margin-right: 0;} .layer_popup_wrap02 .popup_inner{position: relative; display: flex; width: 100%; height: 100%; vertical-align: middle; justify-content: center; align-items: center;} +.layer_popup_wrap .popup_range {display:flex; flex-direction:column;} /* layer_tType1 */ .popTable_wrap {border: 1px solid #ccc; border-radius: 5px;} From 06fec12b4594cb1d989eb0609517aa17c5561fb0 Mon Sep 17 00:00:00 2001 From: Eunjipark Date: Tue, 19 Nov 2024 17:57:55 +0900 Subject: [PATCH 14/63] =?UTF-8?q?2024/11/19=20=ED=8C=9D=EC=97=85=EC=88=98?= =?UTF-8?q?=EC=A0=95=202=EC=B0=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/web/main/mainPage.jsp | 14 +++++++------- .../publish/images/main/popup04_241119.jpg | Bin 0 -> 56864 bytes .../publish/images/main/popup06_241119.jpg | Bin 0 -> 61900 bytes 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 src/main/webapp/publish/images/main/popup04_241119.jpg create mode 100644 src/main/webapp/publish/images/main/popup06_241119.jpg diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp index 3f38cc74..7e8c1f21 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -1241,12 +1241,12 @@ function fn_click_banner_add_stat(bannerMenuCode){
- +
- 이용약관 개정 안내 변함없는 문자온 서비스 이용에 감사의 말씀 드립니다. 당사 이용약관이 개정되오니 서비스 이용에 참고하시기 바랍니다. 이용약관 공지사항 항상 최선의 서비스를 제공할 수 있도록 노력하겠습니다. 감사합니다. - - + 보안강화 인증수단 도입 안내 2024년 11월 17일자로 보안강화를 위해 서비스 로그인 시 휴대폰 본인인증 기능을 도입하였으니 서비스 이용에 참고하시기 바랍니다. + +
@@ -1255,12 +1255,12 @@ function fn_click_banner_add_stat(bannerMenuCode){
- +
- 이용약관 개정 안내 변함없는 문자온 서비스 이용에 감사의 말씀 드립니다. 당사 이용약관이 개정되오니 서비스 이용에 참고하시기 바랍니다. 이용약관 공지사항 항상 최선의 서비스를 제공할 수 있도록 노력하겠습니다. 감사합니다. + 이용약관 개정 안내 변함없는 문자온 서비스 이용에 감사의 말씀 드립니다. 당사 이용약관이 개정되오니 서비스 이용에 참고하시기 바랍니다. - +
diff --git a/src/main/webapp/publish/images/main/popup04_241119.jpg b/src/main/webapp/publish/images/main/popup04_241119.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2cfdcc77142970eb1ac7c1f5c59822aacf854b20 GIT binary patch literal 56864 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 literal 0 HcmV?d00001 diff --git a/src/main/webapp/publish/images/main/popup06_241119.jpg b/src/main/webapp/publish/images/main/popup06_241119.jpg new file mode 100644 index 0000000000000000000000000000000000000000..8f28e1421cf17d458d3b9ffff8919608d5178b59 GIT binary patch literal 61900 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 Date: Tue, 19 Nov 2024 18:35:04 +0900 Subject: [PATCH 15/63] =?UTF-8?q?=EB=B3=B4=EC=95=88=EA=B0=95=ED=99=94=20?= =?UTF-8?q?=EC=9D=B8=EC=A6=9D=EC=88=98=EB=8B=A8=20=EB=8F=84=EC=9E=85=20?= =?UTF-8?q?=ED=8C=9D=EC=97=85=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/web/main/mainPage.jsp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp index 7e8c1f21..368b9c14 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -39,15 +39,14 @@ $(document).ready(function() { //개인정보처리방침 팝업 날짜 설정 - var agreePrivateSDate = "2024-11-06"; + var agreePrivateSDate = "2024-11-23"; var agreePrivateNow = new Date(); agreePrivateNow = leadingZeros(agreePrivateNow.getFullYear(), 4) + '-' + leadingZeros(agreePrivateNow.getMonth() + 1, 2) + '-' + leadingZeros(agreePrivateNow.getDate(), 2); - if (agreePrivateNow < agreePrivateSDate) { - $("#agreePrivatePop_20241105").show(); + $("#agreePrivatePop_20241119").show(); $("#agreePrivatePop_20241106").hide(); }else{ - $("#agreePrivatePop_20241105").hide(); + $("#agreePrivatePop_20241119").hide(); $("#agreePrivatePop_20241106").show(); } @@ -1211,7 +1210,7 @@ function fn_click_banner_add_stat(bannerMenuCode){
-
+ -
이용약관 개정 안내 변함없는 문자온 서비스 이용에 감사의 말씀 드립니다. 당사 이용약관이 개정되오니 서비스 이용에 참고하시기 바랍니다. 이용약관 공지사항 항상 최선의 서비스를 제공할 수 있도록 노력하겠습니다. 감사합니다. @@ -1237,12 +1236,12 @@ function fn_click_banner_add_stat(bannerMenuCode){
-
--> +
-
+ +
+ + + + + + + +
@@ -775,7 +973,7 @@ function callTo() {

인증에 사용할 휴대폰번호를 추가로 등록하여 관리할 수 있습니다.
(등록 및 삭제 시 휴대폰 본인인증 필요)

- +
From 9741b0e43ad12e9547261b72734347172470ef42 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 21 Nov 2024 09:59:42 +0900 Subject: [PATCH 26/63] =?UTF-8?q?=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20>=20=EB=B3=B4=EC=95=88=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=20<=20=ED=8D=BC=EB=B8=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/uat/uia/web/EgovMypageController.java | 17 + .../WEB-INF/jsp/web/user/mberInfoIndex.jsp | 317 --------- .../WEB-INF/jsp/web/user/mberSecureLogin.jsp | 645 ++++++++++++++++++ .../WEB-INF/jsp/web/user/mypageHeader.jsp | 5 +- 4 files changed, 665 insertions(+), 319 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp 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 2fa0f583..6277da30 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovMypageController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovMypageController.java @@ -2942,6 +2942,23 @@ public class EgovMypageController { return "web/user/mberSecession"; } + /** + * 회원탈퇴 본인인증 화면 + */ + @RequestMapping(value="/web/user/mberSecureLogin.do") + public String secureLogin(@ModelAttribute MberManageVO mberManageVO + , ModelMap model, HttpServletRequest request, RedirectAttributes redirectAttributes) throws Exception { + + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + if(loginVO == null) { + //redirectAttributes.addFlashAttribute("message", "문자온 서비스는 로그인 후 이용 가능합니다."); + return "redirect:/web/user/login/login.do"; + } + + 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 11a59870..78b4db94 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp @@ -56,323 +56,6 @@ $(document).ready(function(){ }); -// 보안 로그인 -$(document).ready(function(){ - - // 인증번호 발송 버튼 - $('#certReqBtn').on('click', function(){ - var certReqPhone = $('#certReqPhone').val(); - - if (certReqPhone==''){ - alert("핸드폰번호를 입력해주세요."); - return; - } - var params = {"mbtlnum" : certReqPhone } - $.ajax({ - type: "POST", - url : "", - data: params, - dataType:'json', - async: false, - success: function (returnData) { - console.log('returnData : ', returnData); - if(returnData.status == 'OK'){ - alert(returnData.object.msg); - $("#certReqPhone").prop("disabled", true); - } - else - { - alert("오류가 발생하였습니다."); - } - }, - error: function (e) { alert("오류가 발생하였습니다."); console.log("ERROR : ", e); } - }); - }); - - // 인증 버튼 - $('#certConfirmBtn').on('click', function(){ - var certReqPhone = $('#certReqPhone').val(); - var certNumber = $('#certNumber').val(); - - if (certNumber==''){ - alert("인증번호를 입력해주세요."); - return; - } - var params = {"mbtlnum" : certReqPhone, "checkNo" : certNumber } - $.ajax({ - type: "POST", - url : "", - data: params, - dataType:'json', - async: false, - success: function (returnData) { - console.log('returnData : ', returnData); - if(returnData.status == 'OK'){ -// alert(returnData.object.msg); - regCertPhone(params); - } - else if(returnData.status == 'BAD_REQUEST'){ - alert(returnData.message); - } - else - { - alert("오류가 발생하였습니다."); - } - }, - error: function (e) { alert("오류가 발생하였습니다."); console.log("ERROR : ", e); } - }); - }); - - - - $('#showLoginBtn').on('click', function() { - if ($('#securityLogin').is(':visible')) { - $('#securityLogin').hide(); - } else { - $('#securityLogin').show(); - } - }); - - - - // IP 추가 버튼 클릭 시 tr 추가 - $(".btn_ip_plus").click(function () { - // 추가할 HTML 구조 - const ipTr = ` - - - - - - - - - - `; - - // 이미 추가된 `.ip-row`가 있는지 확인 - if ($(".ip_table tbody .ip-new").length === 0) { - $(".ip_table tbody").prepend(ipTr); // 중복되지 않으면 추가 - } else { - alert("이미 추가된 항목이 있습니다."); - } - }); - - - // IP 등록버튼 - $(document).on('click', '#ipRegBtn', function () { - // 현재 클릭된 버튼의 부모 tr 요소 - const $currentRow = $(this).closest('tr'); - - // 입력값 가져오기 - const ipValue = $currentRow.find('td:eq(0) input').val(); // 첫 번째 열 (IP) - const memoValue = $currentRow.find('td:eq(1) input').val(); // 두 번째 열 (메모) - - // 예외 처리 - if (!ipValue) { - alert("등록할 IP를 입력해주세요."); - $currentRow.find('td:eq(0) input').focus(); - return; - } - - - const ipRegex = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/; - - if (!ipRegex.test(ipValue)) { - alert("유효하지 않은 IP 주소입니다."); - return false; - } - - var params = { - "certIp" : ipValue - , "certMemo" : memoValue - } - - if(!confirm("IP를 등록 하시겠습니까?")){ - return false; - } - $.ajax({ - type: "POST", - url: "/cert/ip/insertCertIp.do", - data: params, - dataType:'json', - async: false, - success: function (returnData) { - if(returnData.status == 'OK'){ - findAllCertIp(); - }else if(returnData.status == 'CONFLICT'){ - alert(returnData.message); - return false; - } - else - { - alert("오류가 발생하였습니다."); - } - }, - error: function (e) { alert("오류가 발생하였습니다."); console.log("ERROR : ", e); } - }); - }); - - - findAllCertIp(); -}); - - -function regCertPhone(params){ - - $.ajax({ - type: "POST", - url: "/cert/phone/insertCertPhone.do", - data: params, - dataType:'json', - async: false, - success: function (returnData) { - if(returnData.status == 'OK'){ - findAllCertIp(); - }else if(returnData.status == 'CONFLICT'){ - alert(returnData.message); - return false; - } - else - { - alert("오류가 발생하였습니다."); - } - }, - error: function (e) { alert("오류가 발생하였습니다."); console.log("ERROR : ", e); } - }); - - -} - -function findAllCertIp(){ - - $.ajax({ - type: "POST", - url: "/cert/ip/selectMberCertIpList.do", - data: null, - dataType:'json', - async: false, - success: function (returnData) { - if (returnData.status === "OK") { - const objects = returnData.object; // 배열 데이터 - - // tbody의 기존 내용 삭제 - const $tbody = $(".ip_table tbody"); - $tbody.empty(); - - // 배열 데이터를 기반으로 tr 생성 후 tbody에 추가 - $.each(objects, function(index, obj) { - const $tr = $(""); // tr 요소 생성 - - // 각 td 요소 생성 - const $certIp = $("").text(obj.certIp || ""); - const $certMemo = $("").text(obj.certMemo || ""); - const $frstRegistPnttm = $("").text(obj.frstRegistPnttm || "등록되지 않음"); - const $deleteBtn = $("") - .addClass("btnType btn_text btn_lightgray fill btn_28") - .text("삭제") - .attr("type", "button") - .attr("id", "ipDelBtn") - .on("click", function() { - deleteRow(obj.certIp); // 삭제 버튼 클릭 시 실행 - }); - - // 관리 버튼을 감쌀 td 생성 - const $deleteTd = $("").append($deleteBtn); - - // tr에 td 추가 - $tr.append($certIp, $certMemo, $frstRegistPnttm, $deleteTd); - - // tbody에 tr 추가 - $tbody.append($tr); - }); - } else { - alert("데이터를 불러오는 데 실패했습니다."); - } - }, - error: function (e) { alert("오류가 발생하였습니다."); console.log("ERROR : ", e); } - }); -} - -function findAllCertPhone(){ - - $.ajax({ - type: "POST", - url: "/cert/ip/selectMberCertIpList.do", - data: null, - dataType:'json', - async: false, - success: function (returnData) { - if (returnData.status === "OK") { - const objects = returnData.object; // 배열 데이터 - - // tbody의 기존 내용 삭제 - const $tbody = $(".ip_table tbody"); - $tbody.empty(); - - // 배열 데이터를 기반으로 tr 생성 후 tbody에 추가 - $.each(objects, function(index, obj) { - const $tr = $(""); // tr 요소 생성 - - // 각 td 요소 생성 - const $certIp = $("").text(obj.certIp || ""); - const $certMemo = $("").text(obj.certMemo || ""); - const $frstRegistPnttm = $("").text(obj.frstRegistPnttm || "등록되지 않음"); - const $deleteBtn = $("") - .addClass("btnType btn_text btn_lightgray fill btn_28") - .text("삭제") - .attr("type", "button") - .attr("id", "ipDelBtn") - .on("click", function() { - deleteRow(obj.certIp); // 삭제 버튼 클릭 시 실행 - }); - - // 관리 버튼을 감쌀 td 생성 - const $deleteTd = $("").append($deleteBtn); - - // tr에 td 추가 - $tr.append($certIp, $certMemo, $frstRegistPnttm, $deleteTd); - - // tbody에 tr 추가 - $tbody.append($tr); - }); - } else { - alert("데이터를 불러오는 데 실패했습니다."); - } - }, - error: function (e) { alert("오류가 발생하였습니다."); console.log("ERROR : ", e); } - }); -} - -// IP 삭제 -function deleteRow(p_ip){ - - var params = { - "certIp" : p_ip - } - if(!confirm("IP를 삭제 하시겠습니까?")){ - return false; - } - $.ajax({ - type: "POST", - url: "/cert/ip/deleteCertIp.do", - data: params, - dataType:'json', - async: false, - success: function (returnData) { - if(returnData.status == 'OK'){ - findAllCertIp(); - } - else - { - alert("오류가 발생하였습니다."); - } - }, - error: function (e) { alert("오류가 발생하였습니다."); console.log("ERROR : ", e); } - }); -} - - //기간 요일 지정 function setCalVal(val,targetObj){ $('input[name='+targetObj+']').val(val) ; diff --git a/src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp b/src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp new file mode 100644 index 00000000..5ad88a44 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp @@ -0,0 +1,645 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> + + + +
+ + +
+
+
+

휴대폰 인증

+ +
+
+
+ + + + + + + + + + + + + + + + +
본인인증(step1) 표
핸드폰번호 + + + +
인증번호 + + + +
+
+ +
+
+
+
+
+ + +
+ +
+ + <%@include file="/WEB-INF/jsp/web/user/mypageHeader.jsp"%> + + +
+
+

보안로그인

+
+
+ + + + +
+
+ +
+ +
+ diff --git a/src/main/webapp/WEB-INF/jsp/web/user/mypageHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/user/mypageHeader.jsp index 9bd85797..fa8237bf 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/mypageHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/mypageHeader.jsp @@ -36,8 +36,9 @@ $(document).ready(function(){
    • -
  • - +
  • + +
    • \ No newline at end of file From 1f46dca39aed7d95b51128dc7fcbbe546b2d8f57 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 21 Nov 2024 10:01:39 +0900 Subject: [PATCH 27/63] =?UTF-8?q?=EC=98=A4=EB=A5=98=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/itn/let/cert/ip/service/CertIpService.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/main/java/itn/let/cert/ip/service/CertIpService.java b/src/main/java/itn/let/cert/ip/service/CertIpService.java index d5317c2f..b4b58285 100644 --- a/src/main/java/itn/let/cert/ip/service/CertIpService.java +++ b/src/main/java/itn/let/cert/ip/service/CertIpService.java @@ -1,15 +1,6 @@ package itn.let.cert.ip.service; -import java.util.List; - -import itn.let.lett.service.LetterVO; import itn.let.mail.service.StatusResponse; -import itn.let.mjo.addr.service.AddrVO; -import itn.let.mjo.msg.service.MjonMsgVO; -import itn.let.sym.site.service.JoinSettingVO; -import itn.let.uat.uia.service.MberCertPhoneVO; -import itn.let.uat.uia.web.SendLogVO; -import itn.let.uss.umt.service.MberManageVO; public interface CertIpService { From d090114d3f85f6518025e69032204714eba47b4a Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 21 Nov 2024 10:01:39 +0900 Subject: [PATCH 28/63] =?UTF-8?q?=EC=98=A4=EB=A5=98=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/itn/let/cert/ip/service/CertIpService.java | 9 --------- .../java/itn/let/uat/uia/web/EgovMypageController.java | 1 - 2 files changed, 10 deletions(-) diff --git a/src/main/java/itn/let/cert/ip/service/CertIpService.java b/src/main/java/itn/let/cert/ip/service/CertIpService.java index d5317c2f..b4b58285 100644 --- a/src/main/java/itn/let/cert/ip/service/CertIpService.java +++ b/src/main/java/itn/let/cert/ip/service/CertIpService.java @@ -1,15 +1,6 @@ package itn.let.cert.ip.service; -import java.util.List; - -import itn.let.lett.service.LetterVO; import itn.let.mail.service.StatusResponse; -import itn.let.mjo.addr.service.AddrVO; -import itn.let.mjo.msg.service.MjonMsgVO; -import itn.let.sym.site.service.JoinSettingVO; -import itn.let.uat.uia.service.MberCertPhoneVO; -import itn.let.uat.uia.web.SendLogVO; -import itn.let.uss.umt.service.MberManageVO; public interface CertIpService { 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 6277da30..764ffb77 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovMypageController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovMypageController.java @@ -2951,7 +2951,6 @@ public class EgovMypageController { LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; if(loginVO == null) { - //redirectAttributes.addFlashAttribute("message", "문자온 서비스는 로그인 후 이용 가능합니다."); return "redirect:/web/user/login/login.do"; } From 2e7852a002482b1c738e5939d432cb6c7832aad7 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 21 Nov 2024 15:25:23 +0900 Subject: [PATCH 29/63] =?UTF-8?q?=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20>=20=EB=B3=B4=EC=95=88=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=20:=20=EC=9D=B8=EC=A6=9D=EB=B2=88=ED=98=B8=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cert/phone/service/CertPhoneService.java | 6 +- .../service/impl/CertPhoneServiceImpl.java | 18 +- .../cert/phone/web/CertPhoneController.java | 19 +- .../let/uat/uia/web/EgovMypageController.java | 39 +-- .../WEB-INF/jsp/web/user/mberInfoIndex.jsp | 120 +-------- .../WEB-INF/jsp/web/user/mberSecureLogin.jsp | 236 +++++++++++++++--- 6 files changed, 253 insertions(+), 185 deletions(-) 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개월까지만 보관됩니다.

    From b7411be08ad3a886c617dd8b2ec8ae366740682d Mon Sep 17 00:00:00 2001 From: subsub Date: Thu, 21 Nov 2024 16:42:56 +0900 Subject: [PATCH 30/63] =?UTF-8?q?2024/11/21=20=EB=B3=B4=EC=95=88=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20on/off=20=EC=88=98=EC=A0=95,=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EC=A0=95=EB=B3=B4=EC=B0=BD=20=EB=B3=B4?= =?UTF-8?q?=EC=95=88=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/publish/css/common.css | 8 ++ src/main/webapp/publish/images/icon_lock.png | Bin 0 -> 2036 bytes src/main/webapp/publish/js/content.js | 2 +- .../webapp/publish/mypage_index_2024.html | 104 ++++++++++++++---- 4 files changed, 90 insertions(+), 24 deletions(-) create mode 100644 src/main/webapp/publish/images/icon_lock.png diff --git a/src/main/webapp/publish/css/common.css b/src/main/webapp/publish/css/common.css index cb9d574c..c983fc56 100644 --- a/src/main/webapp/publish/css/common.css +++ b/src/main/webapp/publish/css/common.css @@ -151,6 +151,14 @@ caption, .label {position: absolute;width: 1px;height: 1px;margin: -1px;border: .login2 .check_money, .login2 .point, .login2 .event {white-space:nowrap;} + +/* 보안로그인 */ +.security_box{display:inline-flex;height:36px;font-weight:500;background:#fff;padding:0 11px;margin:0 0 0 10px;vertical-align:middle;border-radius:5px;align-items:center;} +.login2 .login_info .security_box i.icon_lock{display:inline-block;width:20px;height:18px;background:url(/publish/images/icon_lock.png) no-repeat center center;background-size:auto 100%;vertical-align:top;} +.security_box .state{font-size:13px;font-weight:600;padding:5px 10px;margin:0 0 0 5px;border-radius:5px;} +.security_box .state.on{border:1px solid #18bb59;background:#e7f8ee;color:#18bb59;} +.security_box .state.off{border:1px solid #e62c2c;background:#fce9e9;color:#e62c2c;} + /* //header */ diff --git a/src/main/webapp/publish/images/icon_lock.png b/src/main/webapp/publish/images/icon_lock.png new file mode 100644 index 0000000000000000000000000000000000000000..83d9630e9c33fe7baf64adb6d1f835ea5aa6bb18 GIT binary patch literal 2036 zcmbVN3v3f*94{#B!DEu~7#p(N5n)p5QSlheZ-PUdq z2@nX&Bxrb4&CpClNHD`fBno5*dn8i+e06KsQZMar7f~EXvS&F*mOlVvH1*r zh+0O|S8cg|TBjRuqQGHyS=Mhob*O6Ooaf@MA74CwPSMY!>Nig;o}BuMz3^m0YFfjZ zGr}bMz%6$MZ5h0&thskvLj1X%eRc=F>W!53i5XK$@)NT!CanGD($T|vuKwP&9NcW( zYQE8P_U*de-OE04m8EwU=Ed#)qa~x+Ltypl7fSu1*Plr_yrU(w zL`qF+U6`@yLi+KvM)%Q+$CtP7zkT#zD6@O`ofCN<9k_5T?MBbIj^>i|!()ES9C2&> z?ISBjR(&wo(~&*%&#n&>_kP+`u-C9A7|8tR*66-1*oNV+#l6?i+c7k`w_#&RI<{-! zNsIFoomI0V_%&FRsBf!pPdXiH$he$Wl}bvs!2b408(-d2IxjfltNgqxp6fHuH13?U z_=j=}amg+@L1E+Mzm6=-D(G48=GA@MKMuY>W$&;nwI%V*YXTQi97E@CUpe~Vg3F77 z>}O+Vk6rTJ5^3!IP)=!9{peBGs#~XQTetK}itO3>H$CR;k1P5%sGeWk&ko!gIM%%K z=7L?{o?D-1Irr1A^8#zThA!Qnc4OqeBXVmO@Ui)7z$erbAnNhat EU%3v)yZ`_I literal 0 HcmV?d00001 diff --git a/src/main/webapp/publish/js/content.js b/src/main/webapp/publish/js/content.js index 7cd4c197..62871e5b 100644 --- a/src/main/webapp/publish/js/content.js +++ b/src/main/webapp/publish/js/content.js @@ -70,7 +70,7 @@ $(document).ready(function () { }); /* 문자샘플 탭 선택 시 활성화 */ - $(".tab_depth1 a").click(function () { + $(".tab_depth1:not(.security_tab) a").click(function () { var tabText = $(this).text(); var tabPosi = $(this).position().left; tabPosi -= 1; diff --git a/src/main/webapp/publish/mypage_index_2024.html b/src/main/webapp/publish/mypage_index_2024.html index fffc111a..3736f21e 100644 --- a/src/main/webapp/publish/mypage_index_2024.html +++ b/src/main/webapp/publish/mypage_index_2024.html @@ -24,11 +24,26 @@ $(function () { // on/off 시 confirm 창 노출 - $('.security_set .tab_depth1 a').click(function () { - if ($(this).text().trim() == "ON") { - confirm("보안로그인 설정 후 로그인 시, 등록한 휴대폰번호로 추가 인증이 진행됩니다"); - } else { - confirm("가입자 휴대폰번호로 본인인증 후 해제가 가능하며, 보안로그인 설정을 해제함으로써 발생하는 손해에 대하여 회사는 책임지지 않습니다."); + $('.security_tab a').click(function (e) { + console.log($(this).hasClass("on")) + if ($(this).hasClass("on") == false) { + if ($(this).text().trim() == "ON") { + if (!confirm("보안로그인 설정 후 로그인 시, 등록한 휴대폰번호로 추가 인증이 진행됩니다")) { + $(this).removeClass("on"); + $(this).siblings("a").addClass("on"); + } else { + $(this).addClass("on"); + $(this).siblings("a").removeClass("on"); + } + } else { + if (!confirm("가입자 휴대폰번호로 본인인증 후 해제가 가능하며, 보안로그인 설정을 해제함으로써 발생하는 손해에 대하여 회사는 책임지지 않습니다.")) { + $(this).removeClass("on"); + $(this).siblings("a").addClass("on"); + } else { + $(this).addClass("on"); + $(this).siblings("a").removeClass("on"); + } + } } }); @@ -198,15 +213,52 @@
    - - + @@ -308,17 +360,23 @@ + - + - + - +
    010-0000-0000 메모 내용 2024-11-04 11:54
    010-0000-0000메모내용 2024-11-04 11:54
    @@ -376,7 +434,7 @@

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

    -
    +
    From 4675554266504f133120628edf73968904cc6354 Mon Sep 17 00:00:00 2001 From: Eunjipark Date: Thu, 21 Nov 2024 17:14:26 +0900 Subject: [PATCH 31/63] =?UTF-8?q?2024/11/21=20=EB=B6=88=EB=B2=95=EC=8A=A4?= =?UTF-8?q?=ED=8C=B8=EB=B0=A9=EC=A7=80=EC=A0=95=EC=B1=85=20=EC=88=98?= =?UTF-8?q?=EC=A0=952?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/publish/service3_spam_2024.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/publish/service3_spam_2024.html b/src/main/webapp/publish/service3_spam_2024.html index 5d09e217..d669274a 100644 --- a/src/main/webapp/publish/service3_spam_2024.html +++ b/src/main/webapp/publish/service3_spam_2024.html @@ -235,7 +235,7 @@ KISA 불법 스팸방지를 위한 정보통신망법 안내서
    - 주식회사 아이티앤(이하 "회사”라 한다)은 편리한 서비스 이용과 스팸, 불법스팸으로 인한 폐해를 방지하기 위해 스팸방지정책을 수립하여 운영하고 있습니다. 회사가 제공하는 인터넷 + 주식회사 아이티앤(이하 “회사”라 한다)은 편리한 서비스 이용과 스팸, 불법스팸으로 인한 폐해를 방지하기 위해 스팸방지정책을 수립하여 운영하고 있습니다. 회사가 제공하는 인터넷 서비스 문자온(www.munjaon.co.kr, 이하 “서비스”)을 이용함에 있어, 아래와 같이 불법스팸(문자, 팩스, 음성, 메일)을 발송한 이용자에 대해서는 이용정지 및 해지, 형사고발 등의 조치를 취하겠습니다.
    From 265e29a513a2bcfcfcb8822de490deaeb88f7dd4 Mon Sep 17 00:00:00 2001 From: subsub Date: Thu, 21 Nov 2024 17:47:39 +0900 Subject: [PATCH 32/63] =?UTF-8?q?2024/11/21=20css=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/publish/css/content.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/publish/css/content.css b/src/main/webapp/publish/css/content.css index 77a9b6b3..87ee1125 100644 --- a/src/main/webapp/publish/css/content.css +++ b/src/main/webapp/publish/css/content.css @@ -1750,7 +1750,7 @@ button.check_validity:hover {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px .fax_content .file_add.upload_table_wrap .file_upload_table tbody tr td p{display: inline-block; max-width: 83%; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; font-size: 15px; font-weight:400; color: #444; vertical-align: sub;} .fax_content .file_add.upload_table_wrap .file_upload_table tbody tr td .btn_file_del{width: 24px; height: 24px;} .fax_content .file_add.upload_table_wrap .file_upload_table tbody tr td img{margin-right: 0;} -.fax_content .file_right{display: inline-block; width: 150px; margin: 0 0 0 8px;} +.fax_content .file_right{display: inline-block; width: 149px; margin: 0 0 0 8px;} .fax_content .file_right button{width: 100%; max-width: 100%; margin: 0 0 4px 0;} .fax_content .file_right p{width: 100%; text-align: right; margin: 20px 0 0 0;} .fax_content .receipt_num_input{width: calc(100% - 300px); max-width: 340px;} From 2f58db34b1643925ec75d25266f282866ef88eaa Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 21 Nov 2024 17:51:37 +0900 Subject: [PATCH 33/63] =?UTF-8?q?=EB=B3=B4=EC=95=88=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=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/CertLoginLogService.java | 14 +++ .../cert/ip/service/MberCertLoginLogVO.java | 68 ++++++++++++ .../cert/ip/service/impl/CertLoginLogDAO.java | 41 +++++++ .../service/impl/CertLoginLogServiceImpl.java | 78 ++++++++++++++ .../cert/ip/web/CertLoginLogController.java | 102 ++++++++++++++++++ .../let/uat/uia/web/EgovLoginController.java | 13 +++ .../spring/com/context-idgen.xml | 19 ++++ .../mysql/sql-map-config-mysql-cert.xml | 5 +- .../let/cert/MjonCertLoginLog_SQL_mysql.xml | 45 ++++++++ .../WEB-INF/jsp/web/user/mberSecureLogin.jsp | 6 +- 10 files changed, 385 insertions(+), 6 deletions(-) create mode 100644 src/main/java/itn/let/cert/ip/service/CertLoginLogService.java create mode 100644 src/main/java/itn/let/cert/ip/service/MberCertLoginLogVO.java create mode 100644 src/main/java/itn/let/cert/ip/service/impl/CertLoginLogDAO.java create mode 100644 src/main/java/itn/let/cert/ip/service/impl/CertLoginLogServiceImpl.java create mode 100644 src/main/java/itn/let/cert/ip/web/CertLoginLogController.java create mode 100644 src/main/resources/egovframework/sqlmap/let/cert/MjonCertLoginLog_SQL_mysql.xml diff --git a/src/main/java/itn/let/cert/ip/service/CertLoginLogService.java b/src/main/java/itn/let/cert/ip/service/CertLoginLogService.java new file mode 100644 index 00000000..3af77334 --- /dev/null +++ b/src/main/java/itn/let/cert/ip/service/CertLoginLogService.java @@ -0,0 +1,14 @@ +package itn.let.cert.ip.service; + +import javax.servlet.http.HttpServletRequest; + +import egovframework.rte.fdl.cmmn.exception.FdlException; + +public interface CertLoginLogService { + + + public void insertCertLoginLog(MberCertLoginLogVO mberCertLoginLogVO, HttpServletRequest request) throws FdlException; + + + +} diff --git a/src/main/java/itn/let/cert/ip/service/MberCertLoginLogVO.java b/src/main/java/itn/let/cert/ip/service/MberCertLoginLogVO.java new file mode 100644 index 00000000..b261e90f --- /dev/null +++ b/src/main/java/itn/let/cert/ip/service/MberCertLoginLogVO.java @@ -0,0 +1,68 @@ +package itn.let.cert.ip.service; + +import itn.let.uss.umt.service.UserDefaultVO; +/** + * + * @author : 이호영 + * @fileName : MberCertLoginLogVO.java + * @date : 2024.11.21 + * @description : 로그인 이력관리 92동안만 관리하고 삭제 + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- * + * 2024.11.21 이호영 최초 생성 + * + * + * + */ +public class MberCertLoginLogVO extends UserDefaultVO{ + + + /** + * @description : + */ + private static final long serialVersionUID = 1L; + + + private String certLoginId; + private String loginId; + private String loginIp; + private String loginDevice; + private String loginDt; + + + public String getCertLoginId() { + return certLoginId; + } + public void setCertLoginId(String certLoginId) { + this.certLoginId = certLoginId; + } + public String getLoginId() { + return loginId; + } + public void setLoginId(String loginId) { + this.loginId = loginId; + } + public String getLoginIp() { + return loginIp; + } + public void setLoginIp(String loginIp) { + this.loginIp = loginIp; + } + public String getLoginDevice() { + return loginDevice; + } + public void setLoginDevice(String loginDevice) { + this.loginDevice = loginDevice; + } + public String getLoginDt() { + return loginDt; + } + public void setLoginDt(String loginDt) { + this.loginDt = loginDt; + } + + + + +} diff --git a/src/main/java/itn/let/cert/ip/service/impl/CertLoginLogDAO.java b/src/main/java/itn/let/cert/ip/service/impl/CertLoginLogDAO.java new file mode 100644 index 00000000..5f81c14a --- /dev/null +++ b/src/main/java/itn/let/cert/ip/service/impl/CertLoginLogDAO.java @@ -0,0 +1,41 @@ +package itn.let.cert.ip.service.impl; + +import org.springframework.stereotype.Repository; + +import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import itn.let.cert.ip.service.MberCertLoginLogVO; + +@Repository("CertLoginLogDAO") +public class CertLoginLogDAO extends EgovAbstractDAO { + + +/* + public List selectMberCertIpList(MberCertIpVO mberCertIpVO) { + return (List) list("MberCertIpVO.selectMberCertIpList", mberCertIpVO); + } + + public void insertCertIp(MberCertIpVO mberCertIpVO) { + insert("MberCertIpVO.insertCertIp", mberCertIpVO); + } + + public void deleteCertIp(MberCertIpVO mberCertIpVO) { + insert("MberCertIpVO.deleteCertIp", mberCertIpVO); + } + + public MberCertIpVO findByMberCertIpList(MberCertIpVO mberCertIpVO) { + return (MberCertIpVO) select("MberCertIpVO.findByMberCertIpList", mberCertIpVO); + } +*/ + public void insertCertLoginLog(MberCertLoginLogVO mberCertLoginLogVO) { + insert("MberCertLoginLogVO.insertCertLoginLog", mberCertLoginLogVO); + } + + public int checkLoginIpExists(MberCertLoginLogVO mberCertLoginLogVO) { + return (int) select("MberCertLoginLogVO.checkLoginIpExists", mberCertLoginLogVO); + } + + public void updateCertLoginLog(MberCertLoginLogVO mberCertLoginLogVO) { + insert("MberCertLoginLogVO.updateCertLoginLog", mberCertLoginLogVO); + } + +} 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 new file mode 100644 index 00000000..bd256583 --- /dev/null +++ b/src/main/java/itn/let/cert/ip/service/impl/CertLoginLogServiceImpl.java @@ -0,0 +1,78 @@ +package itn.let.cert.ip.service.impl; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +import org.springframework.stereotype.Service; + +import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl; +import egovframework.rte.fdl.cmmn.exception.FdlException; +import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import itn.let.cert.ip.service.CertLoginLogService; +import itn.let.cert.ip.service.MberCertLoginLogVO; + +@Service("CertLoginLogService") +public class CertLoginLogServiceImpl extends EgovAbstractServiceImpl implements CertLoginLogService { + + @Resource(name = "CertLoginLogDAO") + private CertLoginLogDAO certLoginLogDAO; + + @Resource(name = "egovMjonCertLoginLogIdGnrService") + private EgovIdGnrService certLoginLogIdGnrService; +/* + @Override + public StatusResponse selectMberCertIpList(MberCertIpVO mberCertPhoneVO) { + List mberCertIpListVO = certLoginLogDAO.selectMberCertIpList(mberCertPhoneVO); + return new StatusResponse(HttpStatus.OK, mberCertIpListVO, LocalDateTime.now()); + } + + + @Override + public StatusResponse insertCertIp(MberCertIpVO mberCertIpVO) { + MberCertIpVO mberCertIpListVO = certLoginLogDAO.findByMberCertIpList(mberCertIpVO); + if(mberCertIpListVO != null) { + return new StatusResponse(HttpStatus.CONFLICT, "중복 IP입니다.", LocalDateTime.now()); + } + certLoginLogDAO.insertCertIp(mberCertIpVO); + return new StatusResponse(HttpStatus.OK, "등록 하였습니다.", LocalDateTime.now()); + } + + + @Override + public StatusResponse deleteCertIp(MberCertIpVO mberCertIpVO) { + certLoginLogDAO.deleteCertIp(mberCertIpVO); + return new StatusResponse(HttpStatus.OK, "삭제 하였습니다.", LocalDateTime.now()); + } +*/ + + @Override + public void insertCertLoginLog(MberCertLoginLogVO mberCertLoginLogVO, HttpServletRequest request) throws FdlException { + + + 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) { + String userAgent = request.getHeader("User-Agent").toLowerCase(); + + if (userAgent.contains("mobile") || userAgent.contains("android") || userAgent.contains("iphone")) { + return "M"; + } else if (userAgent.contains("tablet") || userAgent.contains("ipad")) { + return "T"; + } else { + return "D"; + } + } + +} diff --git a/src/main/java/itn/let/cert/ip/web/CertLoginLogController.java b/src/main/java/itn/let/cert/ip/web/CertLoginLogController.java new file mode 100644 index 00000000..0118a704 --- /dev/null +++ b/src/main/java/itn/let/cert/ip/web/CertLoginLogController.java @@ -0,0 +1,102 @@ +package itn.let.cert.ip.web; + +import java.time.LocalDateTime; + +import javax.annotation.Resource; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; +import itn.com.cmm.LoginVO; +import itn.com.utl.fcc.service.EgovStringUtil; +import itn.let.cert.ip.service.CertLoginLogService; +import itn.let.cert.ip.service.MberCertIpVO; +import itn.let.mail.service.StatusResponse; + +/** + * + * @author : 이호영 + * @fileName : CertIpController.java + * @date : 2024.11.19 + * @description : 허용 IP 관련 컨트롤러 + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- * + * 2024.11.19 이호영 최초 생성 + * + * + * + */ +@Controller +public class CertLoginLogController { + + + /* CertLoginLogService */ + @Resource(name = "CertLoginLogService") + private CertLoginLogService certLoginLogService; + + /* + @RequestMapping(value = {"/cert/ip/selectMberCertIpList.do"}) + public ResponseEntity selectMberCertIpList(MberCertIpVO mberCertPhoneVO) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); + + if(userId == null) { + if(StringUtils.isEmpty(userId)) return ResponseEntity.ok().body(new StatusResponse(HttpStatus.BAD_REQUEST, "로그인 후 이용해 주세요", LocalDateTime.now())); + } + mberCertPhoneVO.setMberId(userId); + return ResponseEntity.ok().body(certLoginLogService.selectMberCertIpList(mberCertPhoneVO)); + } + + + @RequestMapping(value = {"/cert/ip/insertCertIp.do"}) + public ResponseEntity insertCertIp(MberCertIpVO mberCertIpVO) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); + + if(userId == null) { + if(StringUtils.isEmpty(userId)) return ResponseEntity.ok().body(new StatusResponse(HttpStatus.BAD_REQUEST, "로그인 후 이용해 주세요", LocalDateTime.now())); + } + mberCertIpVO.setFrstRegisterId(userId); + mberCertIpVO.setMberId(userId); + + + return ResponseEntity.ok().body(certLoginLogService.insertCertIp(mberCertIpVO)); + } + + @RequestMapping(value = {"/cert/ip/deleteCertIp.do"}) + public ResponseEntity deleteCertIp(MberCertIpVO mberCertIpVO) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); + + if(userId == null) { + if(StringUtils.isEmpty(userId)) return ResponseEntity.ok().body(new StatusResponse(HttpStatus.BAD_REQUEST, "로그인 후 이용해 주세요", LocalDateTime.now())); + } + mberCertIpVO.setLastUpdusrId(userId); + mberCertIpVO.setMberId(userId); + + + return ResponseEntity.ok().body(certLoginLogService.deleteCertIp(mberCertIpVO)); + } + */ +} \ No newline at end of file diff --git a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java index e5eda7b6..f22c7e3c 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java @@ -83,6 +83,8 @@ import itn.com.cmm.util.StringUtil; import itn.com.cmm.util.WebUtil; import itn.com.uss.olh.hpc.service.HackIpService; import itn.com.uss.olh.hpc.service.HackIpVO; +import itn.let.cert.ip.service.CertLoginLogService; +import itn.let.cert.ip.service.MberCertLoginLogVO; import itn.let.cert.phone.service.CertPhoneService; import itn.let.cert.phone.service.MberCertPhoneVO; import itn.let.cop.bbs.service.BoardVO; @@ -242,6 +244,9 @@ public class EgovLoginController { @Resource(name = "CertPhoneService") private CertPhoneService certPhoneService; + @Resource(name = "CertLoginLogService") + private CertLoginLogService certLoginLogService; + private static final Logger logger = LoggerFactory.getLogger(MjonMsgDataController.class); /* 문자온 사용자 로그인 시작 */ @@ -1111,6 +1116,7 @@ public class EgovLoginController { // 공인 IP 구하기 String userIp = EgovClntInfo.getClntIP(request); + System.out.println("userIp :: "+userIp); // java.util.Scanner s = new java.util.Scanner(new // java.net.URL("https://api.ipify.org").openStream(), // "UTF-8").useDelimiter("\\A"); @@ -2664,7 +2670,14 @@ public class EgovLoginController { loginVO.getIp(); loginVO.setMessage("로그인 성공되었습니다."); loginVO.setLoginYn("Y"); + loginService.insertActionLoginLog(loginVO); + // 인증 로그인 이력을 위한 insert + + MberCertLoginLogVO mberCertLoginLogVO = new MberCertLoginLogVO(); + mberCertLoginLogVO.setLoginId(loginVO.getId()); + mberCertLoginLogVO.setLoginIp(loginVO.getIp()); + certLoginLogService.insertCertLoginLog(mberCertLoginLogVO, request); } // 등급제 Start diff --git a/src/main/resources/egovframework/spring/com/context-idgen.xml b/src/main/resources/egovframework/spring/com/context-idgen.xml index 4b5c4923..727e2847 100644 --- a/src/main/resources/egovframework/spring/com/context-idgen.xml +++ b/src/main/resources/egovframework/spring/com/context-idgen.xml @@ -2849,5 +2849,24 @@ + + + + + + + + + + + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/config/mysql/sql-map-config-mysql-cert.xml b/src/main/resources/egovframework/sqlmap/config/mysql/sql-map-config-mysql-cert.xml index 081c2f5f..98a25d13 100644 --- a/src/main/resources/egovframework/sqlmap/config/mysql/sql-map-config-mysql-cert.xml +++ b/src/main/resources/egovframework/sqlmap/config/mysql/sql-map-config-mysql-cert.xml @@ -3,6 +3,7 @@ - - + + + 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 new file mode 100644 index 00000000..55517b16 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/let/cert/MjonCertLoginLog_SQL_mysql.xml @@ -0,0 +1,45 @@ + + + + + + + + + + INSERT INTO LETTNGNRLMBER_CERT_LOGIN_LOG_IP + ( + CERT_LOGIN_ID, + LOGIN_ID, + LOGIN_IP, + LOGIN_DEVICE, + LOGIN_DT + ) + VALUES + ( + #certLoginId#, + #loginId#, + #loginIp#, + #loginDevice#, + NOW() + ) + + + + + UPDATE LETTNGNRLMBER_CERT_LOGIN_LOG_IP + SET LOGIN_DT = NOW() + WHERE LOGIN_IP = #loginIp# + AND LOGIN_ID = #loginId# + + + \ No newline at end of file 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 b718be59..d4879c9a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp @@ -20,10 +20,8 @@ $(document).ready(function(){ // on/off 시 confirm 창 노출 $('.security_set .tab_depth1 a').click(function () { if ($(this).text().trim() == "ON") { - if(!confirm("보안로그인 설정 후 로그인 시, 등록한 휴대폰번호로 추가 인증이 진행됩니다")){ - console.log('???'); - return false; - } + confirm("보안로그인 설정 후 로그인 시, 등록한 휴대폰번호로 추가 인증이 진행됩니다"); + } else { confirm("가입자 휴대폰번호로 본인인증 후 해제가 가능하며, 보안로그인 설정을 해제함으로써 발생하는 손해에 대하여 회사는 책임지지 않습니다."); openKMCISWindow(); From 9b3a4a3362605a97652e05a777cfb358f142496b Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 21 Nov 2024 20:11:38 +0900 Subject: [PATCH 34/63] =?UTF-8?q?=EB=B3=B4=EC=95=88=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=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 --- .../let/cert/ip/service/CertIpService.java | 7 ++ .../cert/ip/service/CertLoginLogService.java | 5 ++ .../let/cert/ip/service/impl/CertIpDAO.java | 8 ++ .../ip/service/impl/CertIpServiceImpl.java | 25 +++++- .../cert/ip/service/impl/CertLoginLogDAO.java | 6 ++ .../service/impl/CertLoginLogServiceImpl.java | 9 +++ .../let/uat/uia/web/EgovMypageController.java | 71 ++++++++++++++++- .../sqlmap/let/cert/MjonCertIp_SQL_mysql.xml | 29 +++++++ .../let/cert/MjonCertLoginLog_SQL_mysql.xml | 30 +++++++ .../WEB-INF/jsp/web/user/mberSecureLogin.jsp | 79 ++++++------------- 10 files changed, 211 insertions(+), 58 deletions(-) diff --git a/src/main/java/itn/let/cert/ip/service/CertIpService.java b/src/main/java/itn/let/cert/ip/service/CertIpService.java index b4b58285..49fd964c 100644 --- a/src/main/java/itn/let/cert/ip/service/CertIpService.java +++ b/src/main/java/itn/let/cert/ip/service/CertIpService.java @@ -1,5 +1,7 @@ package itn.let.cert.ip.service; +import java.util.List; + import itn.let.mail.service.StatusResponse; public interface CertIpService { @@ -22,6 +24,11 @@ public interface CertIpService { public StatusResponse deleteCertIp(MberCertIpVO mberCertIpVO); + public Boolean checkCertIp(MberCertIpVO mberCertIpVO); + + public Boolean checkRegCertIp(MberCertIpVO mberCertIpVO); + + } diff --git a/src/main/java/itn/let/cert/ip/service/CertLoginLogService.java b/src/main/java/itn/let/cert/ip/service/CertLoginLogService.java index 3af77334..c0bb6484 100644 --- a/src/main/java/itn/let/cert/ip/service/CertLoginLogService.java +++ b/src/main/java/itn/let/cert/ip/service/CertLoginLogService.java @@ -1,5 +1,7 @@ package itn.let.cert.ip.service; +import java.util.List; + import javax.servlet.http.HttpServletRequest; import egovframework.rte.fdl.cmmn.exception.FdlException; @@ -9,6 +11,9 @@ public interface CertLoginLogService { public void insertCertLoginLog(MberCertLoginLogVO mberCertLoginLogVO, HttpServletRequest request) throws FdlException; + public List findAllCertLoginLogVO(MberCertLoginLogVO mberCertLoginLogVO); + + } diff --git a/src/main/java/itn/let/cert/ip/service/impl/CertIpDAO.java b/src/main/java/itn/let/cert/ip/service/impl/CertIpDAO.java index e1e2278c..f76ba664 100644 --- a/src/main/java/itn/let/cert/ip/service/impl/CertIpDAO.java +++ b/src/main/java/itn/let/cert/ip/service/impl/CertIpDAO.java @@ -27,5 +27,13 @@ public class CertIpDAO extends EgovAbstractDAO { public MberCertIpVO findByMberCertIpList(MberCertIpVO mberCertIpVO) { return (MberCertIpVO) select("MberCertIpVO.findByMberCertIpList", mberCertIpVO); } + + public List checkCertIp(MberCertIpVO mberCertIpVO) { + return (List) list("MberCertIpVO.checkCertIp", mberCertIpVO); + } + + public List checkRegCertIp(MberCertIpVO mberCertIpVO) { + return (List) list("MberCertIpVO.checkRegCertIp", mberCertIpVO); + } } diff --git a/src/main/java/itn/let/cert/ip/service/impl/CertIpServiceImpl.java b/src/main/java/itn/let/cert/ip/service/impl/CertIpServiceImpl.java index 023efcc4..31e4e6e6 100644 --- a/src/main/java/itn/let/cert/ip/service/impl/CertIpServiceImpl.java +++ b/src/main/java/itn/let/cert/ip/service/impl/CertIpServiceImpl.java @@ -21,8 +21,8 @@ public class CertIpServiceImpl extends EgovAbstractServiceImpl implements CertIp @Override - public StatusResponse selectMberCertIpList(MberCertIpVO mberCertPhoneVO) { - List mberCertIpListVO = certIpDAO.selectMberCertIpList(mberCertPhoneVO); + public StatusResponse selectMberCertIpList(MberCertIpVO mberCertIpVO) { + List mberCertIpListVO = certIpDAO.selectMberCertIpList(mberCertIpVO); return new StatusResponse(HttpStatus.OK, mberCertIpListVO, LocalDateTime.now()); } @@ -43,5 +43,26 @@ public class CertIpServiceImpl extends EgovAbstractServiceImpl implements CertIp certIpDAO.deleteCertIp(mberCertIpVO); return new StatusResponse(HttpStatus.OK, "삭제 하였습니다.", LocalDateTime.now()); } + + + @Override + public Boolean checkCertIp(MberCertIpVO mberCertIpVO) { + List mberCertIpListVO = certIpDAO.checkCertIp(mberCertIpVO); + if(mberCertIpListVO.size()>0) { + return true; + }else { + return false; + } + } + + @Override + public Boolean checkRegCertIp(MberCertIpVO mberCertIpVO) { + List mberCertIpListVO = certIpDAO.checkRegCertIp(mberCertIpVO); + if(mberCertIpListVO.size()>0) { + return true; + }else { + return false; + } + } } diff --git a/src/main/java/itn/let/cert/ip/service/impl/CertLoginLogDAO.java b/src/main/java/itn/let/cert/ip/service/impl/CertLoginLogDAO.java index 5f81c14a..8bc7b868 100644 --- a/src/main/java/itn/let/cert/ip/service/impl/CertLoginLogDAO.java +++ b/src/main/java/itn/let/cert/ip/service/impl/CertLoginLogDAO.java @@ -1,5 +1,7 @@ package itn.let.cert.ip.service.impl; +import java.util.List; + import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; @@ -37,5 +39,9 @@ public class CertLoginLogDAO extends EgovAbstractDAO { public void updateCertLoginLog(MberCertLoginLogVO mberCertLoginLogVO) { insert("MberCertLoginLogVO.updateCertLoginLog", mberCertLoginLogVO); } + + public List findAllCertLoginLogVO(MberCertLoginLogVO mberCertLoginLogVO) { + return (List) list("MberCertLoginLogVO.findAllCertLoginLogVO", mberCertLoginLogVO); + } } 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 bd256583..d052ce9b 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 @@ -1,5 +1,7 @@ package itn.let.cert.ip.service.impl; +import java.util.List; + import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -75,4 +77,11 @@ public class CertLoginLogServiceImpl extends EgovAbstractServiceImpl implements } } + @Override + public List findAllCertLoginLogVO(MberCertLoginLogVO mberCertLoginLogVO) { + // TODO Auto-generated method stub + return certLoginLogDAO.findAllCertLoginLogVO(mberCertLoginLogVO); + + } + } 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 89320850..5e707225 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovMypageController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovMypageController.java @@ -41,6 +41,10 @@ import itn.com.cmm.util.MJUtil; import itn.com.cmm.util.RedirectUrlMaker; import itn.com.cmm.util.StringUtil; import itn.com.utl.fcc.service.EgovStringUtil; +import itn.let.cert.ip.service.CertIpService; +import itn.let.cert.ip.service.CertLoginLogService; +import itn.let.cert.ip.service.MberCertIpVO; +import itn.let.cert.ip.service.MberCertLoginLogVO; import itn.let.fax.user.service.FaxGroupDataVO; import itn.let.fax.user.service.FaxService; import itn.let.kakao.user.sent.service.KakaoSentService; @@ -70,6 +74,7 @@ import itn.let.uss.umt.service.EgovMberManageService; import itn.let.uss.umt.service.EgovUserManageService; import itn.let.uss.umt.service.MberManageVO; import itn.let.uss.umt.service.UserManageVO; +import itn.let.utl.sim.service.EgovClntInfo; import itn.let.utl.user.service.MjonNoticeSendUtil; /** @@ -164,6 +169,14 @@ public class EgovMypageController { /** 등급제 관리 서비스 */ @Resource(name = "mberGrdService") MberGrdService mberGrdService; + +// /* CertLoginLogService */ + @Resource(name = "CertLoginLogService") + private CertLoginLogService certLoginLogService; + +// /* CertLoginLogService */ + @Resource(name = "CertIpService") + private CertIpService certIpService; /** * 마이페이지 비밀번호 변경 탭 @@ -2927,13 +2940,58 @@ public class EgovMypageController { * 회원탈퇴 본인인증 화면 */ @RequestMapping(value="/web/user/mberSecureLogin.do") - public String secureLogin(@ModelAttribute MberManageVO mberManageVO + public String secureLogin(@ModelAttribute("mberCertLoginLogVO") MberCertLoginLogVO mberCertLoginLogVO , ModelMap model, HttpServletRequest request, RedirectAttributes redirectAttributes) throws Exception { LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; if(loginVO == null) { return "redirect:/web/user/login/login.do"; } + + //로그인 권한정보 불러오기 + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); + + + mberCertLoginLogVO.setLoginId(userId); + /** pageing */ + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(mberCertLoginLogVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(mberCertLoginLogVO.getPageUnit()); + paginationInfo.setPageSize(mberCertLoginLogVO.getPageSize()); + + mberCertLoginLogVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + mberCertLoginLogVO.setLastIndex(paginationInfo.getLastRecordIndex()); + mberCertLoginLogVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + if("".equals(mberCertLoginLogVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + mberCertLoginLogVO.setSearchSortCnd("LOGIN_DT"); + mberCertLoginLogVO.setSearchSortOrd("asc"); + } + + + //전체 발송 리스트 불러오기 + List resultList = certLoginLogService.findAllCertLoginLogVO(mberCertLoginLogVO); + model.addAttribute("resultList", resultList); + model.addAttribute("resultListCnt", resultList.size()); + + + paginationInfo.setTotalRecordCount( resultList.size()> 0 ? resultList.get(0).getTotCnt() : 0); + model.addAttribute("paginationInfo", paginationInfo); + + + + + // 접속 IP + String cennectIP = EgovClntInfo.getClntIP(request); + model.addAttribute("cennectIP", cennectIP); + + // 접속 IP가 등록되어있는지 확인 + MberCertIpVO mberCertIpVO = new MberCertIpVO(); + mberCertIpVO.setCertIp(cennectIP); + mberCertIpVO.setMberId(userId); + model.addAttribute("chkcertRegIP", certIpService.checkRegCertIp(mberCertIpVO)); + + + { @@ -2954,6 +3012,8 @@ public class EgovMypageController { AuthCertVO certVO = kmcCertCheck.authCertCheckNine(serverNm + "/web/user/selectSecurityAuthn.do", loginVO.getId()); model.addAttribute("certVO", certVO); } + + model.addAttribute("pageTab", "mberSecureLogin"); return "web/user/mberSecureLogin"; @@ -3773,12 +3833,17 @@ public class EgovMypageController { certVO.setCertNation(kmcVO.getNation()); certVO.setCertName(kmcVO.getName()); certVO.setCertResult(kmcVO.getResult()); - certVO.setCertType("KMC_회원정보 변경"); + certVO.setCertType("dddddddddddddddddddddd"); certVO.setCertIpaddr(kmcVO.getIp()); certVO.setBirthDay(kmcVO.getBirthDay()); certVO.setSexdstnCode(kmcVO.getGender()); - model.addAttribute("kmcVO", kmcVO); + + //디비 테이블에 저장하기 + mberManageService.insertCertInfoLog(certVO); + + + return "web/user/securityAuthnPage"; } diff --git a/src/main/resources/egovframework/sqlmap/let/cert/MjonCertIp_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/cert/MjonCertIp_SQL_mysql.xml index cb7b6da6..09b820a2 100644 --- a/src/main/resources/egovframework/sqlmap/let/cert/MjonCertIp_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/cert/MjonCertIp_SQL_mysql.xml @@ -86,4 +86,33 @@ + + + + + \ No newline at end of file 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 55517b16..afc29c29 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 @@ -8,6 +8,36 @@ + + + + + + +
    @@ -579,8 +588,10 @@ function callTo() {

    보안로그인

    - 현재 접속중인 IP : 000.000.000.00 - + 현재 접속중인 IP : [허용 IP] + + +
    @@ -726,62 +737,19 @@ function callTo() {     + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +
    2024-11-20 13:57:12119.193.215.98PC
    2024-11-20 13:57:12119.193.215.98모바일
    2024-11-20 13:57:12119.193.215.98PC
    2024-11-20 13:57:12119.193.215.98모바일
    2024-11-20 13:57:12119.193.215.98PC
    2024-11-20 13:57:12119.193.215.98모바일
    2024-11-20 13:57:12119.193.215.98PC
    2024-11-20 13:57:12119.193.215.98모바일
    2024-11-20 13:57:12119.193.215.98PC
    2024-11-20 13:57:12119.193.215.98모바일
    -
      + - +
    pagination + --> + +
      + +
    +
    From 3dceedeabc414f774a2ddfa743a9d89de720001d Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 21 Nov 2024 20:29:12 +0900 Subject: [PATCH 35/63] =?UTF-8?q?=ED=97=88=EC=9A=A9IP=EB=93=B1=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itn/let/cert/ip/web/CertIpController.java | 25 +++++++++++++++++++ .../WEB-INF/jsp/web/user/mberSecureLogin.jsp | 21 +++++++++++++++- 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/src/main/java/itn/let/cert/ip/web/CertIpController.java b/src/main/java/itn/let/cert/ip/web/CertIpController.java index 8dfb6947..425106eb 100644 --- a/src/main/java/itn/let/cert/ip/web/CertIpController.java +++ b/src/main/java/itn/let/cert/ip/web/CertIpController.java @@ -3,6 +3,7 @@ package itn.let.cert.ip.web; import java.time.LocalDateTime; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; import org.springframework.http.HttpStatus; @@ -17,6 +18,7 @@ import itn.com.utl.fcc.service.EgovStringUtil; import itn.let.cert.ip.service.CertIpService; import itn.let.cert.ip.service.MberCertIpVO; import itn.let.mail.service.StatusResponse; +import itn.let.utl.sim.service.EgovClntInfo; /** * @@ -79,6 +81,29 @@ public class CertIpController { return ResponseEntity.ok().body(certIpService.insertCertIp(mberCertIpVO)); } + + @RequestMapping(value = {"/cert/ip/insertCennetCertIp.do"}) + public ResponseEntity insertCennetCertIp(MberCertIpVO mberCertIpVO,HttpServletRequest request) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); + + if(userId == null) { + if(StringUtils.isEmpty(userId)) return ResponseEntity.ok().body(new StatusResponse(HttpStatus.BAD_REQUEST, "로그인 후 이용해 주세요", LocalDateTime.now())); + } + mberCertIpVO.setFrstRegisterId(userId); + mberCertIpVO.setMberId(userId); + + mberCertIpVO.setCertIp(EgovClntInfo.getClntIP(request)); + mberCertIpVO.setCertMemo("허용 IP 등록"); + + return ResponseEntity.ok().body(certIpService.insertCertIp(mberCertIpVO)); + } + @RequestMapping(value = {"/cert/ip/deleteCertIp.do"}) public ResponseEntity deleteCertIp(MberCertIpVO mberCertIpVO) throws Exception { 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 67b26981..3b58cfe0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp @@ -13,7 +13,26 @@ $(document).ready(function(){ // 허용 IP 등록 $(".btn_allow_ip_add").click(function () { if (confirm("현재 접속중인 IP를 접속 허용 IP로 등록하시겠습니까?")) { - alert("접속 허용 IP 등록이 완료되었습니다."); + + $.ajax({ + type: "POST", + url: "/cert/ip/insertCennetCertIp.do", + data: null, + dataType:'json', + async: false, + success: function (returnData) { + if(returnData.status == 'OK'){ + alert("접속 허용 IP 등록이 완료되었습니다."); + location.reload(); + } + else + { + alert("오류가 발생하였습니다."); + } + }, + error: function (e) { alert("오류가 발생하였습니다."); console.log("ERROR : ", e); } + }); + } else {} }); From 2ef22663d8a9b189905d1a6da8cfdd739a0426a4 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 21 Nov 2024 20:54:38 +0900 Subject: [PATCH 36/63] =?UTF-8?q?=EB=B3=B4=EC=95=88=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20=ED=86=A0=EA=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/uat/uia/web/EgovMypageController.java | 4 +- .../WEB-INF/jsp/web/user/mberSecureLogin.jsp | 40 ++++++++++++++----- 2 files changed, 33 insertions(+), 11 deletions(-) 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 5e707225..7733e9f8 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovMypageController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovMypageController.java @@ -2952,7 +2952,6 @@ public class EgovMypageController { String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); - mberCertLoginLogVO.setLoginId(userId); /** pageing */ PaginationInfo paginationInfo = new PaginationInfo(); paginationInfo.setCurrentPageNo(mberCertLoginLogVO.getPageIndex()); @@ -2967,7 +2966,8 @@ public class EgovMypageController { mberCertLoginLogVO.setSearchSortOrd("asc"); } - + + mberCertLoginLogVO.setLoginId(userId); //전체 발송 리스트 불러오기 List resultList = certLoginLogService.findAllCertLoginLogVO(mberCertLoginLogVO); model.addAttribute("resultList", resultList); 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 3b58cfe0..f97d3832 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp @@ -37,14 +37,37 @@ $(document).ready(function(){ }); // on/off 시 confirm 창 노출 - $('.security_set .tab_depth1 a').click(function () { - if ($(this).text().trim() == "ON") { - confirm("보안로그인 설정 후 로그인 시, 등록한 휴대폰번호로 추가 인증이 진행됩니다"); - - } else { - confirm("가입자 휴대폰번호로 본인인증 후 해제가 가능하며, 보안로그인 설정을 해제함으로써 발생하는 손해에 대하여 회사는 책임지지 않습니다."); - openKMCISWindow(); + $('.security_tab a').click(function (e) { + + + console.log($(this).hasClass("on")) + if ($(this).hasClass("on") == false) { + if ($(this).text().trim() == "ON") { + if (!confirm("보안로그인 설정 후 로그인 시, 등록한 휴대폰번호로 추가 인증이 진행됩니다")) { + $(this).removeClass("on"); + $(this).siblings("a").addClass("on"); + } else { + $(this).addClass("on"); + $(this).siblings("a").removeClass("on"); + } + } else { + if (!confirm("가입자 휴대폰번호로 본인인증 후 해제가 가능하며, 보안로그인 설정을 해제함으로써 발생하는 손해에 대하여 회사는 책임지지 않습니다.")) { + $(this).removeClass("on"); + $(this).siblings("a").addClass("on"); + } else { + $(this).addClass("on"); + $(this).siblings("a").removeClass("on"); + openKMCISWindow(); + } + } } + + + + + + + }); // 인증번호 발송 버튼 @@ -617,8 +640,7 @@ function linkPage(pageNo){

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

    -
    - +
    ON OFF
    From 7a38574459f5349bd058006ace4ee18780696196 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 21 Nov 2024 20:57:16 +0900 Subject: [PATCH 37/63] =?UTF-8?q?=EB=B3=B4=EC=95=88=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20top?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp | 5 +++++ src/main/webapp/publish/mypage_index_2024.html | 1 + 2 files changed, 6 insertions(+) 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 7ec061a8..e7bab983 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -1645,6 +1645,11 @@ function actionLogin() {
    +
    +

    보안로그인

    + ON + +