tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 5180_요금사용내역_및_결제내역

Browse Source
This commit is contained in:
JIWOO 2025-07-22 14:58:13 +09:00
commit 349f13ece7
6 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/itn/let/uat/uia/web/EgovMypageController.java
View File

@ -3906,20 +3906,29 @@ public class EgovMypageController {
//본인 명의만 번호 변경 가능하게
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);

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

@ -7,7 +7,7 @@
<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'}">
@ -18,7 +18,7 @@
<!--// 탭스타일 -->
<!-- 카카오 알림톡 미리보기 -->
<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>

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

@ -171,11 +171,11 @@ function fnRevDetailPop03(msgGroupId){
<!-- 카카오 알림톡 팝업 -->
<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>
@ -185,8 +185,8 @@ function fnRevDetailPop03(msgGroupId){
<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>

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

@ -241,7 +241,7 @@ function fnShowPdfPrintPopup(){
</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}" />" />

17
src/main/webapp/WEB-INF/jsp/web/user/mberSecureLogin.jsp
View File

@ -70,7 +70,7 @@ $(document).ready(function(){
} else {
$(this).find("a.on").removeClass("on").siblings("a").addClass("on");
$(this).removeClass("off").addClass("on");
callTo()
callTo();
}
}
@ -655,10 +655,10 @@ function 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('변경이 완료되었습니다.');
@ -675,6 +675,15 @@ function callTo() {
});
}
//자식창에서 호출
function callToTwo(msg, winRef) {
if (winRef) {
winRef.close();
}
alert(msg);
localtion.reload();
}
function fn_phonePopClean(){
console.log('ddd')

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

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