From 15df969634c894f4fc5a54c0087b34a0f6490712 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Thu, 21 Nov 2024 22:44:17 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/itn/com/cmm/LoginVO.java | 12 +++++ .../impl/EgovMberManageServiceImpl.java | 6 ++- .../uat/uia/service/impl/MberManageDAO.java | 4 ++ .../let/uat/uia/web/EgovMypageController.java | 49 ++++++++++++++++--- .../umt/service/EgovMberManageService.java | 2 + .../itn/let/uss/umt/service/MberManageVO.java | 13 +++++ src/main/java/itn/web/MainController.java | 7 +++ .../let/uss/umt/EgovMberManage_SQL_Mysql.xml | 9 ++++ .../let/uss/umt/EgovUserManage_SQL_Mysql.xml | 1 + .../WEB-INF/jsp/web/com/webCommonHeader.jsp | 10 +++- .../WEB-INF/jsp/web/user/mberSecureLogin.jsp | 48 +++++++++++++++--- 11 files changed, 145 insertions(+), 16 deletions(-) diff --git a/src/main/java/itn/com/cmm/LoginVO.java b/src/main/java/itn/com/cmm/LoginVO.java index 5394ae54..3c4d2dcd 100644 --- a/src/main/java/itn/com/cmm/LoginVO.java +++ b/src/main/java/itn/com/cmm/LoginVO.java @@ -114,6 +114,11 @@ public class LoginVO implements Serializable{ private String dormantYn; // 휴먼회원여부 ( N:일반회원, Y:휴먼회원) + /** + * 보안로그인 여부 + */ + private String secuLoginFlag; + public String getDormantYn() { return dormantYn; } @@ -411,5 +416,12 @@ public class LoginVO implements Serializable{ public void setOuterCertYn(String outerCertYn) { this.outerCertYn = outerCertYn; } + public String getSecuLoginFlag() { + return secuLoginFlag; + } + public void setSecuLoginFlag(String secuLoginFlag) { + this.secuLoginFlag = secuLoginFlag; + } + } diff --git a/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java b/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java index b51976bc..f388a261 100644 --- a/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java +++ b/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java @@ -604,6 +604,10 @@ public class EgovMberManageServiceImpl extends EgovAbstractServiceImpl implement return resultCnt; } - + + @Override + public void updateSecureLoginFlag(MberManageVO mberManageVO) throws Exception { + mberManageDAO.updateSecureLoginFlag(mberManageVO); + } } \ No newline at end of file diff --git a/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java b/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java index 2068d743..c8987d62 100644 --- a/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java +++ b/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java @@ -333,4 +333,8 @@ public class MberManageDAO extends EgovComAbstractDAO{ return resultCnt; } + public void updateSecureLoginFlag(MberManageVO mberManageVO) throws Exception { + update("mberManageDAO.updateSecureLoginFlag",mberManageVO); + } + } \ No newline at end of file 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 7733e9f8..27592d5d 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovMypageController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovMypageController.java @@ -16,9 +16,12 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; @@ -3003,18 +3006,22 @@ public class EgovMypageController { //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"; - } +// 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"; +// } + serverNm = request.getScheme() + "://munjaon.co.kr"; AuthCertVO certVO = kmcCertCheck.authCertCheckNine(serverNm + "/web/user/selectSecurityAuthn.do", loginVO.getId()); model.addAttribute("certVO", certVO); } + MberManageVO mberManageVO = new MberManageVO(); + mberManageVO.setMberId(loginVO.getId()); + + model.addAttribute("mberManageVO", userManageService.selectUserInfo(mberManageVO)); - model.addAttribute("pageTab", "mberSecureLogin"); return "web/user/mberSecureLogin"; } @@ -3833,7 +3840,7 @@ public class EgovMypageController { certVO.setCertNation(kmcVO.getNation()); certVO.setCertName(kmcVO.getName()); certVO.setCertResult(kmcVO.getResult()); - certVO.setCertType("dddddddddddddddddddddd"); + certVO.setCertType("secureLoginOFF"); certVO.setCertIpaddr(kmcVO.getIp()); certVO.setBirthDay(kmcVO.getBirthDay()); certVO.setSexdstnCode(kmcVO.getGender()); @@ -3848,4 +3855,32 @@ public class EgovMypageController { return "web/user/securityAuthnPage"; } + @RequestMapping(value="/web/user/mberSecureLoginAjax.do") + public ResponseEntity mberSecureLoginAjax(MberManageVO mberManageVO, @RequestBody Map params){ + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); + + if("Y".equals(params.get("secuLoginFlag"))) { + mberManageVO.setSecuLoginFlag("N"); + }else { + mberManageVO.setSecuLoginFlag("Y"); + } + mberManageVO.setMberId(userId); + mberManageVO.setLastUpdusrId(userId); + + try { + mberManageService.updateSecureLoginFlag(mberManageVO); + + return new ResponseEntity<>("success", HttpStatus.OK); + } catch (Exception e) { + System.out.println("mberSecureLoginAjax Error!!!!!!!!!!!!!!!!!!!!"); + System.out.println("mberSecureLoginAjax Error!!!!!!!!!!!!!!!!!!!!"); + System.out.println("mberSecureLoginAjax Error!!!!!!!!!!!!!!!!!!!!"); + System.out.println("mberSecureLoginAjax Error!!!!!!!!!!!!!!!!!!!!"); + System.out.println("mberSecureLoginAjax Error!!!!!!!!!!!!!!!!!!!!"); + + return new ResponseEntity<>("fail", HttpStatus.OK); + } + } + } diff --git a/src/main/java/itn/let/uss/umt/service/EgovMberManageService.java b/src/main/java/itn/let/uss/umt/service/EgovMberManageService.java index e03cbeff..28cd30de 100644 --- a/src/main/java/itn/let/uss/umt/service/EgovMberManageService.java +++ b/src/main/java/itn/let/uss/umt/service/EgovMberManageService.java @@ -243,4 +243,6 @@ public interface EgovMberManageService { //기업회원 기업정보 변경신청 취소 처리 public int updateCmpUserInfoCancel(MberManageVO mberManageVO) throws Exception; + + public void updateSecureLoginFlag(MberManageVO mberManageVO) throws Exception; } \ No newline at end of file diff --git a/src/main/java/itn/let/uss/umt/service/MberManageVO.java b/src/main/java/itn/let/uss/umt/service/MberManageVO.java index d7d5ee45..c0364852 100644 --- a/src/main/java/itn/let/uss/umt/service/MberManageVO.java +++ b/src/main/java/itn/let/uss/umt/service/MberManageVO.java @@ -504,6 +504,12 @@ public class MberManageVO extends UserDefaultVO{ private String dormantDate; private String spamYn; + + /** + * 보안로그인 여부 + */ + private String secuLoginFlag; + public String getSpamYn() { return spamYn; } @@ -1784,5 +1790,12 @@ public class MberManageVO extends UserDefaultVO{ public void setHotlineAgentCode(String hotlineAgentCode) { this.hotlineAgentCode = hotlineAgentCode; } + public String getSecuLoginFlag() { + return secuLoginFlag; + } + public void setSecuLoginFlag(String secuLoginFlag) { + this.secuLoginFlag = secuLoginFlag; + } + } \ No newline at end of file diff --git a/src/main/java/itn/web/MainController.java b/src/main/java/itn/web/MainController.java index 5c0106bc..38de9d90 100644 --- a/src/main/java/itn/web/MainController.java +++ b/src/main/java/itn/web/MainController.java @@ -1223,6 +1223,13 @@ public class MainController { model.addAttribute("userCandidateYn", userCandidateYn); + if(loginVO != null) { + MberManageVO mberManageVO = new MberManageVO(); + mberManageVO.setMberId(loginVO.getId()); + + model.addAttribute("mberManageVO", userManageService.selectUserInfo(mberManageVO)); + } + return "web/com/webCommonHeader"; } diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml index 8e721c86..4244acdb 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml @@ -2106,4 +2106,13 @@ WHERE CMPHST_ID = #cmpHstId# + + + + UPDATE LETTNGNRLMBER SET + SECU_LOGIN_FLAG = #secuLoginFlag# + ,LAST_UPDUSR_ID = #lastUpdusrId# + WHERE MBER_ID = #mberId# + + diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml index cffb8d00..1029ce20 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml @@ -1206,6 +1206,7 @@ , A.EMAIL_YN AS emailYN , A.SMS_YN AS smsYN + , A.SECU_LOGIN_FLAG AS secuLoginFlag FROM LETTNGNRLMBER A 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 e7bab983..b3bc00cd 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -109,6 +109,14 @@ $(document).ready(function (){ //등급제 시행 ON/OFF 체크(비로그인) //getMberSettingDetailByNotLogin_Header(); + + var secuLoginFlag = '${mberManageVO.secuLoginFlag}'; + + if (secuLoginFlag === 'Y') { + $('#secuLoginFlag').attr('class', 'state on').text('ON'); + } else if (secuLoginFlag === 'N') { + $('#secuLoginFlag').attr('class', 'state off').text('OFF'); + } }); //등급제 시행 ON/OFF 체크(비로그인) @@ -1647,7 +1655,7 @@ function actionLogin() {

보안로그인

- ON +
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 f97d3832..0a3c2800 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp @@ -36,17 +36,27 @@ $(document).ready(function(){ } else {} }); + + // secuLoginFlag 값에 따라 해당하는 탭에 'on' 클래스 추가 + if ('${mberManageVO.secuLoginFlag}' === 'Y') { + $('.security_tab a').filter(function() { + return $(this).text() === 'ON'; + }).addClass('on'); + } else { + $('.security_tab a').filter(function() { + return $(this).text() === 'OFF'; + }).addClass('on'); + } // on/off 시 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 { + callTo(); $(this).addClass("on"); $(this).siblings("a").removeClass("on"); } @@ -55,8 +65,8 @@ $(document).ready(function(){ $(this).removeClass("on"); $(this).siblings("a").addClass("on"); } else { - $(this).addClass("on"); - $(this).siblings("a").removeClass("on"); +// $(this).addClass("on"); +// $(this).siblings("a").removeClass("on"); openKMCISWindow(); } } @@ -539,7 +549,27 @@ function openKMCISWindow(){ //자식창에서 호출 function callTo() { - alert("호출입니다."); + $.ajax({ + url: '/web/user/mberSecureLoginAjax.do', + type: 'POST', + contentType: 'application/json', + data: JSON.stringify({ + secuLoginFlag: '${mberManageVO.secuLoginFlag}' + }), + success: function(response) { + if(response === 'success'){ + alert('변경이 완료되었습니다.'); + location.reload(); + }else{ + alert('변경에 실패했습니다. 다시 시도해 주세요.'); + location.reload(); + } + + }, + error: function(error) { + alert("error"); + } + }); } function linkPage(pageNo){ @@ -551,7 +581,11 @@ function linkPage(pageNo){ //휴대푠 번호 등록 [끝]-------------------------------------------------------------------------------------------- - +
+ + + +
@@ -641,7 +675,7 @@ function linkPage(pageNo){

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

- ON + ON OFF