diff --git a/src/main/java/nlib/cmm/web/MainController.java b/src/main/java/nlib/cmm/web/MainController.java index 7215f8d4..c101896b 100644 --- a/src/main/java/nlib/cmm/web/MainController.java +++ b/src/main/java/nlib/cmm/web/MainController.java @@ -181,6 +181,8 @@ public class MainController extends NlibCommonController { model.addAttribute("cartCnt", cartCnt); model.addAttribute("unreadNotiCnt", unreadNotiCnt); model.addAttribute("docViewUrl", NlibProperty.getString("pdf.url")); + model.addAttribute("videoViewUrl", NlibProperty.getString("video.url")); + model.addAttribute("imageViewUrl", NlibProperty.getString("image.url")); return "nlib/cmm/headerSubPart"; } 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/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties index 96530c30..36725dc9 100644 --- a/src/main/resources/nlib/nlib.properties +++ b/src/main/resources/nlib/nlib.properties @@ -199,3 +199,15 @@ shorturl.api = https://local-dev.nculture.org/yourls-api.php?signature=d48a5ab90 pdf.url = https://port-dev.nculture.org/npdfView.do?npdf=I # \uac1c\ubc1c (\ucd94\ud6c4) #pdf.url = https://port-dev.nculture.org/npdfView.do?npdf=N + +# \uc6d0\ubb38\ubcf4\uae30 (IMAGE) +# \uac1c\ubc1c (\ud604\uc7ac) +image.url = https://port-dev.nculture.org/nImageView.do?nImage=I +# \uac1c\ubc1c (\ucd94\ud6c4) +#pdf.url = https://port-dev.nculture.org/npdfView.do?npdf=N + +# \uc6d0\ubb38\ubcf4\uae30 (VIDEO) +# \uac1c\ubc1c (\ud604\uc7ac) +video.url = https://port-dev.nculture.org/nvodView.do?nvod=I +# \uac1c\ubc1c (\ucd94\ud6c4) +#pdf.url = https://port-dev.nculture.org/npdfView.do?npdf=N diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp index 8a1822b7..f96ec1db 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp @@ -12,6 +12,8 @@ String councilNm = (String)session.getAttribute("councilNm");