somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

계정통합페이지 수정중

Browse Source
This commit is contained in:
JSYOO 2021-11-16 11:06:07 +09:00
parent a7a20b8cd6
commit 1d02d53e5d
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/nlib/user/web/MemberController.java
View File

@ -239,7 +239,7 @@ public class MemberController extends NlibCommonController{
vo.setEmail(StringUtil.maskEmail(ariaCrypto.decode(vo.getEmail()))); vo.setEmail(StringUtil.maskEmail(ariaCrypto.decode(vo.getEmail())));
vo.setName(StringUtil.maskName(vo.getName())); vo.setName(StringUtil.maskName(vo.getName()));
oauthUser.setSnsUserId(StringUtil.maskEmail(oauthUser.getSnsUserId())); oauthUser.setSnsUserId(StringUtil.maskEmail(oauthUser.getSnsUserId()));
model.addAttribute("NlibLoginVO",vo); model.addAttribute("result",vo);
model.addAttribute("oauthUser",oauthUser); model.addAttribute("oauthUser",oauthUser);
//통합처리 url //통합처리 url
return "nlib/member/accountConsolidationForm"; return "nlib/member/accountConsolidationForm";
@ -341,7 +341,11 @@ public class MemberController extends NlibCommonController{
loginVO.setEmail(StringUtil.maskEmail(loginVO.getEmail())); loginVO.setEmail(StringUtil.maskEmail(loginVO.getEmail()));
loginVO.setName(StringUtil.maskName(loginVO.getName())); loginVO.setName(StringUtil.maskName(loginVO.getName()));
String jsessionId = session.getId();
OAuthUniversalUser oauthUser = SessionConfig.popNewMemberInfo(jsessionId);
model.addAttribute("result",loginVO); model.addAttribute("result",loginVO);
model.addAttribute("oauthUser",oauthUser);
return "/nlib/member/accountConsolidationForm"; return "/nlib/member/accountConsolidationForm";
} }
/** /**
@ -494,6 +498,7 @@ public class MemberController extends NlibCommonController{
replaceContents.put("${councilNm}", councilNm); replaceContents.put("${councilNm}", councilNm);
emailUtil.sendEmail(email,"온라인자료대출시스템 이메일 인증번호입니다.",replaceContents,certTemplate); emailUtil.sendEmail(email,"온라인자료대출시스템 이메일 인증번호입니다.",replaceContents,certTemplate);
map.put("msg","이메일 인증번호가 발송됐습니다."); map.put("msg","이메일 인증번호가 발송됐습니다.");
map.put("emailCertYn","Y"); map.put("emailCertYn","Y");
return map; return map;
@ -593,7 +598,7 @@ public class MemberController extends NlibCommonController{
smsVO.setCmid(UUID.getNlibCommonID("",32)); smsVO.setCmid(UUID.getNlibCommonID("",32));
smsVO.setDestPhone(mobileNo); smsVO.setDestPhone(mobileNo);
smsVO.setSendPhone(senderNumber); smsVO.setSendPhone(senderNumber);
smsVO.setMsgBody("인증번호는 " + CertNumber + " 입니다."); smsVO.setMsgBody("[한국문화원연합회] 본인확인 인증번호 [" + CertNumber + "]를 입력해주세요.");
//문자발송 솔루션 //문자발송 솔루션
memberService.sendSms(smsVO); memberService.sendSms(smsVO);
//------------ //------------

2
src/main/webapp/WEB-INF/jsp/nlib/member/accountConsolidationForm.jsp
View File

@ -61,7 +61,7 @@
<c:if test="${oauthUser.snsType eq 'GOOGLE'}">구글</c:if> <c:if test="${oauthUser.snsType eq 'GOOGLE'}">구글</c:if>
</span>계정이 통합되었습니다. </span>계정이 통합되었습니다.
</p> </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>
<div class="box"> <div class="box">
<div class="icon"> <div class="icon">

6
src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp
View File

@ -514,9 +514,9 @@ function calcAge(birth) {
<div class="form-group Userbirth"> <div class="form-group Userbirth">
<label>생년월일</label> <label>생년월일</label>
<div class="con"> <div class="con">
<select name="birth_yy" id="birth_yy"></select> 년 <select name="birth_yy" id="birth_yy"></select>
<select name="birth_mm" id="birth_mm"></select> 월 <select name="birth_mm" id="birth_mm"></select>
<select name="birth_dd" id="birth_dd"></select> 일 <select name="birth_dd" id="birth_dd"></select>
</div> </div>
</div> </div>