중간 백업

src/main/java/cmm/util/CmmUtil.java

@@ -1007,7 +1007,6 @@ public class CmmUtil {
 			if (titleDepth == 1 && prevTitleDepth > 1 && !hasOcrFileNum) {
 				List<String> errorList = vo.getErrorList();
 				errorList.add((i+1)+"\t"+"missing divided file number? : "+title+(pageNum!=null ? " - "+pageNum : ""));
-//				System.out.println("makeTableOfContentsMarkup() \t"+(i+1)+"\tmissing divided file number? : "+title+(pageNum!=null ? " - "+pageNum : ""));
 			}
 			
 			

src/main/java/egovframework/com/ext/oauth/service/KakaoAPI20.java

@@ -48,7 +48,6 @@ public class KakaoAPI20 extends DefaultApi20 implements OAuthConfig {
         if (state != null) {
             parameters.add(OAuthConstants.STATE, state);
         }
-        //System.out.println("===>>> "+parameters.appendTo(""));
         return parameters.appendTo(getAuthorizationBaseUrl());
     }
 

src/main/java/egovframework/com/ext/oauth/service/NaverAPI20.java

@@ -45,7 +45,6 @@ public class NaverAPI20 extends DefaultApi20 implements OAuthConfig {
         if (state != null) {
             parameters.add(OAuthConstants.STATE, state);
         }
-        //System.out.println("===>>> "+parameters.appendTo(""));
         return parameters.appendTo(getAuthorizationBaseUrl());
     }
 }

src/main/java/egovframework/com/utl/sim/service/EgovFileScrty.java

@@ -285,19 +285,4 @@ public class EgovFileScrty {
     	return MessageDigest.isEqual(hashValue, Base64.decodeBase64(encoded.getBytes()));
     }
     
-    /*
-    public static void main(String[] args) {
-    	try {
-    		String password = "abc";
-    		String salt = "def";
-    		
-    		String first = encryptPassword(password, salt.getBytes());
-    		String second = encryptPassword(password, salt.getBytes());
-			System.out.println(password + " => " + first + " : " + checkPassword(password, first, salt.getBytes()));
-			System.out.println(password + " => " + second + " : " + checkPassword(password, second, salt.getBytes()));
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-    }
-    */
 }

src/main/java/nlib/bbs/web/QnaController.java

@@ -264,10 +264,6 @@ public class QnaController extends NlibCommonController {
 	    		fileListObj = mapper.readValue(fileListJsonStr, new TypeReference<List<Map<String, Object>>>() {
 	            });
 	    		
-	            for (Map<String, Object> map : fileListObj) {
-	                MapUtils.debugPrint(System.out, "map", map);
-	            }
-	
 			} catch (JsonMappingException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -378,10 +374,6 @@ public class QnaController extends NlibCommonController {
 	    		fileListObj = mapper.readValue(fileListJsonStr, new TypeReference<List<Map<String, Object>>>() {
 	            });
 	    		
-	            for (Map<String, Object> map : fileListObj) {
-	                MapUtils.debugPrint(System.out, "map", map);
-	            }
-	
 			} catch (JsonMappingException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -443,10 +435,6 @@ public class QnaController extends NlibCommonController {
 	    		removedFileListObj = mapper.readValue(removedFileListJsonStr, new TypeReference<List<Map<String, Object>>>() {
 	            });
 	    		
-	            for (Map<String, Object> map : removedFileListObj) {
-	                MapUtils.debugPrint(System.out, "map", map);
-	            }
-	
 			} catch (JsonMappingException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();

src/main/java/nlib/cmm/service/MainService.java

@@ -1,16 +1,16 @@
 
 package nlib.cmm.service;
 
-import nlib.restful.service.DataApiReqVO;
+import java.util.List;
-import nlib.restful.service.DataApiResVO;
 
 public interface MainService
 {
-	public DataApiResVO selectMainBannerList(DataApiReqVO reqVO);
+	/**
-
+	 * 지역문화원의 키워드 리스트를 조회한다. 
-	public DataApiResVO selectMainNoticeList(DataApiReqVO reqVO);
+	 * 
-
+	 * @param mngOrgCd
-	public DataApiResVO selectMainMyRentInfo(DataApiReqVO reqVO);
+	 * @return
-
+	 */
+	public List<String> listKeywords(String mngOrgCd);
 
 }

src/main/java/nlib/cmm/service/impl/MainDAO.java

@@ -1,28 +1,26 @@
 
 package nlib.cmm.service.impl;
 
+import java.util.List;
+import java.util.Map;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
 
+import egovframework.rte.psl.dataaccess.mapper.Mapper;
 import nlib.restful.service.DataApiReqVO;
 import nlib.restful.service.DataApiResVO;
 
-@Repository("mainDAO")
+@Mapper("mainDAO")
-public class MainDAO
+public interface MainDAO {
-{
+
-	private static final Logger log = LoggerFactory.getLogger(MainDAO.class);
+	/**
+	 * 지역문화원의 키워드 리스트를 조회한다. 
+	 * 
+	 * @param mngOrgCd
+	 * @return
+	 */
+	public List<String> listKeywords(String mngOrgCd);
 	
-	public DataApiResVO selectMainBannerList(DataApiReqVO reqVO)  {
+}
-		return null;
-	}
-
-	public DataApiResVO selectMainNoticeList(DataApiReqVO reqVO)  {
-		return null;
-	}
-
-	public DataApiResVO selectMainMyRentInfo(DataApiReqVO reqVO)  {
-		return null;
-	}
-
-}

src/main/java/nlib/cmm/service/impl/MainServiceImpl.java

@@ -1,6 +1,9 @@
 
 package nlib.cmm.service.impl;
 
+
+import java.util.List;
+
 import javax.annotation.Resource;
 
 import org.slf4j.Logger;
@@ -8,8 +11,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import nlib.cmm.service.MainService;
-import nlib.restful.service.DataApiReqVO;
-import nlib.restful.service.DataApiResVO;
 
 @Service("mainService")
 public class MainServiceImpl implements MainService
@@ -18,17 +19,14 @@ public class MainServiceImpl implements MainService
 	
 	@Resource(name="mainDAO")
 	private MainDAO mainDAO;
-
+	
-	public DataApiResVO selectMainBannerList(DataApiReqVO reqVO)  {
+	/**
-		return null;
+	 * 지역문화원의 키워드 리스트를 조회한다. 
+	 * 
+	 * @param mngOrgCd
+	 * @return
+	 */
+	public List<String> listKeywords(String mngOrgCd) {
+		return mainDAO.listKeywords(mngOrgCd);
 	}
-
-	public DataApiResVO selectMainNoticeList(DataApiReqVO reqVO)  {
-		return null;
-	}
-
-	public DataApiResVO selectMainMyRentInfo(DataApiReqVO reqVO)  {
-		return null;
-	}
-
 }

src/main/java/nlib/cmm/web/MainController.java

@@ -14,10 +14,9 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import nlib.cmm.NlibCommonController;
-import nlib.cmm.service.NlibProperty;
+import nlib.cmm.service.MainService;
 import nlib.cmm.service.NotificationService;
 import nlib.col.service.CartService;
-import nlib.user.service.NlibLoginVO;
 import nlib.util.StringUtil;
 
 /**
@@ -52,6 +51,9 @@ public class MainController extends NlibCommonController {
 
     @Resource(name = "cartService")
     private CartService cartService;
+    
+    @Resource(name = "mainService")
+    private MainService mainService;
 
 	@RequestMapping( {"/index.do"} )
 	public String setContent(

src/main/java/nlib/restful/service/XmlConverter.java

@@ -147,7 +147,6 @@ public class XmlConverter {
 			e.printStackTrace();
 		}
 		
-		System.out.println("END");
 		return retMap;
 	}
 	

src/main/java/nlib/sch/util/NlibCmmUtil.java

@@ -1007,7 +1007,6 @@ public class NlibCmmUtil {
 			if (titleDepth == 1 && prevTitleDepth > 1 && !hasOcrFileNum) {
 				List<String> errorList = vo.getErrorList();
 				errorList.add((i+1)+"\t"+"missing divided file number? : "+title+(pageNum!=null ? " - "+pageNum : ""));
-//				System.out.println("makeTableOfContentsMarkup() \t"+(i+1)+"\tmissing divided file number? : "+title+(pageNum!=null ? " - "+pageNum : ""));
 			}
 			
 			

src/main/java/nlib/sch/web/NlibSearchController.java

@@ -295,7 +295,6 @@ public class NlibSearchController extends NlibCommonController {
 			Pattern pattern = Pattern.compile("<shorturl>(.+?)</shorturl>");
 			Matcher matcher = pattern.matcher(str);
 			while (matcher.find()) {
-			    //System.out.println(matcher.group(1));
 				returnUrl = matcher.group(1);  		    
 			    if(matcher.group(1) ==  null){
 			    	break;

src/main/java/nlib/user/web/LoginController.java

@@ -725,88 +725,4 @@ public class LoginController extends NlibCommonController {
 		return "nlib/login/agreeProvInfo";
 	}
 	
-
-//	// 구글 로그인 콜백
-//	@RequestMapping(value = "/login/googleCallback.do")
-//	public String googleCallback(@RequestParam(value = "code") String authCode, HttpSession session, Model model,
-//			HttpServletRequest request) throws Exception {
-//
-//		String code = request.getParameter("code");
-//        HttpHeaders headers = new HttpHeaders();
-//        RestTemplate restTemplate = new RestTemplate(); 
-//        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-//        
-//        MultiValueMap<String, String> parameters = new LinkedMultiValueMap<>();
-//        parameters.add("code", code);
-//        parameters.add("client_id", "879126511006-jro7bld7b2epl3n5mkksp0p24k2inbpu.apps.googleusercontent.com");
-//        parameters.add("client_secret", "F6T-ZV9jibLhKtcugxPUtBlN");
-//        parameters.add("redirect_uri", "http://nlib.nculture.org/nlib/login/googleCallback.do");
-//        parameters.add("grant_type", "authorization_code");
-//        
-//        HttpEntity<MultiValueMap<String,String>> rest_request = new HttpEntity<>(parameters,headers);
-//        
-//        URI uri = URI.create("https://www.googleapis.com/oauth2/v4/token");
-//        
-//        ResponseEntity<String> resultEntity;
-//        resultEntity = restTemplate.postForEntity(uri, rest_request, String.class);
-//		// JSON 파싱을 위한 기본값 세팅
-//		// 요청시 파라미터는 스네이크 케이스로 세팅되므로 Object mapper에 미리 설정해준다.
-//		ObjectMapper mapper = new ObjectMapper();
-//		mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
-//		mapper.setSerializationInclusion(Include.NON_NULL);
-//		// Token Request
-//		GoogleOAuthResponse result = mapper.readValue(resultEntity.getBody(), new TypeReference<GoogleOAuthResponse>() {
-//		});
-//
-//		// ID Token만 추출 (사용자의 정보는 jwt로 인코딩 되어있다)
-//		String jwtToken = result.getIdToken();
-//		String requestUrl = UriComponentsBuilder.fromHttpUrl("https://oauth2.googleapis.com/tokeninfo")
-//				.queryParam("id_token", jwtToken).toUriString();
-//
-//		String resultJson = restTemplate.getForObject(requestUrl, String.class);
-//
-//		Map<String, String> userInfo = mapper.readValue(resultJson, new TypeReference<Map<String, String>>() {
-//		});
-//		System.out.println(userInfo.get("email"));
-//		model.addAttribute("token", result.getAccessToken());
-//
-//		return "redirect:/";
-//	}
-//	@RequestMapping(value = "/login/kakaoCallback.do")
-//	public ModelAndView kakaoCallback(@RequestParam("code") String code, HttpServletRequest request, HttpServletResponse response, HttpSession session)
-//			throws Exception {
-//		ModelAndView mav = new ModelAndView();
-//		// 결과값을 node에 담아줌 
-//		String k_redirect_url="http://nlib.nculture.org/nlib/login/kakaoCallback.do";
-//		JsonNode node = KakaoController.getAccessToken(code,k_redirect_url); 
-//		// accessToken에 사용자의 로그인한 모든 정보가 들어있음 
-//		JsonNode accessToken = node.get("access_token");
-//		// 사용자의 정보 
-//		JsonNode userInfo = KakaoController.getKakaoUserInfo(accessToken); 
-//		String kemail = null; 
-//		String kname = null;
-//		String kgender = null;
-//		String kbirthday = null;
-//		String kage = null;
-//		String kimage = null;
-//		// 유저정보 카카오에서 가져오기Get properties
-//		JsonNode properties = userInfo.path("properties");
-//		JsonNode kakao_account = userInfo.path("kakao_account");
-//		kemail = kakao_account.path("email").asText();
-//		kname = properties.path("nickname").asText();
-//		kimage = properties.path("profile_image").asText();
-//		kgender = kakao_account.path("gender").asText();
-//		kbirthday = kakao_account.path("birthday").asText();
-//		kage = kakao_account.path("age_range").asText();
-//		session.setAttribute("kemail", kemail);
-//		session.setAttribute("kname", kname);
-//		session.setAttribute("kimage", kimage);
-//		session.setAttribute("kgender", kgender);
-//		session.setAttribute("kbirthday", kbirthday);
-//		session.setAttribute("kage", kage);
-//		mav.setViewName("main");
-//		return mav; 
-//		}// end kakaoLogin()
-//	
-
 }

src/main/resources/nlib/nlib.properties

@@ -104,6 +104,7 @@ mailing.sender.membership.certTemplate = C:/iams/workspace/nlib/src/main/webapp/
 # \uac1c\ubc1c\uc11c\ubc84 
 #mailing.sender.membership.signUpTemplate    = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/signUp_mail_template.html
 #mailing.sender.membership.pwdTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/pwd_mail_template.html
+#mailing.sender.membership.certTemplate = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/nlib/WEB-INF/template/mail/cert_mail_template.html
 
 #\uba54\uc77c \uc774\ubbf8\uc9c0 \uacbd\ub85c
 # \ub85c\uceec 

src/main/webapp/css/default.css

@@ -10,7 +10,8 @@
 .wrap header .inner .log {float:right;width:33.3%;text-align:right;}
 .wrap header .inner h1 {margin-top:20px;}
 .wrap header .inner h1 a img {}
-.wrap header .inner h1 a span {display:inline-block;height:16px;font-size:16px;line-height:16px;font-weight: 400;color:#fff;margin-left:15px;padding-left:15px;border-left:1px solid #999;position: relative;top:-14px;}
+.wrap header .inner h1 a span {display:inline-block;height:16px;font-size:16px;line-height:16px;font-weight: 400;color:#fff;margin-left:15px;padding-left:15px;position: relative;top:-14px;}
+.wrap header .inner h1 a span.title-1 {border-left:0px;margin-left:0;}
 .wrap header .inner .search-wrap form {position: relative;margin:14px 0px;}
 .wrap header .inner .search-wrap .ark_query {position: relative;width:160px;height:43px;padding:0px 20px 0px 100px;border-radius:3px;}
 .wrap header .inner .search-wrap form .condition_sear {display:inline;position: absolute;top:7px;left:30px;height:28px;border-right:1px solid #ddd;padding-right:10px;}
@@ -1503,6 +1504,7 @@ transform: rotate(45deg);}
 .qna .list-table-wrap li:hover .t-tit a {border-bottom:1px solid #376795;padding-bottom:1px;color:#376795;display: inline;}
 .qna .btn-box {float:right;}
 
+.no-result {padding:60px 0px;font-size:14px;color:#999;}
 
 .privacy .top-bg {width:1200px;height:270px;margin:0 auto 50px;background: url(/images/bg/bg-privacy.jpg) no-repeat center;text-align: left;}
 .privacy .top-bg p {color:#fff;}