이메일,휴대폰인증 수정

src/main/java/nlib/user/web/MemberController.java

@@ -157,32 +157,6 @@ public class MemberController extends NlibCommonController{
 	@Autowired
     private EmailSender emailSender;
 	
-	public ModelMap certificateMember(HttpServletRequest req)  {
-		return null;
-	}
-	public ModelMap sendEmailForMemberJoining(HttpServletRequest req)  {
-		return null;
-	}
-	public ModelMap changePassword(HttpServletRequest req)  {
-		return null;
-	}
-
-	public ModelMap selectMemberInfo(HttpServletRequest req)  {
-		return null;
-	}
-
-	public ModelMap updateMemberInfoForm(HttpServletRequest req)  {
-		return null;
-	}
-
-	public ModelMap updateMemberInfo(HttpServletRequest req)  {
-		return null;
-	}
-
-	public ModelMap leaveMember(HttpServletRequest req)  {
-		return null;
-	}
-	
 	/**
 	 * 약관 동의화면
 	 * @param req
@@ -397,7 +371,7 @@ 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 )
+		if(oauthUser != null)
 		{
 			//핸드폰인증시 sns제공 번호와 회원가입폼 번호 비교
 			if(!(vo.getMobileNo().equals(oauthUser.getSnsMobileNo())))
@@ -410,7 +384,8 @@ public class MemberController extends NlibCommonController{
 				}
 				
 				if( !(vo.getMobileVrfctNo().equals(oauthUser.getNlibVO().getMobileVrfctNo()))
-						||oauthUser.getNlibVO().getMobileVrfctDd() == null)  
+					|| !(vo.getMobileNo().equals(oauthUser.getNlibVO().getMobileNo()))
+					|| oauthUser.getNlibVO().getMobileVrfctDd() == null)  
 				{
 					model.addAttribute("msg","핸드폰인증이 정상적이지않습니다. 다시 회원가입을 진행해주세요.");
 					model.addAttribute("url",NlibProperty.getString("member.new.url"));
@@ -427,6 +402,7 @@ public class MemberController extends NlibCommonController{
 					return "nlib/cmm/alert";
 				}
 				if(!(vo.getEmailVrfctNo().equals(oauthUser.getNlibVO().getEmailVrfctNo()))
+					|| !(vo.getEmail().equals(oauthUser.getNlibVO().getEmail()))
 					||oauthUser.getNlibVO().getEmailVrfctDd() == null)  
 				{
 					model.addAttribute("msg","이메일인증이 정상적이지않습니다. 다시 회원가입을 진행해주세요.");