diff --git a/src/main/java/nlib/col/web/InterestController.java b/src/main/java/nlib/col/web/InterestController.java index e545ec57..6076f355 100644 --- a/src/main/java/nlib/col/web/InterestController.java +++ b/src/main/java/nlib/col/web/InterestController.java @@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; import org.springframework.security.access.annotation.Secured; import org.springframework.security.core.Authentication; @@ -60,7 +61,9 @@ import nlib.util.StringUtil; public class InterestController extends NlibCommonController { private static final Logger log = LoggerFactory.getLogger(InterestController.class); - static final String DEFUALT_PAGE_SIZE = NlibProperty.getProperty("list.paging.page.size"); + + @Value("#{properties['list.paging.page.size']}") + private String DEFUALT_PAGE_SIZE; @Resource(name = "interestService") private InterestService interestService; diff --git a/src/main/java/nlib/col/web/RisController.java b/src/main/java/nlib/col/web/RisController.java index 3c73cf06..d39e9d08 100644 --- a/src/main/java/nlib/col/web/RisController.java +++ b/src/main/java/nlib/col/web/RisController.java @@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Controller; @@ -49,7 +50,6 @@ import nlib.util.StringUtil; public class RisController extends NlibCommonController { private static final Logger log = LoggerFactory.getLogger(RisController.class); - static final String DEFUALT_PAGE_SIZE = NlibProperty.getProperty("list.paging.page.size"); @Resource(name = "codeService") private CodeService codeService; diff --git a/src/main/java/nlib/sch/service/NlibSearchVO.java b/src/main/java/nlib/sch/service/NlibSearchVO.java index 7d50103c..e026c800 100644 --- a/src/main/java/nlib/sch/service/NlibSearchVO.java +++ b/src/main/java/nlib/sch/service/NlibSearchVO.java @@ -9,6 +9,8 @@ import java.util.List; import javax.annotation.Resource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -16,6 +18,7 @@ import nlib.cmm.crypto.AriaCrypto; import nlib.cmm.service.NlibProperty; import nlib.cmm.service.PagingVO; import nlib.col.service.CollectionVO; +import nlib.sch.service.impl.NlibSearchServiceImpl; import nlib.util.StringUtil; @@ -28,9 +31,11 @@ import nlib.util.StringUtil; */ public class NlibSearchVO extends PagingVO { + private static final Logger log = LoggerFactory.getLogger(NlibSearchVO.class); + private String query =""; //검색어 private String collection = "lib_total"; //검색 대상 컬렉션 지정 - private String listCount = NlibProperty.getProperty("list.paging.page.size"); //컬렉션별 출력 결과수 + private String listCount = "10"; //컬렉션별 출력 결과수 private String sort = "DATE"; //결과 정렬 DATE 날짜 내림차, RANK 정확도 내림차 private String startCount = ""; //검색 결과 시작 페이지 private String sfield = ""; //검색 영역 @@ -358,7 +363,7 @@ public class NlibSearchVO extends PagingVO { add(map,"MNG_ORG_CD",URLEncoder.encode(this.mngOrgCd , "UTF-8")); //자료유형 2뎁스까지 나오게 고정 } catch (UnsupportedEncodingException e) { // TODO Auto-generated catch block - e.printStackTrace(); + log.error("nlibSearchVO 검색엔진파라미터 매핑 > Exception 발생 : " + e.toString()); } return map; diff --git a/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java b/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java index 1da98430..1d4ae839 100644 --- a/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java +++ b/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java @@ -300,7 +300,6 @@ public class NlibSearchServiceImpl implements NlibSearchService{ searchVO.setTypeCountList(typeMap); searchVO.setOrgCountList(orgMap); } catch(Exception e) { - e.printStackTrace(); log.error("getSearch > Exception 발생 : " + e.toString()); } return searchVO; diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index bc276c31..9e1daa0f 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -24,6 +24,7 @@ import javax.servlet.http.HttpSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -56,7 +57,9 @@ import nlib.util.StringUtil; public class NlibSearchController extends NlibCommonController { private static final Logger log = LoggerFactory.getLogger(NlibSearchController.class); - static final String DEFUALT_PAGE_SIZE = NlibProperty.getProperty("list.paging.page.size"); + + @Value("#{properties['list.paging.page.size']}") + private String DEFUALT_PAGE_SIZE; @Resource(name = "cartService") private CartService cartService; @@ -145,7 +148,7 @@ public class NlibSearchController extends NlibCommonController { model.addAttribute("pageVO", pageVO); model.addAttribute("searchVO", searchVO); }catch(Exception e){ - e.printStackTrace(); + log.error("searchList.do getSearch > Exception 발생 : " + e.toString()); } //주제분야 목록 조회 List> clsf = codeService.listCtClsfs(); @@ -402,7 +405,7 @@ public class NlibSearchController extends NlibCommonController { } } } catch (Exception e) { - System.err.println(e.toString()); + log.error("shorturl-data.do 단축url > Exception 발생 : " + e.toString()); } return returnUrl; } diff --git a/src/main/java/nlib/user/web/MemberController.java b/src/main/java/nlib/user/web/MemberController.java index 77cf671d..4c555895 100644 --- a/src/main/java/nlib/user/web/MemberController.java +++ b/src/main/java/nlib/user/web/MemberController.java @@ -524,6 +524,12 @@ public class MemberController extends NlibCommonController{ { OAuthUniversalUser oauthUser = SessionConfig.getNewMemberInfo(jsessionId); + if(oauthUser == null) { + map.put("msg","이메일 발송에 실패하였습니다. \n장시간 대기로 다시 로그인 하신 후, 이용해 주시기 바랍니다."); + map.put("emailCertYn","N"); + return map; + } + NlibLoginVO vo=oauthUser.getNlibVO(); //이미 생성된 VO가 없을때 if(vo == null) diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp index 33d4e070..2d2777f8 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp @@ -90,7 +90,13 @@ function fn_listPops(typeDivCd) { -
+ +

배너 섹션영역

-
+
" + html = "
  • "+ depth2 +"
    • " $(this).parents('.depth2').siblings('.depth1-check').find('input').prop('checked', true); $(this).parents('.conditions-box').siblings('.selected-conditions').find('.conditions').append(html); diff --git a/src/main/webapp/js/nlib.js b/src/main/webapp/js/nlib.js index da778c70..d8907e66 100644 --- a/src/main/webapp/js/nlib.js +++ b/src/main/webapp/js/nlib.js @@ -204,14 +204,17 @@ function gfn_showRis(risId){ html+=' '; html+=' '; html+='
    '; - html+=' '; + html+=' '; html+='
    '; html+='
    '; html+=''; $("#export-data").append(html); + gfn_focus("risExport"); +} +function gfn_focus(obj){ + $("#"+obj).focus(); } - function gfn_downloadRis(risId){ $("#risId").val(risId); @@ -219,7 +222,7 @@ function gfn_downloadRis(risId){ document.risDownloadForm.submit(); } -function gfn_closeRis(){ +function gfn_closeRis(risDownloadForm){ $("#export-data").remove(); }