Commit @349f13ece785b5cfcaa587bf39456a728b3d25a7

0dc4539

349f13e

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


 		
 		
 		
+		//본인 명의만 번호 변경 가능하게
+		if(mblDn.equals(DI)) {
+			String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
+			MberManageVO mberManageVO = new MberManageVO();
+			mberManageVO.setSecuLoginFlag("N");
+			mberManageVO.setMberId(userId);
+			mberManageVO.setLastUpdusrId(userId);
+			mberManageService.updateSecureLoginFlag(mberManageVO);
+			
+			model.addAttribute("msg", "변경이 완료되었습니다.");
+		}else {
+			model.addAttribute("msg", "가입자 본인 명의의 휴대폰으로만 해제가 가능합니다.");
+		}
 		
 		return "web/user/securityAuthnPage";
 	}
 	
 	@RequestMapping(value="/web/user/mberSecureLoginAjax.do")
-	public ResponseEntity<?> mberSecureLoginAjax(MberManageVO mberManageVO, @RequestBody Map<String, String> params){
+	public ResponseEntity<?> mberSecureLoginAjax(MberManageVO mberManageVO){
 		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.setSecuLoginFlag("Y");
 		mberManageVO.setMberId(userId);
 		mberManageVO.setLastUpdusrId(userId);
 		

0dc4539

349f13e

src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPopAjax.jsp


 
 <div class="phone">
     <!-- 탭스타일 -->
-    <div class="list_tab_wrap2 type5">
+    <div class="list_tab_wrap2 type5 kakao_rev_tab">
         <ul class="tabType3" id="tabType" name="tabType">
             <li class="tab active"><button type="button" onclick="phoneTab(this,'1');" title="선택됨">카카오톡</button></li>
             <c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">

     <!--// 탭스타일 -->
 
     <!-- 카카오 알림톡 미리보기 -->
-    <div class="tab_phone current" id="tab_phone_1">
+    <div class="tab_phone current kakao_wrap" id="tab_phone_1">
         <div class="phone_kakako">
             <div class="phoneIn">
                 <p class="prev_p"><img src="/publish/images/content/kakao_prev_icon.png" alt=""><c:out value="${resultMsgDetail.yellowId}"/></p>

0dc4539

349f13e

src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp

--- src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp

+++ src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp


 
 <!-- 카카오 알림톡 팝업 -->
 <div class="tooltip-wrap">
-	<div class="popup-com adr_layer kakao_rev_popup rev_popup02" tabindex="0" data-tooltip-con="rev_popup02"
-		data-focus="rev_popup02" data-focus-prev="rev_popup02-close" style="width: 440px;">
+	<div class="popup-com adr_layer kakao_rev_popup allimTalk_detail_popup" tabindex="0" data-tooltip-con="allimTalk_detail_popup"
+		data-focus="allimTalk_detail_popup" data-focus-prev="allimTalk_detail_popup-close" style="width: 440px;">
 		<div class="popup_heading">
 			<p>카카오 내용</p>
-			<button type="button" class="tooltip-close" data-focus="rev_popup02-close">
+			<button type="button" class="tooltip-close" data-focus="allimTalk_detail_popup-close">
 				<img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기">
 			</button>
 		</div>

 			<div id="msgSentDetailPopLoad" >
 			</div>
 			<div class="popup_btn_wrap2" style="justify-content: center;">
-				<button type="button" class="tooltip-close" data-focus="rev_popup02-close"
-					data-focus-next="rev_popup02">닫기</button>
+				<button type="button" class="tooltip-close" data-focus="allimTalk_detail_popup-close"
+					data-focus-next="allimTalk_detail_popup">닫기</button>
 			</div>
 		</div>
 	</div>

0dc4539

349f13e

src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp


 
 </script>
 <input type="button" id="faxClick" data-tooltip="rev_popup03" style="display:none;"/>
-<input type="button" id="kakaoClick" data-tooltip="rev_popup02" style="display:none;"/>
+<input type="button" id="kakaoClick" data-tooltip="allimTalk_detail_popup" style="display:none;"/>
 <div class="pay_cont current" id="listTab2_1">
 	<input type="hidden" id="searchSortCnd" name="searchSortCnd" value="<c:out value="${searchVO.searchSortCnd}" />" />
 	<input type="hidden" id="searchSortOrd" name="searchSortOrd" value="<c:out value="${searchVO.searchSortOrd}" />" />

0dc4539

349f13e

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


 			} else {
 				$(this).find("a.on").removeClass("on").siblings("a").addClass("on");
 				$(this).removeClass("off").addClass("on");
-				callTo()
+				callTo();
 			}
 		}
 		

 	$.ajax({
         url: '/web/user/mberSecureLoginAjax.do',
         type: 'POST',
-        contentType: 'application/json',
-        data: JSON.stringify({
+        /*contentType: 'application/json',
+         data: JSON.stringify({
         	secuLoginFlag: '${mberManageVO.secuLoginFlag}'
-        }),
+        }), */
         success: function(response) {
 			if(response === 'success'){
 				alert('변경이 완료되었습니다.');

     });
 }
 
+//자식창에서 호출
+function callToTwo(msg, winRef) {
+	if (winRef) {
+        winRef.close();
+    }
+	alert(msg);
+	localtion.reload();
+}
+
 
 function fn_phonePopClean(){
 	console.log('ddd')

0dc4539

349f13e

src/main/webapp/WEB-INF/jsp/web/user/securityAuthnPage.jsp

--- src/main/webapp/WEB-INF/jsp/web/user/securityAuthnPage.jsp

+++ src/main/webapp/WEB-INF/jsp/web/user/securityAuthnPage.jsp


 		<meta name="robots" content="noindex">
 		
 		<script language=javascript>  
- 			opener.callTo();
- 			self.close();
+ 			/* opener.callToTwo('${msg}'); */
+ 			opener.callToTwo('${msg}', window);
+ 			/* self.close(); */
 		</script>
 	</head>
 	<body>

...	...	@@ -3906,20 +3906,29 @@
3906	3906
3907	3907
3908	3908
	3909	+ //본인 명의만 번호 변경 가능하게
	3910	+ if(mblDn.equals(DI)) {
	3911	+ String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
	3912	+ MberManageVO mberManageVO = new MberManageVO();
	3913	+ mberManageVO.setSecuLoginFlag("N");
	3914	+ mberManageVO.setMberId(userId);
	3915	+ mberManageVO.setLastUpdusrId(userId);
	3916	+ mberManageService.updateSecureLoginFlag(mberManageVO);
	3917	+
	3918	+ model.addAttribute("msg", "변경이 완료되었습니다.");
	3919	+ }else {
	3920	+ model.addAttribute("msg", "가입자 본인 명의의 휴대폰으로만 해제가 가능합니다.");
	3921	+ }
3909	3922
3910	3923	return "web/user/securityAuthnPage";
3911	3924	}
3912	3925
3913	3926	@RequestMapping(value="/web/user/mberSecureLoginAjax.do")
3914		- public ResponseEntity<?> mberSecureLoginAjax(MberManageVO mberManageVO, @RequestBody Map<String, String> params){
	3927	+ public ResponseEntity<?> mberSecureLoginAjax(MberManageVO mberManageVO){
3915	3928	LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
3916	3929	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
3917	3930
3918		- if("Y".equals(params.get("secuLoginFlag"))) {
3919		- mberManageVO.setSecuLoginFlag("N");
3920		- }else {
3921		- mberManageVO.setSecuLoginFlag("Y");
3922		- }
	3931	+ mberManageVO.setSecuLoginFlag("Y");
3923	3932	mberManageVO.setMberId(userId);
3924	3933	mberManageVO.setLastUpdusrId(userId);
3925	3934

...	...	@@ -7,7 +7,7 @@
7	7
8	8	<div class="phone">
9	9	<!-- 탭스타일 -->
10		- <div class="list_tab_wrap2 type5">
	10	+ <div class="list_tab_wrap2 type5 kakao_rev_tab">
11	11	<ul class="tabType3" id="tabType" name="tabType">
12	12	<li class="tab active"><button type="button" onclick="phoneTab(this,'1');" title="선택됨">카카오톡</button></li>
13	13	<c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}">
...	...	@@ -18,7 +18,7 @@
18	18	<!--// 탭스타일 -->
19	19
20	20	<!-- 카카오 알림톡 미리보기 -->
21		- <div class="tab_phone current" id="tab_phone_1">
	21	+ <div class="tab_phone current kakao_wrap" id="tab_phone_1">
22	22	<div class="phone_kakako">
23	23	<div class="phoneIn">
24	24	<p class="prev_p"><img src="/publish/images/content/kakao_prev_icon.png" alt=""><c:out value="${resultMsgDetail.yellowId}"/></p>

...	...	@@ -171,11 +171,11 @@
171	171
172	172	<!-- 카카오 알림톡 팝업 -->
173	173	<div class="tooltip-wrap">
174		- <div class="popup-com adr_layer kakao_rev_popup rev_popup02" tabindex="0" data-tooltip-con="rev_popup02"
175		- data-focus="rev_popup02" data-focus-prev="rev_popup02-close" style="width: 440px;">
	174	+ <div class="popup-com adr_layer kakao_rev_popup allimTalk_detail_popup" tabindex="0" data-tooltip-con="allimTalk_detail_popup"
	175	+ data-focus="allimTalk_detail_popup" data-focus-prev="allimTalk_detail_popup-close" style="width: 440px;">
176	176	<div class="popup_heading">
177	177	<p>카카오 내용</p>
178		- <button type="button" class="tooltip-close" data-focus="rev_popup02-close">
	178	+ <button type="button" class="tooltip-close" data-focus="allimTalk_detail_popup-close">
179	179	<img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기">
180	180	</button>
181	181	</div>
...	...	@@ -185,8 +185,8 @@
185	185	<div id="msgSentDetailPopLoad" >
186	186	</div>
187	187	<div class="popup_btn_wrap2" style="justify-content: center;">
188		- <button type="button" class="tooltip-close" data-focus="rev_popup02-close"
189		- data-focus-next="rev_popup02">닫기</button>
	188	+ <button type="button" class="tooltip-close" data-focus="allimTalk_detail_popup-close"
	189	+ data-focus-next="allimTalk_detail_popup">닫기</button>
190	190	</div>
191	191	</div>
192	192	</div>

...	...	@@ -241,7 +241,7 @@
241	241
242	242	</script>
243	243	<input type="button" id="faxClick" data-tooltip="rev_popup03" style="display:none;"/>
244		-<input type="button" id="kakaoClick" data-tooltip="rev_popup02" style="display:none;"/>
	244	+<input type="button" id="kakaoClick" data-tooltip="allimTalk_detail_popup" style="display:none;"/>
245	245	<div class="pay_cont current" id="listTab2_1">
246	246	<input type="hidden" id="searchSortCnd" name="searchSortCnd" value="<c:out value="${searchVO.searchSortCnd}" />" />
247	247	<input type="hidden" id="searchSortOrd" name="searchSortOrd" value="<c:out value="${searchVO.searchSortOrd}" />" />

...	...	@@ -70,7 +70,7 @@
70	70	} else {
71	71	$(this).find("a.on").removeClass("on").siblings("a").addClass("on");
72	72	$(this).removeClass("off").addClass("on");
73		- callTo()
	73	+ callTo();
74	74	}
75	75	}
76	76
...	...	@@ -655,10 +655,10 @@
655	655	$.ajax({
656	656	url: '/web/user/mberSecureLoginAjax.do',
657	657	type: 'POST',
658		- contentType: 'application/json',
659		- data: JSON.stringify({
	658	+ /*contentType: 'application/json',
	659	+ data: JSON.stringify({
660	660	secuLoginFlag: '${mberManageVO.secuLoginFlag}'
661		- }),
	661	+ }), */
662	662	success: function(response) {
663	663	if(response === 'success'){
664	664	alert('변경이 완료되었습니다.');
...	...	@@ -675,6 +675,15 @@
675	675	});
676	676	}
677	677
	678	+//자식창에서 호출
	679	+function callToTwo(msg, winRef) {
	680	+ if (winRef) {
	681	+ winRef.close();
	682	+ }
	683	+ alert(msg);
	684	+ localtion.reload();
	685	+}
	686	+
678	687
679	688	function fn_phonePopClean(){
680	689	console.log('ddd')

...	...	@@ -20,8 +20,9 @@
20	20	<meta name="robots" content="noindex">
21	21
22	22	<script language=javascript>
23		- opener.callTo();
24		- self.close();
	23	+ /* opener.callToTwo('${msg}'); */
	24	+ opener.callToTwo('${msg}', window);
	25	+ /* self.close(); */
25	26	</script>
26	27	</head>
27	28	<body>

Delete comment