주석 및 불필요한 소스 제거

src/main/java/nlib/col/service/RisService.java

@@ -2,30 +2,41 @@
 package nlib.col.service;
 
 import java.util.List;
-
+/**
-import nlib.restful.DataApiReqVO;
+ * <pre>
-import nlib.restful.DataApiResVO;
+ * @Class Name : RisService.java
-
+ * 
+ * @Description : RIS 관련 서비스 인터페이스 
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ * </pre>
+ *
+ * @ ------------    --------    ---------------------------
+ * @ 수정일                     수정자             수정내용
+ * @ ------------    --------    ---------------------------
+ * @ 2021-07-01      JSYOO       최초 생성
+ *
+ * 
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021-07-01
+ * @version 1.0
+ *
+ */
 public interface RisService
 {
-	public DataApiResVO listItems(DataApiReqVO reqVO);
+	/**
-
+	 * RIS파일 다운로드 데이터를 조회한다.
-	public DataApiResVO insertInterest(DataApiReqVO reqVO);
+	 * @param vo
-
+	 * @return
-	public DataApiResVO reserveItem(DataApiReqVO reqVO);
+	 */
-
-	public DataApiResVO viewOriginalCopy(DataApiReqVO reqVO);
-
-	public DataApiResVO requestViewingItem(DataApiReqVO reqVO);
-
-	public DataApiResVO selectItemInfo(DataApiReqVO reqVO);
-
 	public RisVO selectRisInfo(RisVO vo);
 	
+	/**
+	 * 문화원 목록 조회(검색 필터용)
+	 * @return
+	 */
 	public List<DeptVO> selectOrgList();
 
-	public List<CollectionVO> listItems(CollectionVO searchCollectionVO);
-
-	public int countListItems(CollectionVO searchCollectionVO);
-
 }

src/main/java/nlib/col/service/impl/InterestDAO.java

@@ -13,6 +13,29 @@ import nlib.restful.DataApi;
 import nlib.restful.DataApiReqVO;
 import nlib.restful.DataApiResVO;
 
+/**
+ * <pre>
+ * @Class Name : InterestDAO.java
+ * 
+ * @Description : 관심자료 관련 DAO 
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ * </pre>
+ *
+ * @ ------------    --------    ---------------------------
+ * @ 수정일                     수정자             수정내용
+ * @ ------------    --------    ---------------------------
+ * @ 2021-07-01      JSYOO       최초 생성
+ *
+ * 
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021-07-01
+ * @version 1.0
+ *
+ */
+
 @Repository("interestDAO")
 public class InterestDAO extends EgovComAbstractDAO
 {

src/main/java/nlib/col/service/impl/InterestServiceImpl.java

@@ -8,12 +8,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import nlib.col.service.CartService;
 import nlib.col.service.CollectionVO;
 import nlib.col.service.DeptVO;
 import nlib.col.service.InterestService;
-import nlib.restful.DataApiReqVO;
-import nlib.restful.DataApiResVO;
 
 @Service("interestService")
 public class InterestServiceImpl implements InterestService

src/main/java/nlib/col/service/impl/RisDAO.java

@@ -3,6 +3,30 @@ package nlib.col.service.impl;
 
 import java.util.List;
 
+/**
+ * <pre>
+ * @Class Name : RisDAO.java
+ * 
+ * @Description : Ris 관련 DAO 
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ * </pre>
+ *
+ * @ ------------    --------    ---------------------------
+ * @ 수정일                     수정자             수정내용
+ * @ ------------    --------    ---------------------------
+ * @ 2021-07-01      JSYOO       최초 생성
+ *
+ * 
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021-07-01
+ * @version 1.0
+ *
+ */
+
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
@@ -30,47 +54,6 @@ import nlib.util.StringUtil;
 public class RisDAO extends EgovComAbstractDAO 
 {
 	private static final Logger log = LoggerFactory.getLogger(RisDAO.class);
-	
-	/*
-	*//**
-	 * 소장 자료 목록을 조회한다.
-	 * 
-	 * @param reqVO
-	 * @return
-	 *//*
-	public DataApiResVO listItems(DataApiReqVO reqVO)  {
-		reqVO.setReqUrl(RESOURCE_URI + "/listItems/list");
-		return get(reqVO);
-	}*/
-
-	public DataApiResVO insertInterest(DataApiReqVO reqVO)  {
-		return null;
-	}
-
-	public DataApiResVO reserveItem(DataApiReqVO reqVO)  {
-		return null;
-	}
-
-	public DataApiResVO viewOriginalCopy(DataApiReqVO reqVO)  {
-		return null;
-	}
-
-	public DataApiResVO requestViewingItem(DataApiReqVO reqVO)  {
-		return null;
-	}
-	
-	/**
-	 * 소장자료를 상세 조회한다.
-	 * 
-	 * @param reqVO
-	 * @return
-	 *//*
-	public DataApiResVO selectItemInfo(DataApiReqVO reqVO)  {
-	}*/
-
-	public DataApiResVO deleteInterest(DataApiReqVO reqVO)  {
-		return null;
-	}
 	/**
 	 * RIS파일 다운로드 데이터를 조회한다.
 	 * @param vo
@@ -86,22 +69,4 @@ public class RisDAO extends EgovComAbstractDAO
 	public List<DeptVO> selectOrgList() {
 		return selectList("CollectionDAO.selectOrgList");
 	}
-
-	/**
-	 * 소장자료 목록 조회
-	 * @param searchCollectionVO
-	 * @return
-	 */
-	public List<CollectionVO> listItems(CollectionVO searchCollectionVO) {
-		return selectList("CollectionDAO.listItems",searchCollectionVO);
-	}
-
-	/**
-	 * 소장자료 목록 개수 조회
-	 * @param searchCollectionVO
-	 * @return
-	 */
-	public int countListItems(CollectionVO searchCollectionVO) {
-		return selectOne("CollectionDAO.countListItems",searchCollectionVO);
-	}
 }

src/main/java/nlib/col/service/impl/RisServiceImpl.java

@@ -9,13 +9,33 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import nlib.col.service.RisService;
 import nlib.col.service.CollectionVO;
 import nlib.col.service.DeptVO;
+import nlib.col.service.RisService;
 import nlib.col.service.RisVO;
-import nlib.restful.DataApiReqVO;
-import nlib.restful.DataApiResVO;
 
+/**
+ * <pre>
+ * @Class Name : RisServiceImpl.java
+ * 
+ * @Description : RIS관련 서비스 구현 클래스 
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ * </pre>
+ *
+ * @ ------------    --------    ---------------------------
+ * @ 수정일                     수정자             수정내용
+ * @ ------------    --------    ---------------------------
+ * @ 2021-07-01      JSYOO       최초 생성
+ *
+ * 
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021-07-01
+ * @version 1.0
+ *
+ */
 @Service("risService")
 public class RisServiceImpl implements RisService
 {
@@ -24,42 +44,7 @@ public class RisServiceImpl implements RisService
 	@Resource(name = "risDAO")
 	private RisDAO risDAO;
 
-	/* 
+	/** 
-	 * 소장자료 목록을 조회한다.
-	 * 
-	 * (non-Javadoc)
-	 * @see nlib.col.service.CollectionService#listItems(nlib.restful.service.DataApiReqVO)
-	 */
-	public DataApiResVO listItems(DataApiReqVO reqVO)  {
-		return ((RisService) risDAO).listItems(reqVO);
-	}
-
-	public DataApiResVO insertInterest(DataApiReqVO reqVO)  {
-		return null;
-	}
-
-	public DataApiResVO reserveItem(DataApiReqVO reqVO)  {
-		return null;
-	}
-
-	public DataApiResVO viewOriginalCopy(DataApiReqVO reqVO)  {
-		return null;
-	}
-
-	public DataApiResVO requestViewingItem(DataApiReqVO reqVO)  {
-		return null;
-	}
-	/* 
-	 * 소장자료를 상세 조회한다.
-	 * 
-	 * (non-Javadoc)
-	 * @see nlib.col.service.CollectionService#selectItemInfo(nlib.restful.service.DataApiReqVO)
-	 */
-	public DataApiResVO selectItemInfo(DataApiReqVO reqVO)  {
-		return ((RisService) risDAO).selectItemInfo(reqVO);
-	}
-
-	/* 
 	 * RIS파일 다운로드 데이터를 조회한다.
 	 * (non-Javadoc)
 	 * @see nlib.col.service.CollectionService#selectRisInfo(nlib.col.service.CollectionVO)
@@ -68,7 +53,7 @@ public class RisServiceImpl implements RisService
 		return risDAO.selectRisInfo(vo);
 	}
 	
-	/* 
+	/** 
 	 * 문화원 목록 조회(검색 필터용)
 	 * (non-Javadoc)
 	 * @see nlib.col.service.CollectionService#selectOrgList()
@@ -76,22 +61,4 @@ public class RisServiceImpl implements RisService
 	public List<DeptVO> selectOrgList() {
 		return risDAO.selectOrgList();
 	}
-
-	/* 
-	 * 소장자료 목록 조회
-	 * (non-Javadoc)
-	 * @see nlib.col.service.CollectionService#listItems(nlib.col.service.CollectionVO)
-	 */
-	public List<CollectionVO> listItems(CollectionVO searchCollectionVO) {
-		return risDAO.listItems(searchCollectionVO);
-	}
-
-	/* 
-	 * 소장자료 목록 개수 조회
-	 * (non-Javadoc)
-	 * @see nlib.col.service.CollectionService#countListItems(nlib.col.service.CollectionVO)
-	 */
-	public int countListItems(CollectionVO searchCollectionVO) {
-		return risDAO.countListItems(searchCollectionVO);
-	}
 }

src/main/java/nlib/col/web/InterestController.java

@@ -24,14 +24,12 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import nlib.cmm.NlibCommonController;
 import nlib.cmm.service.CodeService;
-import nlib.cmm.service.NlibProperty;
 import nlib.cmm.service.PagingVO;
-import nlib.col.service.RisService;
 import nlib.col.service.CollectionService;
 import nlib.col.service.CollectionVO;
 import nlib.col.service.DeptVO;
 import nlib.col.service.InterestService;
-import nlib.col.service.RentService;
+import nlib.col.service.RisService;
 import nlib.user.service.NlibLoginVO;
 import nlib.util.StringUtil;
 

src/main/java/nlib/col/web/RisController.java

@@ -6,10 +6,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -17,33 +13,37 @@ 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;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 
-import nlib.bbs.service.ArticleVO;
 import nlib.cmm.NlibCommonController;
 import nlib.cmm.service.CodeService;
-import nlib.cmm.service.NlibProperty;
-import nlib.cmm.service.PagingVO;
-import nlib.col.service.RisService;
-import nlib.col.service.CollectionVO;
-import nlib.col.service.DeptVO;
 import nlib.col.service.InterestService;
+import nlib.col.service.RisService;
 import nlib.col.service.RisVO;
-import nlib.restful.DataApiReqVO;
-import nlib.restful.DataApiResVO;
-import nlib.user.service.NlibLoginVO;
 import nlib.util.StringUtil;
 
+
 /**
- * @author JSYOO
+ * <pre>
+ * @Class Name : RisController.java
+ * 
+ * @Description : Ris Controller
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ * </pre>
+ *
+ * @ ------------    --------    ---------------------------
+ * @ 수정일                     수정자             수정내용
+ * @ ------------    --------    ---------------------------
+ * @ 2021. 7. 21.    JSYOO       최초 생성
+ *
+ * 
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 21.
+ * @version 1.0
  *
  */
 @Controller

src/main/java/nlib/mail/EmailSender.java

@@ -3,13 +3,10 @@ package nlib.mail;
 import java.io.Reader;
 import java.util.Properties;
 
-import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMessage.RecipientType;
 
 import org.apache.ibatis.io.Resources;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Component;
@@ -17,12 +14,40 @@ import org.springframework.stereotype.Component;
 import nlib.mail.service.EmailVO;
  
 
+/**
+ * <pre>
+ * @Class Name : EmailSender.java
+ * 
+ * @Description : 메일전송
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ * </pre>
+ *
+ * @ ------------    --------    ---------------------------
+ * @ 수정일                     수정자             수정내용
+ * @ ------------    --------    ---------------------------
+ * @ 2021. 7. 21.    JSYOO       최초 생성
+ * @ 2021.10. 14.    KNKIM       대출목록 API방식 변경 및 화면설계서 적용 개발 
+ *
+ * 
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 21.
+ * @version 1.0
+ *
+ */
 @Component
 public class EmailSender  {
      
     @Autowired
     protected JavaMailSender  mailSender;
  
+    /**
+     * 메일전송
+     * @param email
+     * @throws Exception
+     */
     public void SendEmail(EmailVO email) throws Exception {
     	String resource = "egovframework/egovProps/globals.properties";
         Properties properties = new Properties();

src/main/java/nlib/sch/service/NlibSearchCollectionVO.java

@@ -6,7 +6,7 @@ import nlib.col.service.CollectionVO;
  * <pre>
  * @Class Name : NlibSearchCollectionVO.java
  * 
- * @Description : 검색엔진 결과리스트 VO
+ * @Description : 소장자료 결과리스트 VO
  * 
  * 
  * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)

src/main/java/nlib/sch/service/NlibSearchService.java

@@ -8,7 +8,7 @@ import nlib.sch.service.NlibSearchVO;
  * <pre>
  * @Class Name : NlibSearchService.java
  * 
- * @Description : 검색엔진 
+ * @Description : 소장자료 
  * 
  * 
  * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)

src/main/java/nlib/sch/service/NlibSearchVO.java

@@ -25,7 +25,7 @@ import nlib.util.StringUtil;
  * <pre>
  * @Class Name : NlibSearchVO.java
  * 
- * @Description : 검색엔진 VO
+ * @Description : 소장자료 VO
  * 
  * 
  * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)

src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java

@@ -35,7 +35,7 @@ import nlib.util.StringUtil;
  * <pre>
  * @Class Name : NlibSearchServiceImpl.java
  * 
- * @Description : 검색엔진
+ * @Description : 소장자료
  * 
  * 
  * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)

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

@@ -25,8 +25,25 @@ import egovframework.rte.psl.dataaccess.util.EgovMap;
  
 
 /**
+ * <pre>
+ * @Class Name : NlibCmmUtil.java
  * 
- * Util 클래스
+ * @Description : Nlib 공통유틸
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ * </pre>
+ *
+ * @ ------------    --------    ---------------------------
+ * @ 수정일                     수정자             수정내용
+ * @ ------------    --------    ---------------------------
+ * @ 2021. 7. 21.    JSYOO       최초 생성
+ *
+ * 
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 21.
+ * @version 1.0
  *
  */
 @Component

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

@@ -48,6 +48,28 @@ import nlib.sch.util.DataMap;
 import nlib.sch.util.NlibCmmUtil;
 import nlib.util.StringUtil;
 
+/**
+ * <pre>
+ * @Class Name : NlibSearchController.java
+ * 
+ * @Description : 소장자료 Controller
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ * </pre>
+ *
+ * @ ------------    --------    ---------------------------
+ * @ 수정일                     수정자             수정내용
+ * @ ------------    --------    ---------------------------
+ * @ 2021. 7. 21.    JSYOO       최초 생성
+ *
+ * 
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 21.
+ * @version 1.0
+ *
+ */
 @Controller
 public class NlibSearchController extends NlibCommonController {
 

src/main/java/nlib/user/service/MemberService.java

@@ -9,58 +9,99 @@ import nlib.restful.DataApiReqVO;
 import nlib.restful.DataApiResVO;
 
 /**
- * Description : 
- * @author
- * @since
- * @version
- * @see
- *
  * <pre>
- * << Modification Information >>
+ * @Class Name : MemberService.java
  * 
- *   Date     Modifier               Expression
+ * @Description : 회원가입 관련 Service
- *  -------    --------    ---------------------------
  * 
  * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
  *
  * </pre>
+ *
+ * @ ------------    --------    ---------------------------
+ * @ 수정일                     수정자             수정내용
+ * @ ------------    --------    ---------------------------
+ * @ 2021. 7. 12.    JSYOO       최초 생성
+ *
+ * 
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 12.
+ * @version 1.0
+ *
  */
 public interface MemberService
 {
-	public DataApiResVO selectMemberJoiningInfo(DataApiReqVO reqVO);
-
-	public DataApiResVO certificateMember(DataApiReqVO reqVO);
 
+	/**
+	 * 회원가입
+	 * @param vo
+	 * @throws Exception
+	 */
 	public void insertMemberInfo(NlibLoginVO vo) throws Exception;
 
-	public DataApiResVO sendEmailForMemberJoining(DataApiReqVO reqVO);
+	/**
-
+	 * 비밀번호 변경
-	public DataApiResVO searchId(DataApiReqVO reqVO);
+	 * @param vo
-
+	 * @throws Exception
-	public DataApiResVO initPassword(DataApiReqVO reqVO);
+	 */
-
 	public void changePassword(NlibLoginVO vo) throws Exception;
 
-	public DataApiResVO selectMemberInfo(DataApiReqVO reqVO);
+	/**
-
+	 * 핸드폰 인증번호 난수 생성
-	public DataApiResVO updateMemberInfo(DataApiReqVO reqVO);
+	 * @param i
-
+	 * @param j
-	public DataApiResVO leaveMember(DataApiReqVO reqVO);
+	 * @return
-
+	 */
 	public String numberGen(int i, int j);
 
+	/**
+	 * 초기화 비밀번호 랜덤생성
+	 * @return
+	 */
 	public String createInitPwd();
 
+	/**
+	 * 회원가입시 SNS인증한 계정 ID와 일치하는 계정이 있는지 체크
+	 * @param oauthUser
+	 * @return
+	 * @throws Exception
+	 */
 	public NlibLoginVO selectAlreadySignUpId(OAuthUniversalUser oauthUser) throws Exception;
 
+	/**
+	 * 회원가입시 sns 계정 추가 , 기존 계정 ID와 일치시 통합처리시 추가
+	 * @param oauthUser
+	 */
 	public void insertMemberSns(OAuthUniversalUser oauthUser);
 
+	/**
+	 * 회원가입시 입력한 휴대폰번호와 일치하는 계정이 있는지 체크
+	 * @param loginVO
+	 * @return
+	 * @throws Exception
+	 */
 	public List<NlibLoginVO> selectAlreadySignUpMobile(NlibLoginVO loginVO) throws Exception;
 
+	/**
+	 * SnsId로 기가입자인지 판별
+	 * @param oauthUser
+	 * @return
+	 */
 	public int selectSnsIdCount(OAuthUniversalUser oauthUser);
 
+	/**
+	 * 회원 탈퇴
+	 * @param loginVO
+	 * @throws Exception
+	 */
 	public void deleteMembership(NlibLoginVO loginVO) throws Exception;
 
+	/**
+	 * sms 발송 
+	 * @param smsVO
+	 * @throws Exception
+	 */
 	public void sendSms(NlibSmsVO smsVO) throws Exception;
 
 

src/main/java/nlib/user/service/UserInfoService.java

@@ -7,21 +7,26 @@ import java.util.Map;
 import egovframework.com.ext.oauth.service.OAuthUniversalUser;
 
 /**
- * Description : 
- * @author
- * @since
- * @version
- * @see
- *
  * <pre>
- * << Modification Information >>
+ * @Class Name : userInfoService.java
  * 
- *   Date     Modifier               Expression
+ * @Description : 회원 정보 관련 Service
- *  -------    --------    ---------------------------
  * 
  * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
  *
  * </pre>
+ *
+ * @ ------------    --------    ---------------------------
+ * @ 수정일                     수정자             수정내용
+ * @ ------------    --------    ---------------------------
+ * @ 2021. 7. 14.    JSYOO       최초 생성
+ *
+ * 
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 14.
+ * @version 1.0
+ *
  */
 public interface UserInfoService
 {

src/main/java/nlib/user/service/impl/MemberDAO.java

@@ -13,38 +13,86 @@ import nlib.restful.DataApiResVO;
 import nlib.user.service.NlibLoginVO;
 import nlib.user.service.NlibSmsVO;
 
+/**
+ * <pre>
+ * @Class Name : MemberDAO.java
+ * 
+ * @Description : 회원가입 관련 
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ * </pre>
+ *
+ * @ ------------    --------    ---------------------------
+ * @ 수정일                     수정자             수정내용
+ * @ ------------    --------    ---------------------------
+ * @ 2021. 7. 12.    JSYOO       최초 생성
+ *
+ * 
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 12.
+ * @version 1.0
+ *
+ */
+
 @Mapper("memberDAO")
 public interface MemberDAO
 {
-	public DataApiResVO selectMemberJoiningInfo(DataApiReqVO reqVO) throws Exception;
+	/**
-
+	 * 회원가입
-	public DataApiResVO certificateMember(DataApiReqVO reqVO)  throws Exception;
+	 * @param vo
-
+	 * @throws Exception
+	 */
 	public void insertMemberInfo(NlibLoginVO vo) throws Exception;
 
-	public DataApiResVO sendEmailForMemberJoining(DataApiReqVO reqVO)  throws Exception;
+	/**
-
+	 * 비밀번호 변경
-	public DataApiResVO searchId(DataApiReqVO reqVO)  throws Exception;
+	 * @param vo
-
+	 * @throws Exception
-	public DataApiResVO initPassword(DataApiReqVO reqVO) throws Exception;
+	 */
-
 	public void changePassword(NlibLoginVO vo)  throws Exception;
 
-	public DataApiResVO selectMemberInfo(DataApiReqVO reqVO)  throws Exception;
+	/**
-
+	 * 회원가입시 sns 계정 추가 , 기존 계정 ID와 일치시 통합처리시 추가
-	public DataApiResVO updateMemberInfo(DataApiReqVO reqVO)  throws Exception;
+	 * @param oauthUser
-
+	 */
-	public DataApiResVO leaveMember(DataApiReqVO reqVO)  throws Exception;
-
 	public void insertMemberSns(OAuthUniversalUser oauthUser);
 
+	/**
+	 * 회원가입시 SNS인증한 계정 ID와 일치하는 계정이 있는지 체크
+	 * @param oauthUser
+	 * @return
+	 * @throws Exception
+	 */
 	public NlibLoginVO selectAlreadySignUpId(OAuthUniversalUser oauthUser) throws Exception;
 	
+	/**
+	 * 회원가입시 입력한 휴대폰번호와 일치하는 계정이 있는지 체크
+	 * @param loginVO
+	 * @return
+	 * @throws Exception
+	 */
 	public List<NlibLoginVO> selectAlreadySignUpMobile(NlibLoginVO loginVO) throws Exception;
 
+	/**
+	 * SnsId로 기가입자인지 판별
+	 * @param oauthUser
+	 * @return
+	 */
 	public int selectSnsIdCount(OAuthUniversalUser oauthUser);
 
+	/**
+	 * 회원 탈퇴
+	 * @param loginVO
+	 * @throws Exception
+	 */
 	public void deleteMembership(NlibLoginVO loginVO) throws Exception;
 
+	/**
+	 * sms 발송 
+	 * @param smsVO
+	 * @throws Exception
+	 */
 	public void sendSms(NlibSmsVO smsVO) throws Exception;
 }

src/main/java/nlib/user/service/impl/MemberServiceImpl.java

@@ -23,6 +23,28 @@ import nlib.user.service.NlibLoginVO;
 import nlib.user.service.NlibSmsVO;
 import nlib.util.StringUtil;
 
+/**
+ * <pre>
+ * @Class Name : MemberServiceImpl.java
+ * 
+ * @Description : 회원가입 관련 ServiceImpl
+ * 
+ * 
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ * </pre>
+ *
+ * @ ------------    --------    ---------------------------
+ * @ 수정일                     수정자             수정내용
+ * @ ------------    --------    ---------------------------
+ * @ 2021. 7. 12.    JSYOO       최초 생성
+ *
+ * 
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 12.
+ * @version 1.0
+ *
+ */
 @Service("memberService")
 public class MemberServiceImpl implements MemberService
 {
@@ -35,14 +57,11 @@ public class MemberServiceImpl implements MemberService
 	@Resource(name = "ariaCrypto")
     AriaCrypto ariaCrypto;
 
-	public DataApiResVO selectMemberJoiningInfo(DataApiReqVO reqVO)  {
+	/**
-		return null;
+	 * 회원가입
-	}
+	 *  (non-Javadoc)
-
+	 * @see nlib.user.service.MemberService#insertMemberInfo(nlib.user.service.NlibLoginVO)
-	public DataApiResVO certificateMember(DataApiReqVO reqVO)  {
+	 */
-		return null;
-	}
-
 	public void insertMemberInfo(NlibLoginVO vo) throws Exception {
 		//회원정보 암호화
 		String encodedText=null;
@@ -54,34 +73,14 @@ public class MemberServiceImpl implements MemberService
 		
 	}
 
-	public DataApiResVO sendEmailForMemberJoining(DataApiReqVO reqVO)  {
+	/**
-		return null;
+	 * 비밀번호 변경
-	}
+	 *  (non-Javadoc)
-
+	 * @see nlib.user.service.MemberService#changePassword(nlib.user.service.NlibLoginVO)
-	public DataApiResVO searchId(DataApiReqVO reqVO)  {
+	 */
-		return null;
-	}
-
-	public DataApiResVO initPassword(DataApiReqVO reqVO)  {
-		return null;
-	}
-
 	public void changePassword(NlibLoginVO vo) throws Exception  {
 		memberDAO.changePassword(vo);
 	}
-
-	public DataApiResVO selectMemberInfo(DataApiReqVO reqVO)  {
-		return null;
-	}
-
-	public DataApiResVO updateMemberInfo(DataApiReqVO reqVO)  {
-		return null;
-	}
-
-	public DataApiResVO leaveMember(DataApiReqVO reqVO)  {
-		return null;
-	}
-
 	//핸드폰 인증번호 난수 생성
 	/**
      * 전달된 파라미터에 맞게 난수를 생성한다
@@ -205,12 +204,22 @@ public class MemberServiceImpl implements MemberService
        return dummyPW;
     }
     
+	/**
+	 *  회원가입시 SNS인증한 계정 ID와 일치하는 계정이 있는지 체크
+	 * (non-Javadoc)
+	 * @see nlib.user.service.MemberService#selectAlreadySignUpId(egovframework.com.ext.oauth.service.OAuthUniversalUser)
+	 */
 	public NlibLoginVO selectAlreadySignUpId(OAuthUniversalUser oauthUser) throws Exception {
 		//이메일 암호화
 		oauthUser.setSnsEmail(ariaCrypto.encode(oauthUser.getSnsUserId()));
 		return memberDAO.selectAlreadySignUpId(oauthUser);
 	}
 
+	/**
+	 *  회원가입시 sns 계정 추가 , 기존 계정 ID와 일치시 통합처리시 추가
+	 * (non-Javadoc)
+	 * @see nlib.user.service.MemberService#insertMemberSns(egovframework.com.ext.oauth.service.OAuthUniversalUser)
+	 */
 	public void insertMemberSns(OAuthUniversalUser oauthUser) {
 		//사용자 데이터 암호화
 		if(!(StringUtil.getString(oauthUser.getSnsBirthday(),"") == ""))
@@ -222,19 +231,39 @@ public class MemberServiceImpl implements MemberService
 		memberDAO.insertMemberSns(oauthUser);
 	}
 
+	/**
+	 * 회원가입시 입력한 휴대폰번호와 일치하는 계정이 있는지 체크
+	 *  (non-Javadoc)
+	 * @see nlib.user.service.MemberService#selectAlreadySignUpMobile(nlib.user.service.NlibLoginVO)
+	 */
 	public List<NlibLoginVO> selectAlreadySignUpMobile(NlibLoginVO loginVO) throws Exception {
 			loginVO.setMobileNo(ariaCrypto.encode(loginVO.getMobileNo()));
 		return memberDAO.selectAlreadySignUpMobile(loginVO);
 	}
 
+	/**
+	 * SnsId로 기가입자인지 판별
+	 *  (non-Javadoc)
+	 * @see nlib.user.service.MemberService#selectSnsIdCount(egovframework.com.ext.oauth.service.OAuthUniversalUser)
+	 */
 	public int selectSnsIdCount(OAuthUniversalUser oauthUser) {
 		return memberDAO.selectSnsIdCount(oauthUser);
 	}
 
+	/**
+	 * 회원 탈퇴
+	 *  (non-Javadoc)
+	 * @see nlib.user.service.MemberService#deleteMembership(nlib.user.service.NlibLoginVO)
+	 */
 	public void deleteMembership(NlibLoginVO loginVO) throws Exception {
 		memberDAO.deleteMembership(loginVO);
 	}
 
+	/**
+	 * sms 발송 
+	 *  (non-Javadoc)
+	 * @see nlib.user.service.MemberService#sendSms(nlib.user.service.NlibSmsVO)
+	 */
 	public void sendSms(NlibSmsVO smsVO) throws Exception {
 		memberDAO.sendSms(smsVO);
 	}

src/main/java/nlib/user/service/impl/UserInfoServiceImpl.java

@@ -49,14 +49,16 @@ public class UserInfoServiceImpl implements UserInfoService
 	@Resource(name = "ariaCrypto")
     AriaCrypto ariaCrypto;
 	
-    /* 사용자의 SNS 연동 리스트를 조회한다.
+    /**
+     *  사용자의 SNS 연동 리스트를 조회한다.
      * (non-Javadoc)
      * @see nlib.user.service.UserInfoService#selectSnsSignUpList(nlib.user.service.NlibLoginVO)
      */
     public List<OAuthUniversalUser> selectSnsSignUpList(NlibLoginVO vo) throws Exception {
     	return userInfoDAO.selectSnsSignUpList(vo);
     }
-    /* 내 정보를 수정한다.
+    /**
+     *  내 정보를 수정한다.
      * (non-Javadoc)
      * @see nlib.user.service.UserInfoService#updateMyInfo(nlib.user.service.NlibLoginVO)
      */
@@ -67,14 +69,16 @@ public class UserInfoServiceImpl implements UserInfoService
     	userInfoDAO.updateMyInfo(vo);
     }
     
-	/* SNS연동을 해지한다.
+	/**
+	 *  SNS연동을 해지한다.
 	 * (non-Javadoc)
 	 * @see nlib.user.service.UserInfoService#deleteSnsLink(egovframework.com.ext.oauth.service.OAuthUniversalUser)
 	 */
 	public void deleteSnsLink(OAuthUniversalUser oAuthVO) throws Exception {
 		userInfoDAO.deleteSnsLink(oAuthVO);
 	}
-	/* 사용자의 정보를 조회한다.
+	/**
+	 *  사용자의 정보를 조회한다.
 	 * (non-Javadoc)
 	 * @see nlib.user.service.UserInfoService#selectMyInfo(nlib.user.service.NlibLoginVO)
 	 */

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

@@ -61,7 +61,7 @@ import nlib.util.EmailUtil;
  * <pre>
  * @Class Name : MemberController.java
  * 
- * @Description : 
+ * @Description : 회원가입 관련 Controller
  * 
  * 
  * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)

src/main/java/nlib/util/EmailUtil.java

@@ -1,7 +1,6 @@
 package nlib.util;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -9,7 +8,6 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -20,9 +18,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import egovframework.com.cmm.EgovWebUtil;
-import egovframework.com.utl.fcc.service.EgovStringUtil;
-import nlib.bbs.service.impl.QnaServiceImpl;
 import nlib.mail.EmailSender;
 import nlib.mail.service.EmailVO;
 

src/main/resources/egovframework/mapper/nlib/col/RisDAO_SQL.xml

@@ -33,28 +33,4 @@
            ORDER BY ORG_CD
      ]]>
     </select>
-    
-    <!-- <select id="listItems" parameterType="CollectionVO" resultType="CollectionVO">
-    /* CollectionDAO.listItems 소장자료 목록조회 */
-        SELECT 
-            *
-           FROM
-               RG_MASTER RM 
-             WHERE 1=1
-             AND USE_FLAG = "Y"
-           LIMIT #{pageStart},#{pageSize}
-    </select>
-    
-    <select id="countListItems" parameterType="CollectionVO" resultType="Integer">
-    /* CollectionDAO.countListItems 소장자료 목록 개수 조회 */
-        SELECT 
-             COUNT(*)
-           FROM
-               RG_MASTER RM 
-             WHERE 1=1
-             AND USE_FLAG = "Y"
-            <if test='mngOrgCd != null and !mngOrgCd.equals("")'>
-             AND MNG_ORG_CD = #{mngOrgCd}
-            </if>
-    </select> -->
 </mapper>

src/main/resources/egovframework/mapper/nlib/user/MemberDAO_SQL.xml

@@ -2,25 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="nlib.user.service.impl.MemberDAO">
-    <!-- <resultMap type="nlib.user.service.NlibLoginVO" id="NlibLoginVO">
-		<result column="MB_INFO_ID" property="mbInfoId"/>
-		<result column="LOGIN_USER_ID" property="loginUserId"/>
-		<result column="NAME" property="name"/>
-		<result column="PASSWORD" property="password"/>
-		<result column="BIRTHDAY" property="birthday"/>
-		<result column="GENDER" property="gender"/>
-		<result column="REG_ID" property="regId"/>
-		<result column="MOD_ID" property="modId"/>
-		<result column="MOBILE_NO" property="mobileNo"/>
-		<result column="EMAIL" property="email"/>
-		<result column="ZIP_CODE" property="zipCode"/>
-		<result column="ADDRESS" property="address"/>
-		<result column="ADDRESS_DETAIL" property="addressDetail"/>
-		<result column="JOIN_DATE" property="joinDate"/>
-		<result column="IP" property="IP"/>
-		<result column="LAST_ACCESS_DD" property="lastAccessDd"/>
-	</resultMap> -->
-	
 	<!-- 회원가입 -->
     <insert id="insertMemberInfo" parameterType="NlibLoginVO">
         <selectKey keyProperty="mbInfoId,mbNo" resultType="hashmap"  order="BEFORE">