이준호 이준호 2024-11-21
Merge branch 'tolag3'
추돌 커밋
@df208e65d82cee13435d054954050f0cc1894b76
src/main/java/itn/com/cmm/LoginVO.java
--- src/main/java/itn/com/cmm/LoginVO.java
+++ src/main/java/itn/com/cmm/LoginVO.java
@@ -114,6 +114,11 @@
 	
 	private String dormantYn; // 휴먼회원여부 ( N:일반회원,  Y:휴먼회원)
 	
+	/**
+	 * 보안로그인 여부
+	 */
+	private String secuLoginFlag;
+	
 	public String getDormantYn() {
 		return dormantYn;
 	}
@@ -411,5 +416,12 @@
 	public void setOuterCertYn(String outerCertYn) {
 		this.outerCertYn = outerCertYn;
 	}
+	public String getSecuLoginFlag() {
+		return secuLoginFlag;
+	}
+	public void setSecuLoginFlag(String secuLoginFlag) {
+		this.secuLoginFlag = secuLoginFlag;
+	}
+	
 	
 }
src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java
--- src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java
+++ src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java
@@ -611,5 +611,8 @@
 		return mberManageDAO.getSecuLoginFlag(id);
 	}
 	
+	public void updateSecureLoginFlag(MberManageVO mberManageVO) throws Exception {
+		mberManageDAO.updateSecureLoginFlag(mberManageVO);
+	}
 	
 }
(No newline at end of file)
src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java
--- src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java
+++ src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java
@@ -337,4 +337,8 @@
 		return (String)select("mberManageDAO.getSecuLoginFlag", id);
 	}
 	
+	public void updateSecureLoginFlag(MberManageVO mberManageVO) throws Exception {
+		update("mberManageDAO.updateSecureLoginFlag",mberManageVO);
+	}
+	
 }
(No newline at end of file)
src/main/java/itn/let/uat/uia/web/EgovMypageController.java
--- src/main/java/itn/let/uat/uia/web/EgovMypageController.java
+++ src/main/java/itn/let/uat/uia/web/EgovMypageController.java
@@ -16,9 +16,12 @@
 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 @@
 			
 			//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 @@
 		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 @@
 		return "web/user/securityAuthnPage";
 	}
 	
+	@RequestMapping(value="/web/user/mberSecureLoginAjax.do")
+	public ResponseEntity<?> mberSecureLoginAjax(MberManageVO mberManageVO, @RequestBody Map<String, String> 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);
+		}
+	}
+	
 }
src/main/java/itn/let/uss/umt/service/EgovMberManageService.java
--- src/main/java/itn/let/uss/umt/service/EgovMberManageService.java
+++ src/main/java/itn/let/uss/umt/service/EgovMberManageService.java
@@ -245,4 +245,7 @@
 	public int updateCmpUserInfoCancel(MberManageVO mberManageVO) throws Exception;
 
 	public String getSecuLoginFlag(String id);
+	
+	public void updateSecureLoginFlag(MberManageVO mberManageVO) throws Exception;
+
 }
(No newline at end of file)
src/main/java/itn/let/uss/umt/service/MberManageVO.java
--- src/main/java/itn/let/uss/umt/service/MberManageVO.java
+++ src/main/java/itn/let/uss/umt/service/MberManageVO.java
@@ -504,6 +504,12 @@
 	private String dormantDate;
 	private String spamYn;
 	
+	
+	/**
+	 * 보안로그인 여부
+	 */
+	private String secuLoginFlag;
+	
 	public String getSpamYn() {
 		return spamYn;
 	}
@@ -1784,5 +1790,12 @@
 	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)
src/main/java/itn/web/MainController.java
--- src/main/java/itn/web/MainController.java
+++ src/main/java/itn/web/MainController.java
@@ -1223,6 +1223,13 @@
 		
 		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";
     }
     
src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml
--- src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml
@@ -2113,4 +2113,14 @@
 		select SECU_LOGIN_FLAG  from lettngnrlmber where MBER_ID = #id#
     
     </select>
+
+    <update id="mberManageDAO.updateSecureLoginFlag" parameterClass="mberVO">
+    	
+    	UPDATE LETTNGNRLMBER SET 
+		SECU_LOGIN_FLAG = #secuLoginFlag#
+		,LAST_UPDUSR_ID = #lastUpdusrId#
+		WHERE MBER_ID = #mberId#
+    
+    </update>
+
 </sqlMap>
src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml
--- src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml
+++ 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
src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
--- src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
+++ src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
@@ -109,6 +109,14 @@
 
 	//등급제 시행 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 @@
 		                        <button type="button" class="btnType btnType2" onclick="location.href='/web/uat/uia/actionLogout.do'">로그아웃</button>
 								<div class="security_box">
 									<p class="title"><i class="icon_lock"></i>보안로그인</p>
-									<a href="#" class="state on">ON</a>
+									<a href="#" id="secuLoginFlag" class="state">    </a>
 									<!-- <a href="#" class="state off">OFF</a> -->
 								</div>
 		                    </div>
src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp
--- src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp
+++ src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp
@@ -36,17 +36,27 @@
 		} 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 @@
 					$(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();
 				}
 			}
@@ -540,7 +550,27 @@
 
 //자식창에서 호출
 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){
@@ -552,7 +582,11 @@
 //휴대푠 번호 등록 [끝]--------------------------------------------------------------------------------------------
 
 </script>
-
+<form name="reqKMCISForm" method="post" action="#">
+	<input type="hidden" id="tr_url" name="tr_url" value = "${certVO.tr_url}">
+	<input type="hidden" id="tr_add" name="tr_add" value = "${certVO.tr_add}">
+	<input type="hidden" id="tr_cert" name="tr_cert" value = "${certVO.tr_cert}">
+</form>
 <form name="listForm" action="<c:url value='/web/user/mberSecureLogin.do'/>" method="post">
 	<input name="pageIndex" type="hidden" value="<c:out value='${mberCertLoginLogVO.pageIndex}'/>"/>
 </form>
@@ -642,7 +676,7 @@
 									<p class="lately_date">최근 변경일시 : <span>2024-11-01 12:49</span></p>
 
 									<div class="tab_depth1 security_tab">
-										<a href="#none" class="on">ON</a>
+										<a href="#none">ON</a>
 										<a href="#none">OFF</a>
 									</div>
 								</div>
Add a comment
List