From f267554d8f12d3997dc90cece417ec459b83108e Mon Sep 17 00:00:00 2001
From: JSYOO <JSYOO@DESKTOP-U1IONCV>
Date: Tue, 7 Dec 2021 14:21:55 +0900
Subject: [PATCH] =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=95=EC=8B=9C=20?=
 =?UTF-8?q?=EC=83=81=EB=8B=A8=EC=9C=BC=EB=A1=9C=20=EC=98=AC=EB=9D=BC?=
 =?UTF-8?q?=EA=B0=80=EB=8A=94=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EB=A9=94=EC=9D=BC=ED=8F=BC=20=EB=9D=BC=EC=9D=B8=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9=20=EB=84=A4=EC=9D=B4=EB=B2=84=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=9D=B8=EC=8B=9C=20=ED=9C=B4=EB=8C=80=ED=8F=B0=EB=B2=88?=
 =?UTF-8?q?=ED=98=B8=EA=B0=80=EC=A0=B8=EC=98=A4=EA=B8=B0=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ext/oauth/service/OAuthLogin.java     | 12 +++++++-
 .../jsp/nlib/member/insertMemberInfoForm.jsp  | 27 ++++++++++++++++-
 .../template/mail/signUp_mail_template.html   |  4 +--
 src/main/webapp/js/nlib.js                    | 30 +++++++++----------
 4 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/src/main/java/egovframework/com/ext/oauth/service/OAuthLogin.java b/src/main/java/egovframework/com/ext/oauth/service/OAuthLogin.java
index c2650af1..9ab2fd6b 100644
--- a/src/main/java/egovframework/com/ext/oauth/service/OAuthLogin.java
+++ b/src/main/java/egovframework/com/ext/oauth/service/OAuthLogin.java
@@ -138,7 +138,17 @@ public class OAuthLogin {
 			
 			// 성별 
 			if (resNode.has("gender")) {
-				StringUtil.getString(resNode.get("gender").asText(), "");
+				user.setSnsGender(StringUtil.getString(resNode.get("gender").asText(), ""));
+			}
+			
+			//휴대폰번호
+			if (resNode.has("mobile")) {
+				String mobile = StringUtil.getString(resNode.get("mobile").asText(), "");
+				if(mobile != "")
+				{
+					mobile = mobile.replaceAll("-", "");
+					user.setSnsMobileNo(mobile);
+				}
 			}
 			// 로그인 성공
 			user.setValidLogin(true);
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 707d816d..367d13a7 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp
@@ -34,8 +34,33 @@
 <script>
 $(document).ready(function() {
     fn_setPageTitle("${pageTitle}");
+    birthSelectbox();
 });
 
+function birthSelectbox(){
+    var now = new Date();
+    var year = now.getFullYear();
+    var mon = now.getMonth() + 1 > 9 ? "" + (now.getMonth() + 1) : "0" + (now.getMonth() + 1);
+    var day = now.getDate() > 9 ? "" + now.getDate() : "0" + now.getDate();
+    // 년도
+    for (var i = 1900; i <= year; i++) {
+        $("#birth_yy").append('<option value="' + i + '">' + i + "</option>");
+    }
+
+    // 월별
+    for (var i = 1; i <= 12; i++) {
+        var mm = i > 9 ? i : "0" + i;
+        $("#birth_mm").append('<option value="' + mm + '">' + mm + "</option>");
+    }
+
+    // 일별
+    for (var i = 1; i <= 31; i++) {
+        var dd = i > 9 ? i : "0" + i;
+        $("#birth_dd").append('<option value="' + dd + '">' + dd + "</option>");
+    }
+    
+}
+
 function signUp(){
     var flag = false;
     
@@ -110,7 +135,7 @@ function signUp(){
 	}
 	if(confirm("회원가입하시겠습니까?")){
 		$("#birthday").val($("#birth_yy").val()+$("#birth_mm").val()+$("#birth_dd").val());
-		$("#MobileNo").val($("#mobileNo_1").val()+$("#mobileNo_2").val()+$("#mobileNo_3").val());
+		$("#mobileNo").val($("#mobileNo_1").val()+$("#mobileNo_2").val()+$("#mobileNo_3").val());
 		
 		if($("input[name='mktRecvSmsYnChk']").is(":checked"))$("#mktRecvSmsYn").val("Y");
 		else $("#mktRecvSmsYn").val("N");
diff --git a/src/main/webapp/WEB-INF/template/mail/signUp_mail_template.html b/src/main/webapp/WEB-INF/template/mail/signUp_mail_template.html
index 567ae7b8..76e72db7 100644
--- a/src/main/webapp/WEB-INF/template/mail/signUp_mail_template.html
+++ b/src/main/webapp/WEB-INF/template/mail/signUp_mail_template.html
@@ -20,8 +20,8 @@
             <span style="display: inline-block;float:left;width:60%;background: #fff;padding:15px 5%;">${name}</span>
         </div>
         <div style="width:100%;display: inline-block;vertical-align: top;">
-            <span style="display: inline-block;float:left;width:20%;background: #f0f4f8;padding:15px 5%;font-weight:bold;">메일</span>
-            <span style="display: inline-block;float:left;width:60%;background: #fff;padding:15px 5%;">${email}</span>
+            <span style="display: inline-block;float:left;width:20%;background: #f0f4f8;padding:15px 5%;font-weight:bold;border-bottom:1px solid #ddd;">메일</span>
+            <span style="display: inline-block;float:left;width:60%;background: #fff;padding:15px 5%;border-bottom:1px solid #ddd;">${email}</span>
         </div>
         <div style="width:100%;border-bottom:1px solid #ddd;display: inline-block;vertical-align: top;">
             <span style="display: inline-block;float:left;width:20%;background: #f0f4f8;padding:15px 5%;font-weight:bold;">임시 비밀번호</span>
diff --git a/src/main/webapp/js/nlib.js b/src/main/webapp/js/nlib.js
index f435434d..09d75d92 100644
--- a/src/main/webapp/js/nlib.js
+++ b/src/main/webapp/js/nlib.js
@@ -335,36 +335,36 @@ function gfn_makePaging(fnName,pageIndex, totRecordCount, startPage, endPage, la
 	{
 		
 		if(pageIndex != 1 ){
-			html+="<li class=\"btn btn-first\"><a href=\"#\" onclick=\"" + fnName + "(1); return false;\" title=\"처음으로\">처음으로</a></li> "
-			html+="<li class=\"btn btn-prev\"><a href=\"#\" onclick=\"" + fnName + "("+ (pageIndex*1 -1) +"); return false;\" title=\"이전\">이전</a></li>";
+			html+="<li class=\"btn btn-first\"><a href=\"javascript:void(0)\" onclick=\"" + fnName + "(1); return false;\" title=\"처음으로\">처음으로</a></li> "
+			html+="<li class=\"btn btn-prev\"><a href=\"javascript:void(0)\" onclick=\"" + fnName + "("+ (pageIndex*1 -1) +"); return false;\" title=\"이전\">이전</a></li>";
 		}else{
-			html+="<li class=\"btn btn-first\"><a href=\"#\" title=\"처음으로\">처음으로</a></li> "
-			html+="<li class=\"btn btn-prev\"><a href=\"#\" title=\"이전\">이전</a></li>";
+			html+="<li class=\"btn btn-first\"><a href=\"javascript:void(0)\" title=\"처음으로\">처음으로</a></li> "
+			html+="<li class=\"btn btn-prev\"><a href=\"javascript:void(0)\" title=\"이전\">이전</a></li>";
 		}
 		
 		for(startPage; startPage <= endPage; startPage++ )
 		{
 			if(startPage != pageIndex)
 			{
-				html+= "<li><a href=\"#\" onclick=\"" + fnName + "("+ startPage +"); return false;\" title=\""+startPage+"페이지\">" + startPage + "</a></li>"
+				html+= "<li><a href=\"javascript:void(0)\" onclick=\"" + fnName + "("+ startPage +"); return false;\" title=\""+startPage+"페이지\">" + startPage + "</a></li>"
 			}else{
-				html+= "<li class=\"on\"><a href=\"#\" title=\"현재위치 페이지\">"+ startPage +"</a></li>"
+				html+= "<li class=\"on\"><a href=\"javascript:void(0)\" title=\"현재위치 페이지\">"+ startPage +"</a></li>"
 			}
 		}
 		
 		if(pageIndex != lastPage){
-			html+="<li class=\"btn btn-next\"><a href=\"#\" onclick=\"" + fnName + "("+ (pageIndex*1 +1) +"); return false;\" title=\"다음\">다음</a></li>"
-			html+="<li class=\"btn btn-last\"><a href=\"#\" onclick=\"" + fnName + "("+ lastPage +"); return false;\" title=\"맨끝으로\">맨끝으로</a></li>";
+			html+="<li class=\"btn btn-next\"><a href=\"javascript:void(0)\" onclick=\"" + fnName + "("+ (pageIndex*1 +1) +"); return false;\" title=\"다음\">다음</a></li>"
+			html+="<li class=\"btn btn-last\"><a href=\"javascript:void(0)\" onclick=\"" + fnName + "("+ lastPage +"); return false;\" title=\"맨끝으로\">맨끝으로</a></li>";
 		}else{
-			html+="<li class=\"btn btn-next\"><a href=\"#\" title=\"다음\">다음</a></li>"
-			html+="<li class=\"btn btn-last\"><a href=\"#\" title=\"맨끝으로\">맨끝으로</a></li>";
+			html+="<li class=\"btn btn-next\"><a href=\"javascript:void(0)\" title=\"다음\">다음</a></li>"
+			html+="<li class=\"btn btn-last\"><a href=\"javascript:void(0)\" title=\"맨끝으로\">맨끝으로</a></li>";
 		}
 	}else{
-		html+="<li class=\"btn btn-first\"><a href=\"#\" title=\"처음으로\">처음으로</a></li> "
-		html+="<li class=\"btn btn-prev\"><a href=\"#\" title=\"이전\">이전</a></li>"
-		html+="<li class=\"on\"><a href=\"#\" title=\"현재위치 페이지\">"+ startPage +"</a></li>"
-		html+="<li class=\"btn btn-next\"><a href=\"#\" title=\"다음\">다음</a></li>"
-		html+="<li class=\"btn btn-last\"><a href=\"#\" title=\"맨끝으로\">맨끝으로</a></li>";
+		html+="<li class=\"btn btn-first\"><a href=\"javascript:void(0)\" title=\"처음으로\">처음으로</a></li> "
+		html+="<li class=\"btn btn-prev\"><a href=\"javascript:void(0)\" title=\"이전\">이전</a></li>"
+		html+="<li class=\"on\"><a href=\"javascript:void(0)\" title=\"현재위치 페이지\">"+ startPage +"</a></li>"
+		html+="<li class=\"btn btn-next\"><a href=\"javascript:void(0)\" title=\"다음\">다음</a></li>"
+		html+="<li class=\"btn btn-last\"><a href=\"javascript:void(0)\" title=\"맨끝으로\">맨끝으로</a></li>";
 	}