diff --git a/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java b/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java index 65fada18..84930df1 100644 --- a/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java +++ b/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java @@ -80,15 +80,8 @@ public class NlibSearchServiceImpl implements NlibSearchService{ searchVO.setListCount(Integer.toString(searchVO.getPageSize())); searchVO.setStartCount(Integer.toString(searchVO.getPageIndex())); - String collectionTemp=""; String nameTemp=""; - //----------------------------------- - // 입력값 검증작업 - //----------------------------------- - /*resVO = DataApiInterface.checkReqCommonParams(reqVO); - if(resVO != null) return resVO; - HttpMethod method = reqVO.getReqMethod();*/ //----------------------------------- // 폼 파라메터 생성 작업 및 요청 처리 diff --git a/src/main/java/nlib/user/web/UserInfoController.java b/src/main/java/nlib/user/web/UserInfoController.java index 695f8986..483be0fc 100644 --- a/src/main/java/nlib/user/web/UserInfoController.java +++ b/src/main/java/nlib/user/web/UserInfoController.java @@ -170,29 +170,36 @@ public class UserInfoController extends NlibCommonController { //사용자 정보를 가져온다. NlibLoginVO loginVO = getNlibLoginVO(authentication); - //이메일인증 확인 - if(!(vo.getEmail().equals(loginVO.getEmail()))) + if(loginVO != null) { - if(!(vo.getEmailVrfctNo().equals(loginVO.getEmailVrfctNo())) - ||loginVO.getEmailVrfctDd() == null) + //이메일인증 확인 + if(!(vo.getEmail().equals(loginVO.getEmail()))) { - model.addAttribute("msg","이메일인증이 정상적이지않습니다."); - model.addAttribute("url",myPageUri); - return "nlib/cmm/alert"; + if(!(vo.getEmailVrfctNo().equals(loginVO.getEmailVrfctNo())) + ||loginVO.getEmailVrfctDd() == null) + { + model.addAttribute("msg","이메일인증이 정상적이지않습니다."); + model.addAttribute("url",myPageUri); + return "nlib/cmm/alert"; + } + vo.setEmail(loginVO.getEmailTemp()); } - vo.setEmail(loginVO.getEmailTemp()); - } - //핸드폰인증 확인 - if(!(vo.getMobileNo().equals(loginVO.getMobileNo()))) - { - if(!(vo.getMobileVrfctNo().equals(loginVO.getMobileVrfctNo())) - ||loginVO.getMobileVrfctDd() == null) + //핸드폰인증 확인 + if(!(vo.getMobileNo().equals(loginVO.getMobileNo()))) { - model.addAttribute("msg","핸드폰인증이 정상적이지않습니다."); - model.addAttribute("url",myPageUri); - return "nlib/cmm/alert"; + if(!(vo.getMobileVrfctNo().equals(loginVO.getMobileVrfctNo())) + ||loginVO.getMobileVrfctDd() == null) + { + model.addAttribute("msg","핸드폰인증이 정상적이지않습니다."); + model.addAttribute("url",myPageUri); + return "nlib/cmm/alert"; + } + vo.setMobileNo(loginVO.getMobileTemp()); } - vo.setMobileNo(loginVO.getMobileTemp()); + }else { + model.addAttribute("msg","잘못된 접근입니다. \\n장시간 대기로 다시 로그인 진행해주세요."); + model.addAttribute("url","/"); + return "nlib/cmm/alert"; } String encodedText=null; diff --git a/src/main/resources/egovframework/spring/context-oauth.xml b/src/main/resources/egovframework/spring/context-oauth.xml index 3dc598f8..d9afd73f 100644 --- a/src/main/resources/egovframework/spring/context-oauth.xml +++ b/src/main/resources/egovframework/spring/context-oauth.xml @@ -4,12 +4,20 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"> - + + - + + + diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties index fcc72abd..ef7d5aa7 100644 --- a/src/main/resources/nlib/nlib.properties +++ b/src/main/resources/nlib/nlib.properties @@ -35,9 +35,14 @@ login.back.url = /login/loginGuide.do login.dormant.url = /login/activateDormantAccForm.do # \uc9c0\ubc29\ubb38\ud654\uc6d0\uc5d0\uc11c \uc811\uc18d\uc2dc \ub9ac\ub2e4\uc774\ub809\ud2b8\ub420 URL \uc815\ubcf4 -nculture.login.redirect.uri = /login/loginForm.do +nculture.login.redirect.uri = /login/loginForm.do + +# SNS\uc0ac\uc6a9\uc790 \uc778\uc99d \ubc0f \ucf5c\ubc31 \ucc98\ub9ac \ud6c4, \ud574\ub2f9 \uc9c0\ubc29\ubb38\ud654\uc6d0\uc73c\ub85c \uc774\ub3d9\ud558\uc5ec \ud6c4\ucc98\ub9ac\ub420 URL : \ub85c\uadf8\uc778\uc6a9 nculture.login.post.login.redirect.uri = /login/loginCouncilSSO.do + +# SNS\uc0ac\uc6a9\uc790 \uc778\uc99d \ubc0f \ucf5c\ubc31 \ucc98\ub9ac \ud6c4, \ud574\ub2f9 \uc9c0\ubc29\ubb38\ud654\uc6d0\uc73c\ub85c \uc774\ub3d9\ud558\uc5ec \ud6c4\ucc98\ub9ac\ub420 URL : \ud68c\uc6d0\uac00\uc785\uc6a9 nculture.login.post.member.redirect.uri = /member/selectMemberJoiningInfo.do + nculture.login.preset.redirect.url = https://nlib-dev.nculture.org/login/loginPreSet.do nculture.member.redirect.uri = /login/memberSnsForm.do diff --git a/src/main/webapp/WEB-INF/jsp/nlib/member/alreadySignUpPopup.jsp b/src/main/webapp/WEB-INF/jsp/nlib/member/alreadySignUpPopup.jsp index 54fd4eb5..5f5b211a 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/member/alreadySignUpPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/member/alreadySignUpPopup.jsp @@ -36,7 +36,10 @@ $(document).ready(function(){ if(cnt > 0) { gfn_showLayerPop(); } else { - window.close(); + if($("#linkType").val() == "signUp") + { + setTimeout(goSignUp, 100); + } } @@ -53,7 +56,7 @@ $(document).ready(function(){ function notMe() { - $("#alreadySignUpChk").val('Y'); + gfn_closeLayerPopup(); if($("#linkType").val() == "signUp") @@ -62,6 +65,10 @@ function notMe() } } +function closeBtn(){ + $("#alreadySignUpChk").val('N'); + gfn_closeLayerPopup(); +} function selectAccount(mbInfoId,name,email) { @@ -137,7 +144,7 @@ function accountLink()

아니요, 내가 아닙니다.

- +
@@ -169,7 +176,7 @@ function accountLink() - +
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 8c3d9831..8747c471 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp @@ -187,7 +187,7 @@ $(document).ready(function() { $("#birth_dd").val(birth_dd).prop("selected", true); } - var mobileNo="${loginVO.snsMobileNo}"; + var mobileNo=""; if(mobileNo != "") { $("#mobileNo").val(mobileNo); @@ -480,6 +480,7 @@ function checkBirthday() { function alreadySignUpChk(type){ $("#linkType").val(type); + $("#alreadySignUpChk").val("Y"); document.joinForm.action="${pageContext.request.contextPath}/member/selectAlreadySignUpMobilePopup.do"; gfn_layerPopFormSubmit("joinForm",false); }