From 1d02d53e5d6516fb675e4e3457454035dc63a7f3 Mon Sep 17 00:00:00 2001
From: JSYOO <JSYOO@DESKTOP-U1IONCV>
Date: Tue, 16 Nov 2021 11:06:07 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B3=84=EC=A0=95=ED=86=B5=ED=95=A9=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=88=98=EC=A0=95=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/nlib/user/web/MemberController.java        | 9 +++++++--
 .../WEB-INF/jsp/nlib/member/accountConsolidationForm.jsp | 2 +-
 .../WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp     | 6 +++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/nlib/user/web/MemberController.java b/src/main/java/nlib/user/web/MemberController.java
index 02f1fbab..f9c82891 100644
--- a/src/main/java/nlib/user/web/MemberController.java
+++ b/src/main/java/nlib/user/web/MemberController.java
@@ -239,7 +239,7 @@ public class MemberController extends NlibCommonController{
 			vo.setEmail(StringUtil.maskEmail(ariaCrypto.decode(vo.getEmail())));
 			vo.setName(StringUtil.maskName(vo.getName()));
 			oauthUser.setSnsUserId(StringUtil.maskEmail(oauthUser.getSnsUserId()));
-			model.addAttribute("NlibLoginVO",vo);
+			model.addAttribute("result",vo);
 			model.addAttribute("oauthUser",oauthUser);
 			//통합처리 url
 			return "nlib/member/accountConsolidationForm";
@@ -341,7 +341,11 @@ public class MemberController extends NlibCommonController{
 		loginVO.setEmail(StringUtil.maskEmail(loginVO.getEmail()));
 		loginVO.setName(StringUtil.maskName(loginVO.getName()));
 		
+		String jsessionId = session.getId();
+		OAuthUniversalUser oauthUser = SessionConfig.popNewMemberInfo(jsessionId);
+		
 		model.addAttribute("result",loginVO);
+		model.addAttribute("oauthUser",oauthUser);
 		return "/nlib/member/accountConsolidationForm";
 	}
 	/**
@@ -494,6 +498,7 @@ public class MemberController extends NlibCommonController{
 		replaceContents.put("${councilNm}", councilNm);
 		
 		emailUtil.sendEmail(email,"온라인자료대출시스템 이메일 인증번호입니다.",replaceContents,certTemplate);
+		
     	map.put("msg","이메일 인증번호가 발송됐습니다.");
     	map.put("emailCertYn","Y");
 		return map;
@@ -593,7 +598,7 @@ public class MemberController extends NlibCommonController{
 		smsVO.setCmid(UUID.getNlibCommonID("",32));
 		smsVO.setDestPhone(mobileNo);
 		smsVO.setSendPhone(senderNumber);
-		smsVO.setMsgBody("인증번호는 " + CertNumber + " 입니다.");
+		smsVO.setMsgBody("[한국문화원연합회] 본인확인 인증번호 [" + CertNumber + "]를 입력해주세요.");
 		//문자발송 솔루션
 		memberService.sendSms(smsVO);
 		//------------
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/member/accountConsolidationForm.jsp b/src/main/webapp/WEB-INF/jsp/nlib/member/accountConsolidationForm.jsp
index fd9f30eb..c6d3ad94 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/member/accountConsolidationForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/member/accountConsolidationForm.jsp
@@ -61,7 +61,7 @@
                                 <c:if test="${oauthUser.snsType eq 'GOOGLE'}">구글</c:if>
                              </span>계정이 통합되었습니다.
                             </p>
-                            <p><button type="button"><span class="name"><c:out value="${NlibLoginVO.name }"/></span><span class="mail"><c:out value="${NlibLoginVO.email }"/></span></button></p>
+                            <p><button type="button"><span class="name"><c:out value="${result.name }"/></span><span class="mail"><c:out value="${result.email }"/></span></button></p>
                         </div>
                         <div class="box">
                             <div class="icon">
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 f3bda09c..c1657100 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp
@@ -514,9 +514,9 @@ function calcAge(birth) {
                             <div class="form-group Userbirth">
                                 <label>생년월일</label>
                                 <div class="con">
-                                    <select name="birth_yy" id="birth_yy"></select> 년
-                                    <select name="birth_mm" id="birth_mm"></select> 월
-                                    <select name="birth_dd" id="birth_dd"></select> 일
+                                    <select name="birth_yy" id="birth_yy"></select>
+                                    <select name="birth_mm" id="birth_mm"></select>
+                                    <select name="birth_dd" id="birth_dd"></select>
                                 </div>
                             </div>