From 524ed3e1f681c98583ff453c0e99a81528ae522c Mon Sep 17 00:00:00 2001
From: KNKIM <knkim@digitalship.co.kr>
Date: Fri, 17 Dec 2021 13:44:56 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EC=84=9D=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nlib/info/service/impl/InformDAO.java     |  1 -
 .../info/service/impl/InformServiceImpl.java  |  2 --
 .../java/nlib/info/web/InformController.java  |  6 -----
 src/main/java/nlib/restful/XmlConverter.java  | 22 ++++++++++++++++++
 src/main/java/nlib/security/SecUserDAO.java   |  3 ---
 .../nlib/security/SecUserDetailsService.java  | 11 ++-------
 src/main/java/nlib/security/SecUserVO.java    |  1 -
 .../nlib/security/SpringSecurityConfig.java   | 10 --------
 .../java/nlib/user/service/LoginService.java  | 22 ++++++++++++++++++
 .../java/nlib/user/service/NlibLoginVO.java   |  3 ---
 .../java/nlib/user/service/impl/LoginDAO.java | 23 ++++++++++++++++++-
 .../user/service/impl/LoginServiceImpl.java   | 22 ++++++++++++++++++
 .../java/nlib/user/web/LoginController.java   |  2 --
 .../nlib/user/web/UserInfoController.java     |  2 --
 src/main/java/nlib/util/StringUtil.java       | 22 ------------------
 15 files changed, 90 insertions(+), 62 deletions(-)

diff --git a/src/main/java/nlib/info/service/impl/InformDAO.java b/src/main/java/nlib/info/service/impl/InformDAO.java
index 01216058..095515f6 100644
--- a/src/main/java/nlib/info/service/impl/InformDAO.java
+++ b/src/main/java/nlib/info/service/impl/InformDAO.java
@@ -1,7 +1,6 @@
 package nlib.info.service.impl;
 
 import java.util.HashMap;
-import java.util.List;
 
 import egovframework.rte.psl.dataaccess.mapper.Mapper;
 import org.apache.ibatis.annotations.Param;
diff --git a/src/main/java/nlib/info/service/impl/InformServiceImpl.java b/src/main/java/nlib/info/service/impl/InformServiceImpl.java
index 36d10b2e..4979beb3 100644
--- a/src/main/java/nlib/info/service/impl/InformServiceImpl.java
+++ b/src/main/java/nlib/info/service/impl/InformServiceImpl.java
@@ -10,8 +10,6 @@ import org.springframework.stereotype.Service;
 
 import nlib.cmm.service.NlibProperty;
 import nlib.info.service.InformService;
-import nlib.restful.DataApiReqVO;
-import nlib.restful.DataApiResVO;
 import nlib.util.StringUtil;
 
 /**
diff --git a/src/main/java/nlib/info/web/InformController.java b/src/main/java/nlib/info/web/InformController.java
index 00657438..aac23f91 100644
--- a/src/main/java/nlib/info/web/InformController.java
+++ b/src/main/java/nlib/info/web/InformController.java
@@ -1,7 +1,6 @@
 package nlib.info.web;
 
 import java.util.HashMap;
-import java.util.Map;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -12,15 +11,10 @@ import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import nlib.cmm.NlibCommonController;
 import nlib.cmm.service.NlibProperty;
 import nlib.info.service.InformService;
-import nlib.info.service.impl.InformServiceImpl;
-import nlib.restful.DataApiReqVO;
-import nlib.restful.DataApiResVO;
-import nlib.util.StringUtil;
 
 /**
  * <pre>
diff --git a/src/main/java/nlib/restful/XmlConverter.java b/src/main/java/nlib/restful/XmlConverter.java
index 4c9cf4e2..193b2979 100644
--- a/src/main/java/nlib/restful/XmlConverter.java
+++ b/src/main/java/nlib/restful/XmlConverter.java
@@ -19,6 +19,28 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import nlib.util.StringUtil;
 
+/**
+ * <pre>
+ * @Class Name : XmlConverter.java
+ * 
+ * @Description : XML을 객체(HashMap, 기타 클래스)로 전환하는 유틸리티  
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ * </pre>
+ *
+ * @ ------------    --------    ---------------------------
+ * @ 수정일                     수정자             수정내용
+ * @ ------------    --------    ---------------------------
+ * @ 2021-07-20      KNKIM       최초 생성
+ *
+ * 
+ * @author 이씨플라자 * DIGITALSHIP KNKIM
+ * @since 2021-07-20
+ * @version 1.0
+ *
+ */
 public class XmlConverter {
 	
 	private static final Logger log = LoggerFactory.getLogger(XmlConverter.class);
diff --git a/src/main/java/nlib/security/SecUserDAO.java b/src/main/java/nlib/security/SecUserDAO.java
index 2711193d..96e9f8b3 100644
--- a/src/main/java/nlib/security/SecUserDAO.java
+++ b/src/main/java/nlib/security/SecUserDAO.java
@@ -1,8 +1,5 @@
 package nlib.security;
 
-import java.util.Arrays;
-import java.util.HashMap;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
diff --git a/src/main/java/nlib/security/SecUserDetailsService.java b/src/main/java/nlib/security/SecUserDetailsService.java
index 1e2df565..c2f10641 100644
--- a/src/main/java/nlib/security/SecUserDetailsService.java
+++ b/src/main/java/nlib/security/SecUserDetailsService.java
@@ -1,21 +1,15 @@
 package nlib.security;
 
-import java.util.HashMap;
 
 import javax.annotation.Resource;
 
-import org.springframework.security.core.userdetails.User.UserBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
-import nlib.restful.DataApiReqVO;
-import nlib.restful.DataApiResVO;
-
 /**
  * <pre>
  * @Class Name : NlibUserDetailsService.java
@@ -47,9 +41,8 @@ public class SecUserDetailsService implements UserDetailsService {
 	private SecUserDAO secUserDAO;
 	
 
-    /* 사용자명(ID)으로 사용자정보를 조회해 온다.
-     * (non-Javadoc)
-     * @see org.springframework.security.core.userdetails.UserDetailsService#loadUserByUsername(java.lang.String)
+    /* 
+     * 사용자명(ID)으로 사용자정보를 조회해 온다.
      */
     @Override
     public UserDetails loadUserByUsername(String loginUserId) throws UsernameNotFoundException {
diff --git a/src/main/java/nlib/security/SecUserVO.java b/src/main/java/nlib/security/SecUserVO.java
index a53a2493..770ebd6a 100644
--- a/src/main/java/nlib/security/SecUserVO.java
+++ b/src/main/java/nlib/security/SecUserVO.java
@@ -7,7 +7,6 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
-import nlib.cmm.crypto.AriaCrypto;
 import nlib.cmm.service.NlibProperty;
 import nlib.user.service.NlibLoginVO;
 
diff --git a/src/main/java/nlib/security/SpringSecurityConfig.java b/src/main/java/nlib/security/SpringSecurityConfig.java
index d46df240..aecd96a2 100644
--- a/src/main/java/nlib/security/SpringSecurityConfig.java
+++ b/src/main/java/nlib/security/SpringSecurityConfig.java
@@ -1,15 +1,9 @@
 package nlib.security;
 
-import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.MediaType;
-import org.springframework.security.access.annotation.Secured;
 import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.builders.WebSecurity;
@@ -17,13 +11,9 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 import nlib.cmm.crypto.NlibPasswordEncoder;
 import nlib.cmm.service.NlibProperty;
-import nlib.user.service.NlibLoginVO;
 
 /**
  * <pre>
diff --git a/src/main/java/nlib/user/service/LoginService.java b/src/main/java/nlib/user/service/LoginService.java
index 15def74c..7127f541 100644
--- a/src/main/java/nlib/user/service/LoginService.java
+++ b/src/main/java/nlib/user/service/LoginService.java
@@ -9,6 +9,28 @@ import egovframework.com.ext.oauth.service.OAuthUniversalUser;
 import nlib.restful.DataApiReqVO;
 import nlib.restful.DataApiResVO;
 
+/**
+ * <pre>
+ * @Class Name : LoginService.java
+ * 
+ * @Description : 로그인 서비스 인터페이스 
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ * </pre>
+ *
+ * @ ------------    --------    ---------------------------
+ * @ 수정일                     수정자             수정내용
+ * @ ------------    --------    ---------------------------
+ * @ 2021-07-09      KNKIM       최초 생성
+ *
+ * 
+ * @author 이씨플라자 * DIGITALSHIP KNKIM
+ * @since 2021-07-09
+ * @version 1.0
+ *
+ */
 public interface LoginService
 {
 	//-------------------------------
diff --git a/src/main/java/nlib/user/service/NlibLoginVO.java b/src/main/java/nlib/user/service/NlibLoginVO.java
index f7d39061..2c148426 100644
--- a/src/main/java/nlib/user/service/NlibLoginVO.java
+++ b/src/main/java/nlib/user/service/NlibLoginVO.java
@@ -1,11 +1,8 @@
 package nlib.user.service;
 
 import java.io.Serializable;
-import java.util.Base64;
 
-import nlib.cmm.NlibCommonController;
 import nlib.cmm.crypto.AriaCrypto;
-import nlib.util.StringUtil;
 
 /**
  * <pre>
diff --git a/src/main/java/nlib/user/service/impl/LoginDAO.java b/src/main/java/nlib/user/service/impl/LoginDAO.java
index 5979dd1c..6ba32d6e 100644
--- a/src/main/java/nlib/user/service/impl/LoginDAO.java
+++ b/src/main/java/nlib/user/service/impl/LoginDAO.java
@@ -6,11 +6,32 @@ import java.util.HashMap;
 import org.springframework.stereotype.Repository;
 
 import egovframework.com.cmm.service.impl.EgovComAbstractDAO;
-import nlib.cmm.crypto.AriaCrypto;
 import nlib.restful.DataApiReqVO;
 import nlib.restful.DataApiResVO;
 import nlib.user.service.NlibLoginVO;
 
+/**
+ * <pre>
+ * @Class Name : LoginDAO.java
+ * 
+ * @Description : 로그인 DAO 
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ * </pre>
+ *
+ * @ ------------    --------    ---------------------------
+ * @ 수정일                     수정자             수정내용
+ * @ ------------    --------    ---------------------------
+ * @ 2021-07-09      KNKIM       최초 생성
+ *
+ * 
+ * @author 이씨플라자 * DIGITALSHIP KNKIM
+ * @since 2021-07-09
+ * @version 1.0
+ *
+ */
 @Repository("loginDAO")
 public class LoginDAO extends EgovComAbstractDAO {
 
diff --git a/src/main/java/nlib/user/service/impl/LoginServiceImpl.java b/src/main/java/nlib/user/service/impl/LoginServiceImpl.java
index 6818fa82..5e514bfe 100644
--- a/src/main/java/nlib/user/service/impl/LoginServiceImpl.java
+++ b/src/main/java/nlib/user/service/impl/LoginServiceImpl.java
@@ -27,6 +27,28 @@ import nlib.user.service.LoginService;
 import nlib.user.service.NlibLoginVO;
 import nlib.util.StringUtil;
 
+/**
+ * <pre>
+ * @Class Name : LoginServiceImpl.java
+ * 
+ * @Description : 로그인 서비스 구현 클래스 
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ * </pre>
+ *
+ * @ ------------    --------    ---------------------------
+ * @ 수정일                     수정자             수정내용
+ * @ ------------    --------    ---------------------------
+ * @ 2021-07-09      KNKIM       최초 생성
+ *
+ * 
+ * @author 이씨플라자 * DIGITALSHIP KNKIM
+ * @since 2021-07-09
+ * @version 1.0
+ *
+ */
 @Service("loginService")
 public class LoginServiceImpl implements LoginService
 {
diff --git a/src/main/java/nlib/user/web/LoginController.java b/src/main/java/nlib/user/web/LoginController.java
index be04bfbe..492a272d 100644
--- a/src/main/java/nlib/user/web/LoginController.java
+++ b/src/main/java/nlib/user/web/LoginController.java
@@ -26,8 +26,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import egovframework.com.ext.oauth.service.OAuthConfig;
 import egovframework.com.ext.oauth.service.OAuthLogin;
 import egovframework.com.ext.oauth.service.OAuthUniversalUser;
diff --git a/src/main/java/nlib/user/web/UserInfoController.java b/src/main/java/nlib/user/web/UserInfoController.java
index 650c81e8..bed04bdf 100644
--- a/src/main/java/nlib/user/web/UserInfoController.java
+++ b/src/main/java/nlib/user/web/UserInfoController.java
@@ -32,7 +32,6 @@ import egovframework.com.ext.oauth.service.OAuthUniversalUser;
 import egovframework.rte.fdl.cryptography.EgovPasswordEncoder;
 import nlib.cmm.NlibCommonController;
 import nlib.cmm.qrcode.QRCodeUtil;
-import nlib.cmm.service.NlibProperty;
 import nlib.col.service.CollectionService;
 import nlib.col.service.CollectionVO;
 import nlib.col.service.InterestService;
@@ -40,7 +39,6 @@ import nlib.col.service.ReadService;
 import nlib.col.service.RentService;
 import nlib.restful.DataApiResVO;
 import nlib.security.SecUserDetailsService;
-import nlib.security.SecUserVO;
 import nlib.user.service.LoginService;
 import nlib.user.service.NlibLoginVO;
 import nlib.user.service.UserInfoService;
diff --git a/src/main/java/nlib/util/StringUtil.java b/src/main/java/nlib/util/StringUtil.java
index 086c34e5..5e694e15 100644
--- a/src/main/java/nlib/util/StringUtil.java
+++ b/src/main/java/nlib/util/StringUtil.java
@@ -40,28 +40,6 @@ import nlib.cmm.service.NlibProperty;
  * @version 1.0
  *
  */
-/**
- * <pre>
- * @Class Name : StringUtil.java
- * 
- * @Description : 
- * 
- * 
- * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
- *
- * </pre>
- *
- * @ ------------    --------    ---------------------------
- * @ 수정일                     수정자             수정내용
- * @ ------------    --------    ---------------------------
- * @ 2021. 10. 25.    KNKIM       최초 생성
- *
- * 
- * @author 이씨플라자 * DIGITALSHIP KNKIM
- * @since 2021. 10. 25.
- * @version 1.0
- *
- */
 public class StringUtil extends StringUtils {
 	
 	private static final Logger log = LoggerFactory.getLogger(StringUtil.class);