From f059c970e848296bd30bffa0e964ab85948c6e34 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Mon, 29 Nov 2021 16:27:21 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=ED=98=84=EC=9E=AC=20=EC=84=9C=EB=B9=84?= =?UTF-8?q?=EC=8A=A4=20=EC=83=81=ED=83=9C=EB=AA=85=20=ED=95=A8=EC=88=98=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nlib/col/service/CollectionVO.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/main/java/nlib/col/service/CollectionVO.java b/src/main/java/nlib/col/service/CollectionVO.java index 071494fa..978bcb0d 100644 --- a/src/main/java/nlib/col/service/CollectionVO.java +++ b/src/main/java/nlib/col/service/CollectionVO.java @@ -284,6 +284,16 @@ public class CollectionVO extends PagingVO { return true; } + + /** + * 현재 대출(신청 또는 예약) 가능여부 상태명을 리턴한다. + * @return + */ + public String getAbleReadNowNm() { + if(isAbleReadNow()) return "신청가능"; + + return "신청불가"; + } /** * 현재 대출(신청 또는 예약) 가능여부를 리턴한다. @@ -292,6 +302,17 @@ public class CollectionVO extends PagingVO { public boolean isAbleRentNow() { return isAbleRentAppNow() || isAbleRentResNow(); } + + /** + * 현재 대출(신청 또는 예약) 가능여부 상태명을 리턴한다. + * @return + */ + public String getAbleRentNowNm() { + if(isAbleRentAppNow()) return "신청가능"; + else if(isAbleRentResNow()) return "예약가능"; + + return "신청/예약불가"; + } /** * 현재 대출 [신청] 가능여부를 리턴한다. From c08d78499a134e7ad58d40d4cfa9ef4db3c55626 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Mon, 29 Nov 2021 16:28:45 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=9B=B9=EC=A0=91=EA=B7=BC=EC=84=B1=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=EC=82=AC=ED=95=AD,=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=EA=B0=80=EC=9E=85=EC=8B=9C=20=EC=9E=90=EB=8F=99=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/nlib/user/web/MemberController.java | 31 ++++++++++++++++++- .../webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp | 13 ++++---- .../WEB-INF/jsp/nlib/bbs/selectQnaArticle.jsp | 4 +-- .../inform/selectNCultureLocationInfo.jsp | 10 +++--- .../nlib/member/insertMemberInfoResult.jsp | 11 +++++-- .../WEB-INF/jsp/nlib/rent/listRentItems.jsp | 2 +- 6 files changed, 53 insertions(+), 18 deletions(-) diff --git a/src/main/java/nlib/user/web/MemberController.java b/src/main/java/nlib/user/web/MemberController.java index 2493e97d..6f802bdf 100644 --- a/src/main/java/nlib/user/web/MemberController.java +++ b/src/main/java/nlib/user/web/MemberController.java @@ -377,7 +377,10 @@ public class MemberController extends NlibCommonController{ */ @RequestMapping(value="/member/insertMemberInfo.do") public String insertMemberInfo(NlibLoginVO vo,ModelMap model,HttpSession session,HttpServletRequest request) throws Exception{ + String redirectUrl=""; + String url = request.getRequestURL().toString(); + String councilHomeUrl=url.replaceAll(request.getRequestURI(), "") + request.getContextPath(); String jsessionId = session.getId(); OAuthUniversalUser oauthUser = SessionConfig.popNewMemberInfo(jsessionId); if(oauthUser != null && oauthUser.getNlibVO() != null) @@ -418,6 +421,10 @@ public class MemberController extends NlibCommonController{ memberService.insertMemberSns(oauthUser); + SessionConfig.setLoginInfo(jsessionId, oauthUser); + session.setAttribute("councilReturnUrl","/member/insertMemberInfoResult.do" );//로그인후 이동할페이지 + redirectUrl = councilHomeUrl + NlibProperty.getString("nculture.login.post.login.redirect.uri"); + // 결과가 정상이면, 안내 메일 발송 // > 템플릿파일에서 내용 mailing.sender.membership.signUpTemplate // > 발송처리 요청 @@ -435,7 +442,29 @@ public class MemberController extends NlibCommonController{ replaceContents.put("${time}", time); emailUtil.sendEmail(vo.getEmail(),senderName +" 회원가입을 축하드립니다.",replaceContents,signUpTemplate); - model.addAttribute("result",vo); + return "redirect:" + redirectUrl; + } + + + /** + * 회원가입 결과페이지 + * @param response + * @param authentication + * @param request + * @param session + * @return + * @throws Exception + */ + @RequestMapping(value="/member/insertMemberInfoResult.do") + public String insertMemberInfoResult(HttpServletResponse response,Authentication authentication,HttpServletRequest request,HttpSession session, ModelMap model) throws Exception{ + //사용자 정보를 가져온다. + NlibLoginVO loginVO = getNlibLoginVO(authentication); + if(loginVO == null) { + model.addAttribute("msg","잘못된 접근입니다. \n다시 로그인 하신 후, 이용해 주시기 바랍니다."); + model.addAttribute("url","${pageContext.request.contextPath}"+"/"); + return "nlib/cmm/alert"; + } + model.addAttribute("result",loginVO); return "nlib/member/insertMemberInfoResult"; } /** diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp index 45709682..1d144273 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp @@ -152,7 +152,7 @@ li.append($('').attr('class', 't-tit').html("" + obj.title + (obj.secretYn == "Y" ? '자물쇠 아이콘 ' : '') + - (obj.attachYn == "Y" ? '파일 아이콘' : '') + + (obj.attachYn == "Y" ? '파일' : '') + "")); li.append($('').attr('class', 't-writer').html(obj.regNm)); li.append($('').attr('class', 't-date').html(obj.regDd)); @@ -227,7 +227,7 @@
  • ${pageTitle }
    • -
    화살표 아이콘
    +
    @@ -250,19 +250,18 @@
    - +
    - -
    diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectQnaArticle.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectQnaArticle.jsp index 429d9016..53bcb0d7 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectQnaArticle.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/selectQnaArticle.jsp @@ -97,7 +97,7 @@ function fn_downloadFile(attachFileId, fileSn) {
  • ${pageTitle }
    • -
    화살표 아이콘
    +
    @@ -129,7 +129,7 @@ function fn_downloadFile(attachFileId, fileSn) { %>
    - 파일 아이콘 + 파일
    diff --git a/src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureLocationInfo.jsp b/src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureLocationInfo.jsp index 5e9f19f7..083d8fac 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureLocationInfo.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureLocationInfo.jsp @@ -53,7 +53,7 @@ $( document ).ready(function() {
  • 찾아오시는길
    • -
    화살표 아이콘
    +
    @@ -115,23 +115,23 @@ $( document ).ready(function() {
    -

    지도 아이콘

    +

    주소

    (${zipCode }) ${address } ${addressDetail }

    -

    달력 아이콘

    +

    운영시간

    월요일~금요일 / 오전 ${openTime } ~ 오후 ${closeTime }

    매주 토요일, 일요일 휴관
    ${closingInfo }

    -

    전화 아이콘

    +

    전화

    ${phoneNo }

    -

    팩스 아이콘

    +

    팩스

    ${faxNo }

    diff --git a/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoResult.jsp b/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoResult.jsp index c6b765e9..ef0983ad 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoResult.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoResult.jsp @@ -22,8 +22,15 @@ * */ %> -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> + <%@ page language="java" contentType="text/html; charset=UTF-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%> 회원가입완료