From 80cec22e652eb97cd24a9a00d5277810d001f554 Mon Sep 17 00:00:00 2001
From: JSYOO <JSYOO@DESKTOP-U1IONCV>
Date: Mon, 6 Dec 2021 17:13:26 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EB=A9=94=EC=9D=BC,=ED=9C=B4=EB=8C=80?=
 =?UTF-8?q?=ED=8F=B0=EC=9D=B8=EC=A6=9D=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  | 34 +++----------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/src/main/java/nlib/user/web/MemberController.java b/src/main/java/nlib/user/web/MemberController.java
index 1444919d..42660482 100644
--- a/src/main/java/nlib/user/web/MemberController.java
+++ b/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,7 +402,8 @@ public class MemberController extends NlibCommonController{
 					return "nlib/cmm/alert";
 				}
 				if(!(vo.getEmailVrfctNo().equals(oauthUser.getNlibVO().getEmailVrfctNo()))
-						||oauthUser.getNlibVO().getEmailVrfctDd() == null)  
+					|| !(vo.getEmail().equals(oauthUser.getNlibVO().getEmail()))
+					||oauthUser.getNlibVO().getEmailVrfctDd() == null)  
 				{
 					model.addAttribute("msg","이메일인증이 정상적이지않습니다. 다시 회원가입을 진행해주세요.");
 					model.addAttribute("url",NlibProperty.getString("member.new.url"));