diff --git a/src/main/java/nlib/user/web/MemberController.java b/src/main/java/nlib/user/web/MemberController.java index bae3a59d..8baa959f 100644 --- a/src/main/java/nlib/user/web/MemberController.java +++ b/src/main/java/nlib/user/web/MemberController.java @@ -113,6 +113,7 @@ public class MemberController extends NlibCommonController{ @Resource(name = "emailUtil") private EmailUtil emailUtil; + /* 이메일 메시지 및 템플릿 정보 */ //템플릿 파일경로 @Value("#{properties['mailing.sender.membership.signUpTemplate']}") @@ -413,7 +414,7 @@ public class MemberController extends NlibCommonController{ replaceContents.put("${councilNm}", councilNm); replaceContents.put("${hostName}", hostName); replaceContents.put("${time}", time); - emailUtil.sendEmail(vo.getEmail(),"온라인자료대출시스템 회원가입을 축하드립니다.",replaceContents,signUpTemplate); + emailUtil.sendEmail(vo.getEmail(),senderName +" 회원가입을 축하드립니다.",replaceContents,signUpTemplate); model.addAttribute("result",vo); return "nlib/member/insertMemberInfoResult"; @@ -498,7 +499,7 @@ public class MemberController extends NlibCommonController{ replaceContents.put("${councilNm}", councilNm); replaceContents.put("${name}", StringUtil.getString(loginVO.getName(),"")); - String result = emailUtil.sendEmail(email,"온라인자료대출시스템 이메일 인증번호입니다.",replaceContents,certTemplate); + String result = emailUtil.sendEmail(email,senderName +" 이메일 인증번호입니다.",replaceContents,certTemplate); if(result == "templateFail") { @@ -719,10 +720,10 @@ public class MemberController extends NlibCommonController{ * 비밀번호초기화 폼 * @exception Exception */ - @RequestMapping(value="/member/initPasswordForm.do") + @RequestMapping(value="/member/initPasswordFormPopup.do") public String searchIdForm(NlibLoginVO vo,HttpServletResponse response,HttpServletRequest request,ModelMap model) throws Exception{ model.addAttribute("loginVO", vo); - return "nlib/member/initPasswordForm"; + return "nlib/member/initPasswordFormPopup"; } /** @@ -792,7 +793,7 @@ public class MemberController extends NlibCommonController{ replaceContents.put("${hostName}", hostName); replaceContents.put("${councilNm}", councilNm); replaceContents.put("${name}", name); - message = emailUtil.sendEmail(email,"온라인자료대출시스템 비밀번호 초기화 메일입니다.",replaceContents,pwdTemplate); + message = emailUtil.sendEmail(email, senderName +" 비밀번호 초기화 안내메일입니다.",replaceContents,pwdTemplate); }else { message="fail"; } diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties index 36725dc9..578c3b31 100644 --- a/src/main/resources/nlib/nlib.properties +++ b/src/main/resources/nlib/nlib.properties @@ -116,7 +116,7 @@ host.name = https://nlib-dev.nculture.org mailing.sender.membership.email = no-reply@nlib.org #\uba54\uc77c \ubcf4\ub0b4\ub294\uc0ac\ub78c \uc774\ub984 -mailing.sender.membership.name = Nlib +mailing.sender.membership.name = [\ud55c\uad6d\ubb38\ud654\uc6d0\uc5f0\ud569\ud68c] #SMS \ubcf4\ub0b4\ub294\uc0ac\ub78c \ubc88\ud638 sms.sender.phone.number = 027042322 diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp index 7a43b129..a4286493 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -437,7 +437,7 @@ function fn_search_article(pageIndex) {
-
+
썸네일 diff --git a/src/main/webapp/WEB-INF/jsp/nlib/member/initPasswordForm.jsp b/src/main/webapp/WEB-INF/jsp/nlib/member/initPasswordFormPopup.jsp similarity index 79% rename from src/main/webapp/WEB-INF/jsp/nlib/member/initPasswordForm.jsp rename to src/main/webapp/WEB-INF/jsp/nlib/member/initPasswordFormPopup.jsp index 763c96c0..5da68683 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/member/initPasswordForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/member/initPasswordFormPopup.jsp @@ -24,16 +24,6 @@ %> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> - <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%> - - - - -Insert title here - - -
- - - - -
+ + + + + +

내 정보

비밀번호 찾기

@@ -129,7 +117,6 @@ function fn_cancle()
+
- - - \ No newline at end of file + diff --git a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp index 0f63744d..f2df2fa1 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp @@ -46,6 +46,7 @@ $(document).ready(function() { //새비밀번호,새비밀번호확인이 일치하는지 확인 %> $("#newPassword,#newPasswordConfirm").on("propertychange change keyup paste", function() { + $("#passwdMatch").css("display",""); if($("#newPassword").val() == $("#newPasswordConfirm").val() && $("#newPassword").length > 0) { $("#passwdMatch").text("일치합니다."); @@ -57,6 +58,8 @@ $(document).ready(function() { //핸드폰 번호가 변하는것 실시간 감지 %> $("#mobileNo_1,#mobileNo_2,#mobileNo_3").on("propertychange change keyup paste input", function() { + console.log($("#userMobileNo").val()); + console.log($("#mobileNo_1").val()+ $("#mobileNo_2").val()+ $("#mobileNo_3").val()); if($("#userMobileNo").val() == $("#mobileNo_1").val()+ $("#mobileNo_2").val()+ $("#mobileNo_3").val()) { $("#mobileCertYn").val("Y"); @@ -102,7 +105,7 @@ $(document).ready(function() { $("#birth_mm").val(birth_mm).prop("selected", true); $("#birth_dd").val(birth_dd).prop("selected", true); - var MobileNo="${loginVO.mobileNo}"; + var MobileNo=''; if(!MobileNo == "") { @@ -542,6 +545,8 @@ function snsUnlink(snsId){ " > + " > + " >

회원정보

@@ -682,7 +687,7 @@ function snsUnlink(snsId){

- 일치합니다. +

9자리 이상, 숫자/문자/특수문자를 혼합하여 입력

diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 5fa46115..a86508bc 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -1105,50 +1105,5 @@
- - \ No newline at end of file diff --git a/src/main/webapp/js/nlib.js b/src/main/webapp/js/nlib.js index dc0ccc6d..1ebe77c4 100644 --- a/src/main/webapp/js/nlib.js +++ b/src/main/webapp/js/nlib.js @@ -93,12 +93,15 @@ function fn_closeLayerPopup() { $('html,body').removeClass('no-scroll'); } -function fn_myAlert(newAlertNum) { +function gfn_myAlert(newAlertNum) { if(newAlertNum == "undefined" || newAlertNum == null || newAlertNum < 1) { return; } + var alertShowed = gfn_getCookie("_NLIB_ALERT_DONE"); + if(!fn_isEmpty(alertShowed) && alertShowed == "Y") return; + var notiHtml = '
' + '

지방문화원 소장자료

' + @@ -109,7 +112,7 @@ function fn_myAlert(newAlertNum) { '

아직 확인하지 않은
새로운 알림이 ' + newAlertNum + '건 있습니다.

' + '
' + '
' + - ' ' + + ' ' + ' ' + '
' + ' ' + @@ -118,6 +121,32 @@ function fn_myAlert(newAlertNum) { fn_layerPopWithHtml(notiHtml, "pop-notice"); } +function gfn_closeMyAlert() { + gfn_setCookie("_NLIB_ALERT_DONE", "Y"); + fn_closeLayerPopup(); +} + +function gfn_setCookie(cookieName, cookieValue, cookieExpire, cookiePath, cookieDomain, cookieSecure){ + var cookieText = escape(cookieName) + '=' + escape(cookieValue); + cookieText += (cookieExpire ? '; EXPIRES='+cookieExpire.toGMTString() : ''); + cookieText += (cookiePath ? '; PATH='+cookiePath : ''); + cookieText += (cookieDomain ? '; DOMAIN='+cookieDomain : ''); + cookieText += (cookieSecure ? '; SECURE' : ''); + document.cookie=cookieText; +} + +function gfn_getCookie(cookieName){ + var cookieValue=null; + if(document.cookie){ + var array=document.cookie.split((escape(cookieName)+'=')); + if(array.length >= 2){ + var arraySub=array[1].split(';'); + cookieValue=unescape(arraySub[0]); + } + } + return cookieValue; +} + function fn_layerPopWithHtml(cHtml, addClasses) { $("#NLIB_LAYER_POPUP").removeClass(); $("#NLIB_LAYER_POPUP").addClass(addClasses);