From 40062f8bd1712788a29c30255d62469590c8021f Mon Sep 17 00:00:00 2001 From: JSYOO Date: Mon, 6 Dec 2021 15:48:55 +0900 Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=ED=83=88=ED=87=B4=EC=8B=9C?= =?UTF-8?q?=20=EB=8C=80=EC=B6=9C=EC=A4=91=20=EB=98=90=EB=8A=94=20=EC=97=B0?= =?UTF-8?q?=EC=B2=B4=20=EA=B1=B4=EC=88=98=EA=B0=80=20=EC=9E=88=EC=9D=84?= =?UTF-8?q?=EC=8B=9C=20=ED=83=88=ED=87=B4=EB=B6=88=EA=B0=80(=ED=83=88?= =?UTF-8?q?=ED=87=B4=EC=8B=9C=20sns=EB=8D=B0=EC=9D=B4=ED=84=B0=EB=8F=84=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0)=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20?= =?UTF-8?q?=EC=A1=B0=EC=9E=91=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=EC=A6=9D?= =?UTF-8?q?=EC=97=86=EC=9D=B4=20=EA=B0=80=EC=9E=85=EA=B0=80=EB=8A=A5?= =?UTF-8?q?=ED=95=9C=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nlib/user/web/MemberController.java | 44 ++++++++++++++----- .../nlib/user/web/UserInfoController.java | 2 +- .../mapper/nlib/user/MemberDAO_SQL.xml | 17 +++++-- .../mapper/nlib/user/UserInfoDAO_SQL.xml | 10 ++++- .../jsp/nlib/member/deleteMembershipForm.jsp | 2 +- .../jsp/nlib/member/insertMemberInfoForm.jsp | 42 ------------------ 6 files changed, 58 insertions(+), 59 deletions(-) diff --git a/src/main/java/nlib/user/web/MemberController.java b/src/main/java/nlib/user/web/MemberController.java index 15a2d2a3..1444919d 100644 --- a/src/main/java/nlib/user/web/MemberController.java +++ b/src/main/java/nlib/user/web/MemberController.java @@ -234,7 +234,7 @@ public class MemberController extends NlibCommonController{ if(oauthUser == null) { model.addAttribute("msg","SNS인증이 정상적이지않습니다. 다시 회원가입을 진행해주세요."); - model.addAttribute("url","${pageContext.request.contextPath}"+NlibProperty.getString("member.new.url")); + model.addAttribute("url",NlibProperty.getString("member.new.url")); return "nlib/cmm/alert"; } // 등록된 ID가 있는 지 확인 @@ -300,7 +300,7 @@ public class MemberController extends NlibCommonController{ if(oauthUser == null) { model.addAttribute("msg","SNS인증이 정상적이지않습니다. 다시 회원가입을 진행해주세요."); - model.addAttribute("url","${pageContext.request.contextPath}"+NlibProperty.getString("member.new.url")); + model.addAttribute("url",NlibProperty.getString("member.new.url")); return "nlib/cmm/alert"; } @@ -346,7 +346,7 @@ public class MemberController extends NlibCommonController{ if(oauthUser == null) { model.addAttribute("msg","SNS인증이 정상적이지않습니다. 다시 회원가입을 진행해주세요."); - model.addAttribute("url","${pageContext.request.contextPath}"+NlibProperty.getString("member.new.url")); + model.addAttribute("url",NlibProperty.getString("member.new.url")); return "nlib/cmm/alert"; } @@ -377,7 +377,7 @@ public class MemberController extends NlibCommonController{ if(oauthUser == null) { model.addAttribute("msg","SNS인증이 정상적이지않습니다. 다시 회원가입을 진행해주세요."); - model.addAttribute("url","${pageContext.request.contextPath}"+NlibProperty.getString("member.new.url")); + model.addAttribute("url",NlibProperty.getString("member.new.url")); return "nlib/cmm/alert"; } @@ -397,36 +397,57 @@ public class MemberController extends NlibCommonController{ String councilHomeUrl=url.replaceAll(request.getRequestURI(), "") + request.getContextPath(); String jsessionId = session.getId(); OAuthUniversalUser oauthUser = SessionConfig.popNewMemberInfo(jsessionId); - if(oauthUser != null && oauthUser.getNlibVO() != null) + if(oauthUser != null ) { //핸드폰인증시 sns제공 번호와 회원가입폼 번호 비교 if(!(vo.getMobileNo().equals(oauthUser.getSnsMobileNo()))) { - if(!(vo.getMobileVrfctNo().equals(oauthUser.getNlibVO().getMobileVrfctNo())) + if(oauthUser.getNlibVO() == null) + { + model.addAttribute("msg","핸드폰인증이 정상적이지않습니다. 다시 회원가입을 진행해주세요."); + model.addAttribute("url",NlibProperty.getString("member.new.url")); + return "nlib/cmm/alert"; + } + + if( !(vo.getMobileVrfctNo().equals(oauthUser.getNlibVO().getMobileVrfctNo())) ||oauthUser.getNlibVO().getMobileVrfctDd() == null) { model.addAttribute("msg","핸드폰인증이 정상적이지않습니다. 다시 회원가입을 진행해주세요."); - model.addAttribute("url","${pageContext.request.contextPath}"+NlibProperty.getString("member.new.url")); + model.addAttribute("url",NlibProperty.getString("member.new.url")); return "nlib/cmm/alert"; } } //이메일인증시 sns제공 이메일과 회원가입폼 이메일 비교 if(!(vo.getEmail().equals(oauthUser.getSnsUserId()))) { + if(oauthUser.getNlibVO() == null) + { + model.addAttribute("msg","이메일인증이 정상적이지않습니다. 다시 회원가입을 진행해주세요."); + model.addAttribute("url",NlibProperty.getString("member.new.url")); + return "nlib/cmm/alert"; + } if(!(vo.getEmailVrfctNo().equals(oauthUser.getNlibVO().getEmailVrfctNo())) ||oauthUser.getNlibVO().getEmailVrfctDd() == null) { model.addAttribute("msg","이메일인증이 정상적이지않습니다. 다시 회원가입을 진행해주세요."); - model.addAttribute("url","${pageContext.request.contextPath}"+NlibProperty.getString("member.new.url")); + model.addAttribute("url",NlibProperty.getString("member.new.url")); return "nlib/cmm/alert"; } } + }else { + model.addAttribute("msg","잘못된 접근입니다. \\n장시간 대기로 다시 회원가입을 진행해주세요."); + model.addAttribute("url",NlibProperty.getString("member.new.url")); + return "nlib/cmm/alert"; } //문화원코드 String councilNm = (String)session.getAttribute("councilNm"); //클라이언트 IP주소 vo.setIp(getRemoteIP(request)); + //초기비밀번호 + String initPwd = memberService.createInitPwd(); + vo.setPassword(initPwd); + //회원정보 insert memberService.insertMemberInfo(vo); @@ -454,6 +475,7 @@ public class MemberController extends NlibCommonController{ replaceContents.put("${councilNm}", councilNm); replaceContents.put("${hostName}", hostName); replaceContents.put("${time}", time); + replaceContents.put("${password}", initPwd); emailUtil.sendEmail(vo.getEmail(),senderName +" 회원가입을 축하드립니다.",replaceContents,signUpTemplate); return "redirect:" + redirectUrl; @@ -475,7 +497,7 @@ public class MemberController extends NlibCommonController{ NlibLoginVO loginVO = getNlibLoginVO(authentication); if(loginVO == null) { model.addAttribute("msg","잘못된 접근입니다. \n다시 로그인 하신 후, 이용해 주시기 바랍니다."); - model.addAttribute("url","${pageContext.request.contextPath}"+"/"); + model.addAttribute("url","/"); return "nlib/cmm/alert"; } model.addAttribute("result",loginVO); @@ -748,7 +770,7 @@ public class MemberController extends NlibCommonController{ NlibLoginVO loginVO = getNlibLoginVO(authentication); if(loginVO == null) { model.addAttribute("msg","잘못된 접근입니다. \n장시간 대기로 다시 로그인 하신 후, 이용해 주시기 바랍니다."); - model.addAttribute("url","${pageContext.request.contextPath}"+"/"); + model.addAttribute("url","/"); return "nlib/cmm/alert"; } loginVO.setJoinCouncilCd(getCurCouncilCd(request)); @@ -773,7 +795,7 @@ public class MemberController extends NlibCommonController{ if(loginVO == null) { model.addAttribute("msg","잘못된 접근입니다. \\n장시간 대기로 다시 로그인 하신 후, 이용해 주시기 바랍니다."); - model.addAttribute("url","${pageContext.request.contextPath}"+"/"); + model.addAttribute("url","/"); return "nlib/cmm/alert"; } diff --git a/src/main/java/nlib/user/web/UserInfoController.java b/src/main/java/nlib/user/web/UserInfoController.java index d8eb2290..34b35a73 100644 --- a/src/main/java/nlib/user/web/UserInfoController.java +++ b/src/main/java/nlib/user/web/UserInfoController.java @@ -223,7 +223,7 @@ public class UserInfoController extends NlibCommonController { if(loginVO == null) { model.addAttribute("msg","잘못된 접근입니다. \\n장시간 대기로 다시 로그인 하신 후, 이용해 주시기 바랍니다."); - model.addAttribute("url","${pageContext.request.contextPath}"+"/"); + model.addAttribute("url","/"); return "nlib/cmm/alert"; } diff --git a/src/main/resources/egovframework/mapper/nlib/user/MemberDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/user/MemberDAO_SQL.xml index f9e5ed7d..2fd29815 100644 --- a/src/main/resources/egovframework/mapper/nlib/user/MemberDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/user/MemberDAO_SQL.xml @@ -23,9 +23,18 @@ - - SELECT CONCAT(LEFT(MAX(MB_INFO_ID),2), - LPAD(RIGHT(MAX(MB_INFO_ID),9)+1,9,0)) AS mbInfoId FROM MB_INFO; + + SELECT + CONCAT(LEFT(MAX(MB_INFO_ID),2),LPAD(RIGHT(MAX(MB_INFO_ID),9)+1,9,0)) AS mbInfoId + ,( + SELECT + CAST(MAX(MB_NO)+1 AS CHAR(6)) + FROM + MB_INFO + WHERE MB_NO LIKE CONCAT(DATE_FORMAT(NOW(),'%y'),'%') + ) AS mbNo + FROM + MB_INFO; INSERT INTO MB_INFO @@ -55,6 +64,7 @@ ,INFO_RECV_SMS_YN ,MKT_RECV_EMAIL_YN ,MKT_RECV_SMS_YN + ,MB_NO ) VALUES ( @@ -83,6 +93,7 @@ ,#{infoRecvSmsYn} ,#{mktRecvEmailYn} ,#{mktRecvSmsYn} + ,IFNULL(#{mbNo},CONCAT(DATE_FORMAT(NOW(),'%y'),'0001')) ) diff --git a/src/main/resources/egovframework/mapper/nlib/user/UserInfoDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/user/UserInfoDAO_SQL.xml index aece829b..cd797b75 100644 --- a/src/main/resources/egovframework/mapper/nlib/user/UserInfoDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/user/UserInfoDAO_SQL.xml @@ -96,7 +96,15 @@ UPDATE MB_SNS SET - UNLINK_DD=NOW() + UNLINK_DD = NOW() + ,SNS_ID = '-' + ,SNS_NAME = NULL + ,SNS_NICK_NAME = NULL + ,SNS_USER_ID = NULL + ,SNS_GENDER = NULL + ,SNS_BIRTHDAY = NULL + ,SNS_EMAIL = NULL + ,SNS_MOBILE_NO = NULL WHERE 1=1 AND MB_SNS_ID = #{mbSnsId}; diff --git a/src/main/webapp/WEB-INF/jsp/nlib/member/deleteMembershipForm.jsp b/src/main/webapp/WEB-INF/jsp/nlib/member/deleteMembershipForm.jsp index b2a185e2..4cefb56d 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/member/deleteMembershipForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/member/deleteMembershipForm.jsp @@ -49,7 +49,7 @@ function deleteMembership() } else if(result=="delete") { - alert("탈퇴처리 되었습니다.감사합니다."); + alert("탈퇴처리 되었습니다. 감사합니다."); location.href="${pageContext.request.contextPath}/logout"; }else if(result=="mismatch") { diff --git a/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp b/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp index 93a62294..a65b6cf5 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp @@ -37,12 +37,6 @@ $(document).ready(function() { }); function signUp(){ - <%//패스워드 정규식 9자이상 소문자, 숫자 ,특수문자%> - var regExp = /^(?=.*[a-z])(?=.*\d)(?=.*[$@$!%*#?&])[A-Za-z\d$@$!%*#?&]{9,}$/i; - - var p = document.getElementById('password'); - var p_cf = document.getElementById('passwordConfirm'); - var flag = false; if($("#name").val() == "") @@ -108,17 +102,6 @@ function signUp(){ alert("주소를 입력해주세요."); return false; } - if(!regExp.test(p.value)){ - p.focus(); - alert("9자리 이상, 숫자/문자/특수문자를 혼합하여 입력해주세요."); - return false; - } - if(p.value != p_cf.value) - { - p_cf.focus(); - alert("비밀번호가 일치하지 않습니다. 확인해 주세요."); - return false; - } if($("#service-chk1").is(":checked") == false) { $("#service-chk1").focus(); @@ -236,19 +219,6 @@ $(document).ready(function() { $("#emailCertSendBtn").attr("disabled", false); } }); - <% - //비밀번호가 변하는것 실시간 감지 - %> - $("#password,#passwordConfirm").on("propertychange change keyup paste input", function() { - if($("#password").val() == $("#passwordConfirm").val()) - { - $("#pwdSuc").css("display","inline-block"); - $("#pwdFail").css("display","none"); - }else{ - $("#pwdSuc").css("display","none"); - $("#pwdFail").css("display","inline-block"); - } - }); }) <% @@ -678,18 +648,6 @@ function fn_cancel(){ -
- -
- - 9자리 이상, 숫자/문자/특수문자를 혼합하여 입력 - - 일치합니다. - 일치하지 않습니다. - - 입력하신 비밀번호는 ‘계정 연결’, ‘내 정보 확인’, ‘회원탈퇴’ 시, 회원님의 정보보호 및 본인확인을 위해 사용됩니다. -
-
-

서비스 알림 수신 동의