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 = "
    • " $(this).parents('.depth2').siblings('.depth1-check').find('input').prop('checked', true); - $(this).parents('.conditions-box').siblings('.selected-conditions').find('.conditions').append(html); + $(this).parents('.conditions-box').siblings('.selected-conditions').find('.conditions').append(html); } else { $("button[name="+$(this).attr('id')+"]").remove(); diff --git a/src/main/webapp/css/common.css b/src/main/webapp/css/common.css index ddf1d6e3..cf99707f 100644 --- a/src/main/webapp/css/common.css +++ b/src/main/webapp/css/common.css @@ -22,7 +22,15 @@ input,select,button{vertical-align:middle; appearance: none; */ } -select {background:#fff;} +select { +-webkit-appearance: none; +-moz-appearance: none; +appearance: none; +background: url('/images/icon/icon-data-downarr.png') no-repeat 90% 50% #fff; +} +select::-ms-expand{ +display:none; +} button{margin:0;padding:0;} table{border:none;border-collapse:collapse;padding:0;border-spacing:0;border-color: gray} a{text-decoration:none;color:#333;} diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css index 7afd94b4..4b2496cb 100644 --- a/src/main/webapp/css/default.css +++ b/src/main/webapp/css/default.css @@ -2,6 +2,8 @@ @charset "utf-8"; /********** 헤더 **********/ +.skip-nav {position:fixed;left:0px;top:0px;z-index:999;} +.skip-nav a {display:block;background:#333;color:#fff;font-size:14px;padding:5px 12px;border-radius:3px;letter-spacing:-1px;margin:3px 0px;} .blind {display:none;} .wrap {display:inline-block;width:100%;min-width:1400px;} .wrap header {position: fixed;top:0px;left:0px;width:100%;border-bottom:1px solid #999;background:rgba(0,0,0,0.3);z-index: 99;} @@ -330,8 +332,8 @@ transition: all 0.2s ease-in-out; .sec7 .inner .Fl .con .list .box {float:left;width:41px;height:41px;background: #ccc;padding:7px;margin-right:20px;} .sec7 .inner .Fl .con .list .box p:nth-of-type(1) {color:#fff;font-size:22px;line-height:22px;font-weight: 400;margin-bottom:5px;} .sec7 .inner .Fl .con .list .box p:nth-of-type(2) {color:#fff;font-size:11px;line-height:11px;font-weight: 100;} -.sec7 .inner .Fl .con .list .text {float:left;width:400px;height:54px;overflow:hidden;text-align: left;line-height:55px;font-size:18px;font-weight:400;color:#222;} -.sec7 .inner .Fl .con .list .text p {white-space: nowrap;overflow: hidden;text-overflow: ellipsis;position:relative;} +.sec7 .inner .Fl .con .list .text {float:left;max-width:400px;height:54px;overflow:hidden;text-align: left;line-height:55px;font-size:18px;font-weight:400;color:#222;} +.sec7 .inner .Fl .con .list .text p {white-space: nowrap;overflow: hidden;text-overflow: ellipsis;position:relative;padding-right:36px;} .sec7 .inner .Fl .con .list .text p img {vertical-align: middle;margin:0px 0px 5px 5px;position:absolute;right:5px;top:20px;} .sec7 .inner .Fl .con .list .answer {float:right;} .sec7 .inner .Fl .con .list .answer p {background:#e6e7e9;padding:6px 20px 8px;border-radius: 50px;margin-top:8px;} @@ -797,7 +799,7 @@ transform: rotate(45deg);} .filter-wrap .filter .filter-list.year ul li input {margin-right:2%;} .filter-wrap .filter .filter-list.year ul li input[type='radio'] {margin-right:5px;margin-bottom:3px;} -.filter-wrap .filter .filter-list.year ul li input[type='text'] {border:1px solid #ddd;width:32%;padding:0% 5%;height:24px;line-height: 24px;border-radius: 3px;} +.filter-wrap .filter .filter-list.year ul li input[type='text'] {border:1px solid #ddd;width:27%;padding:0% 5%;height:24px;line-height: 24px;border-radius: 3px;} .filter-wrap .filter .filter-list.year ul li input[type='text']::placeholder {font-size:12px;color:#999;} @@ -980,7 +982,7 @@ transform: rotate(45deg);} .data.detail .inner .row-bottom .DetailSwiper2::before {content: '';width:13.5%;height:120%;background: #f5f5f5;display: inline-block;position: absolute;left:0px;top:-10%;z-index: 9;} .data.detail .inner .row-bottom .DetailSwiper2::after {content: '';width:13.5%;height:120%;background: #f5f5f5;display: inline-block;position: absolute;right:0px;top:-10%;z-index: 9;} */ -.data.detail .inner .row-bottom .DetailSwiper2 .swiper-slide {height:363px;background: #ccc;border-radius:10px;box-shadow:1px 1px 3px rgba(0,0,0,0.3);} +.data.detail .inner .row-bottom .DetailSwiper2 .swiper-slide {height:352px;background: #ccc;border-radius:10px;box-shadow:1px 1px 3px rgba(0,0,0,0.3);} .data.detail .inner .row-bottom .DetailSwiper2 .swiper-slide .List .inner {margin-bottom:0;} .data.detail .inner .row-bottom .DetailSwiper2 .items.cover {} .data.detail .inner .row-bottom .DetailSwiper2 .items.cover:after {clear:both;content:'';display:block;} @@ -1212,7 +1214,7 @@ transform: rotate(45deg);} .loan-data .inner .loan-box .title .count em {color:#d47b1c;font-weight: 500;} .loan-data .inner .loan-box .title .list-search-wrap {float:right;} .loan-data .inner .loan-box .title .list-search-wrap > div.list-select {} -.loan-data .inner .loan-box .title .list-search-wrap > div.list-select select {height:37px;border:1px solid #ddd;color:#666;padding:0px 10px;vertical-align: top;border-radius: 3px;} +.loan-data .inner .loan-box .title .list-search-wrap > div.list-select select {height:37px;border:1px solid #ddd;color:#666;padding:0px 25px;vertical-align: top;border-radius: 3px;} .loan-data .inner .tab {position: relative;} .loan-data .inner .tabs {position: relative;width: 100.5%;text-align:left;} .loan-data .inner .tabs li {display: inline-block;margin:0% 0px;padding: 0;position: relative;text-align: center;width:19.9%;margin-left:-3px;} @@ -1924,7 +1926,7 @@ animation: animate-bg2 2.0s 1.9s ease-in infinite; .conditions-wrap .selected-conditions .conditions {float: left;width: calc(100% - 120px);} .conditions-wrap .selected-conditions .conditions li {display: inline-block;margin-right: 6px;overflow: hidden;} .conditions-wrap .selected-conditions .conditions li button {background: #f4f4f4;height: 30px;padding: 0 35px 0px 15px;font: 12px 'dotum','돋움', sans-serif;color: #666;border: 1px solid #ddd;border-radius: 16px;position:relative;} -.conditions-wrap .selected-conditions .conditions li button .del {display: inline-block;margin-left: 10px;width: 20px;height: 20px;background: url(/images/btn/btn-close-maplayer.png) no-repeat center;background-size: 12px;position:absolute;right:12px;top:4px;text-indent:-999999px;} +.conditions-wrap .selected-conditions .conditions li button .del {display: inline-block;margin-left: 10px;width: 20px;height: 20px;background: url(/images/btn/btn-close-maplayer.png) no-repeat center;background-size: 12px;position:absolute;right:12px;top:4px;text-indent:-999999px;border:0;padding:0;} /*.conditions-wrap .selected-conditions .conditions li button:after {content: "";display: inline-block;margin-left: 10px;width: 10px;height: 10px;background: url(/images/btn/btn-close-maplayer.png) no-repeat center;background-size: 7px;}*/ .conditions-wrap .selected-conditions .conditions li button:hover, .conditions-wrap .selected-conditions .conditions li button:focus {color: #000;border-color: #666;} diff --git a/src/main/webapp/css/media.css b/src/main/webapp/css/media.css index 5a26b2a9..10463142 100644 --- a/src/main/webapp/css/media.css +++ b/src/main/webapp/css/media.css @@ -124,7 +124,7 @@ a.pop-logo img { margin-right: 10px; } .sec2 {padding:0% 2% 100px;} .sec2 .keyword-box {width:100%;} .sec3 {padding:100px 2% 100px;} -.sec3 .pickSwiper .swiper-slide .list-box .images a img {width:100%;} +.sec3 .pickSwiper .swiper-slide .list-box .images a img {} .sec5 {padding:100px 2% 100px;} .sec5 .inner .tab_content {width:96%;padding:30px 1.9%;} .sec5 .inner {width:100%;} @@ -139,7 +139,7 @@ a.pop-logo img { margin-right: 10px; } .sec7 .inner {width:100%;} .sec7 .inner .Fl {width:100%;margin:0;margin-bottom:20px;} .sec7 .inner .Fl .con .list .text {width:53%;} -.sec7 .inner .qna .con .list .text {width:40%;} +.sec7 .inner .qna .con .list .text {width:auto;} .sec7 .inner .Fl .con .list .box {margin-right:2%;} footer {width:96%;padding: 40px 2% 60px;} footer .inner {width:100%;} @@ -239,10 +239,13 @@ footer .family_site {right:10px;} .privacy .con {width:100%;} .privacy .top-bg p:nth-child(1) {margin:300px 5% 20px;font-size:16px;color:#333;} .privacy .top-bg p:nth-child(2) {margin:0 5%;font-size:12px;color:#333;} + + .data.detail .inner .row-bottom .DetailSwiper2 .swiper-slide { height: auto;background:none;box-shadow:0 0 0; } } /* 모바일 가로, 테블릿 세로 (해상도 ~ 479px)*/ @media all and (max-width: 479px){ + .shortcuts {display:none;} .contents {padding:0;} button, select {color:#333;} .mo-ver { display: block !important; } @@ -359,8 +362,8 @@ footer .family_site {right:10px;} .sec7 .inner .Fl .ti a span img { width: 22px; margin: 0; } .sec7 .inner .Fl .con { padding: 0 20px; border: 1px solid #dddddd; border-radius: 5px; } .sec7 .inner .Fl .con .list a { display: flex; } - .sec7 .inner .Fl .con .list .text { font-size: 16px; flex: 1; } - .sec7 .inner .Fl .con .list .text p { align-items: center;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;padding-right:20px; } + .sec7 .inner .Fl .con .list .text { font-size: 16px; flex: 1;max-width: max-content; } + .sec7 .inner .Fl .con .list .text p { align-items: center;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;padding-right:30px; } .sec7 .inner .Fl .con .list .text p img { margin: 0;margin-left:5px; } .sec7 .inner .Fl .con .list .answer { display: none; } .sec7 .inner .Fl .more {position:absolute;right:0%;top:5px;} 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(); }