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 @@ 구글 계정이 통합되었습니다.

-

+

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) {
- 년 - 월 - 일 + + +