org.apache.tiles
diff --git a/src/main/java/nlib/info/service/impl/InformDAO.java b/src/main/java/nlib/info/service/impl/InformDAO.java
index e373b150..e949654d 100644
--- a/src/main/java/nlib/info/service/impl/InformDAO.java
+++ b/src/main/java/nlib/info/service/impl/InformDAO.java
@@ -13,8 +13,9 @@ public class InformDAO
{
private static final Logger log = LoggerFactory.getLogger(InformDAO.class);
- public DataApiResVO selectInform(DataApiReqVO reqVO) {
- return null;
+ public DataApiResVO selectTermsInform(DataApiReqVO reqVO) {
+ DataApiResVO resVO = new DataApiResVO();
+ return resVO;
}
diff --git a/src/main/java/nlib/info/service/impl/InformServiceImpl.java b/src/main/java/nlib/info/service/impl/InformServiceImpl.java
index 60f7af39..5b5ebbf7 100644
--- a/src/main/java/nlib/info/service/impl/InformServiceImpl.java
+++ b/src/main/java/nlib/info/service/impl/InformServiceImpl.java
@@ -1,6 +1,8 @@
package nlib.info.service.impl;
+import java.util.HashMap;
+
import javax.annotation.Resource;
import org.slf4j.Logger;
@@ -21,7 +23,16 @@ public class InformServiceImpl implements InformService
public DataApiResVO selectTermsInfo(DataApiReqVO reqVO) {
- return null;
+
+ DataApiResVO resVO= informDAO.selectTermsInform(reqVO);
+
+ /*
+ * 테스트 데이터
+ * */
+ HashMap map = new HashMap();
+ map.put("terms", "이용약관입니다~");
+ resVO.setInfo(map);
+ return resVO;
}
public DataApiResVO selectPrivacyInfo(DataApiReqVO reqVO) {
diff --git a/src/main/java/nlib/info/web/InformController.java b/src/main/java/nlib/info/web/InformController.java
index 61a5c7a8..d866525a 100644
--- a/src/main/java/nlib/info/web/InformController.java
+++ b/src/main/java/nlib/info/web/InformController.java
@@ -11,23 +11,27 @@ import org.springframework.ui.ModelMap;
import nlib.info.service.InformService;
import nlib.info.service.impl.InformServiceImpl;
-
/**
- * Description :
- * @author
- * @since
- * @version
- * @see
- *
*
- * << Modification Information >>
- *
- * Date Modifier Expression
- * ------- -------- ---------------------------
- *
+ * @Class Name : InformController.java
+ *
+ * @Description :
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 7. 12. JSYOO 최초 생성
*
*
- *
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 12.
+ * @version 1.0
+ *
*/
@Controller
public class InformController
diff --git a/src/main/java/nlib/security/SpringSecurityConfig.java b/src/main/java/nlib/security/SpringSecurityConfig.java
index c91a8a6b..2f0a2316 100644
--- a/src/main/java/nlib/security/SpringSecurityConfig.java
+++ b/src/main/java/nlib/security/SpringSecurityConfig.java
@@ -59,6 +59,10 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
http.authorizeRequests()
.antMatchers("/login/login*.do").permitAll()
.antMatchers("/login/logout*.do").permitAll()
+ .antMatchers("/login/naver*.do").permitAll()
+ .antMatchers("/member/*.do").permitAll()
+ .antMatchers("/member/*.ajax").permitAll()
+ .antMatchers("/userInfo/*.do").permitAll()
.antMatchers("/info/inform/*.do").permitAll()
.antMatchers("/").permitAll()
.antMatchers("/index.jsp").permitAll()
diff --git a/src/main/java/nlib/user/service/NlibLoginVO.java b/src/main/java/nlib/user/service/NlibLoginVO.java
index a66714f4..0cda205d 100644
--- a/src/main/java/nlib/user/service/NlibLoginVO.java
+++ b/src/main/java/nlib/user/service/NlibLoginVO.java
@@ -2,6 +2,28 @@ package nlib.user.service;
import java.io.Serializable;
+/**
+ *
+ * @Class Name : NlibLoginVO.java
+ *
+ * @Description : 로그인VO
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 7. 12. JSYOO 최초 생성
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 12.
+ * @version 1.0
+ *
+ */
public class NlibLoginVO implements Serializable {
/**
@@ -37,9 +59,29 @@ public class NlibLoginVO implements Serializable {
private String ip;
/** GPKI인증 DN */
private String dn;
- /** authkey */
+
+ /** 인증키 */
private String authKey;
-
+ /** 페이지번호 */
+ private String page;
+ /** 게시물 수 */
+ private String rows;
+ /** 핸드폰 번호 */
+ private String phone;
+ /** 우편번호 */
+ private String zipNo;
+ /** 도로명주소 */
+ private String roadAddrPart;
+ /** 상세주소 */
+ private String addrDetail;
+ /** 생년월일 */
+ private String birthday;
+ /** 생일 년도 */
+ private String birth_yy;
+ /** 생일 월 */
+ private String birth_mm;
+ /** 생일 날짜 */
+ private String birth_dd;
public String getAuthKey() {
return authKey;
@@ -48,6 +90,66 @@ public class NlibLoginVO implements Serializable {
this.authKey = authKey;
}
+ public String getPage() {
+ return page;
+ }
+ public void setPage(String page) {
+ this.page = page;
+ }
+ public String getRows() {
+ return rows;
+ }
+ public void setRows(String rows) {
+ this.rows = rows;
+ }
+ public String getPhone() {
+ return phone;
+ }
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+ public String getZipNo() {
+ return zipNo;
+ }
+ public void setZipNo(String zipNo) {
+ this.zipNo = zipNo;
+ }
+ public String getRoadAddrPart() {
+ return roadAddrPart;
+ }
+ public void setRoadAddrPart(String roadAddrPart) {
+ this.roadAddrPart = roadAddrPart;
+ }
+ public String getAddrDetail() {
+ return addrDetail;
+ }
+ public void setAddrDetail(String addrDetail) {
+ this.addrDetail = addrDetail;
+ }
+ public String getBirthday() {
+ return birthday;
+ }
+ public void setBirthday(String birthday) {
+ this.birthday = birthday;
+ }
+ public String getBirth_yy() {
+ return birth_yy;
+ }
+ public void setBirth_yy(String birth_yy) {
+ this.birth_yy = birth_yy;
+ }
+ public String getBirth_mm() {
+ return birth_mm;
+ }
+ public void setBirth_mm(String birth_mm) {
+ this.birth_mm = birth_mm;
+ }
+ public String getBirth_dd() {
+ return birth_dd;
+ }
+ public void setBirth_dd(String birth_dd) {
+ this.birth_dd = birth_dd;
+ }
/**
* id attribute 를 리턴한다.
* @return String
diff --git a/src/main/java/nlib/user/web/LoginController.java b/src/main/java/nlib/user/web/LoginController.java
index b1bd29bb..daf02b4e 100644
--- a/src/main/java/nlib/user/web/LoginController.java
+++ b/src/main/java/nlib/user/web/LoginController.java
@@ -4,6 +4,7 @@ package nlib.user.web;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -120,5 +121,16 @@ public class LoginController
public String logout(HttpServletRequest req) {
return null;
}
-
+
+ /**
+ * 네이버 로그인
+ * @param session
+ * @return
+ * @throws Exception
+ */
+ @RequestMapping(value="/login/naverLoginResultPopup.do")
+ public String naverLoginResult(HttpSession session) throws Exception{
+
+ return "nlib/popup/naverLoginResultPopup";
+ }
}
\ No newline at end of file
diff --git a/src/main/java/nlib/user/web/MemberController.java b/src/main/java/nlib/user/web/MemberController.java
index 922b64b1..05d68f1b 100644
--- a/src/main/java/nlib/user/web/MemberController.java
+++ b/src/main/java/nlib/user/web/MemberController.java
@@ -1,21 +1,79 @@
package nlib.user.web;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+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.List;
+import java.util.Random;
+
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import nlib.info.service.InformService;
+import nlib.restful.service.DataApiReqVO;
+import nlib.restful.service.DataApiResVO;
import nlib.user.service.MemberService;
+import nlib.user.service.NlibLoginVO;
+/**
+ *
+ * @Class Name : MemberController.java
+ *
+ * @Description :
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 7. 12. JSYOO 최초 생성
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 12.
+ * @version 1.0
+ *
+ */
@Controller
-public class MemberController
-{
+public class MemberController {
@Resource(name="memberService")
private MemberService memberService;
+
+ @Resource(name="informService")
+ private InformService informService;
-
+ /* 이메일 메시지 및 템플릿 정보 */
+ //템플릿 파일경로
+ @Value("#{properties['mailing.sender.membership.template']}")
+ private String template;
+
+ //보내는 사람 이메일주소
+ @Value("#{properties['mailing.sender.membership.email']}")
+ private String senderAddr;
+
+ //보내는 사람 이름
+ @Value("#{properties['mailing.sender.membership.name']}")
+ private String senderName;
+
public ModelMap selectMemberJoiningInfo(HttpServletRequest req) {
return null;
}
@@ -24,10 +82,6 @@ public class MemberController
return null;
}
- public ModelMap insertMemberInfoForm(HttpServletRequest req) {
- return null;
- }
-
public ModelMap insertMemberInfo(HttpServletRequest req) {
return null;
}
@@ -67,6 +121,169 @@ public class MemberController
public ModelMap leaveMember(HttpServletRequest req) {
return null;
}
-
-
+
+ @RequestMapping(value="/member/naverSignResultPopup.do")
+ public String naverSignResult(HttpSession session) throws Exception{
+ return "nlib/popup/naverSignResultPopup";
+ }
+
+ @RequestMapping(value="/member/selectMemberJoiningInfo.do")
+ public String selectMemberJoiningInfo(HttpServletRequest req,ModelMap model) {
+ DataApiReqVO reqVO = new DataApiReqVO();
+ DataApiResVO resVO = new DataApiResVO();
+ resVO = informService.selectTermsInfo(reqVO);
+ System.out.println(resVO.getInfo().get("terms"));
+ model.addAttribute("result",resVO);
+ return "/nlib/member/selectMemberJoiningInfo";
+ }
+
+ @RequestMapping(value="/member/snsCertForm.do")
+ public String snsCertForm(HttpSession session) throws Exception{
+ return "nlib/member/snsCertForm";
+ }
+
+ @RequestMapping(value="/member/insertMemberInfoForm.do")
+ public String insertMemberInfoForm(NlibLoginVO vo,HttpSession session,ModelMap model ) throws Exception{
+ model.addAttribute("loginVO",vo);
+ return "nlib/member/insertMemberInfoForm";
+ }
+
+ @RequestMapping(value="/member/insertMemberInfo.do")
+ public String insertMemberInfo(@RequestParam HashMap commandMap ) throws Exception{
+ DataApiReqVO reqVO = new DataApiReqVO();
+ reqVO.setInfo(commandMap);
+
+ // 통합시스템에 등록처리 요청 (data insert)
+
+
+ // 결과가 정상이면, 안내 메일 발송
+ // > 템플릿파일에서 내용 mailing.sender.membership.template
+ // > 치환 (사용자명, 이메일주소)
+ // > 발송처리 요청
+ Path path = Paths.get(template);
+ Charset cs = StandardCharsets.UTF_8;
+ List list = new ArrayList();
+ String contents = "";
+ try {
+ list = Files.readAllLines(path,cs);
+ }catch(IOException e) {
+ e.printStackTrace();
+ }
+
+ for(String readLine : list) {
+ contents+=readLine;
+ }
+ contents=contents.replaceAll("[$]\\{userName\\}","유종선");
+ System.out.println(contents);
+ return "nlib/member/insertMemberInfoResult";
+ }
+
+ /**
+ * 핸드폰 인증번호 발송
+ * @exception Exception
+ */
+ @RequestMapping(value="/member/phoneCertNum.ajax" , method=RequestMethod.POST)
+ public @ResponseBody void phoneCertNum(HttpServletResponse response,HttpServletRequest request) throws Exception{
+ String phone = request.getParameter("phone");
+
+ HashMap commandMap = new HashMap();
+ DataApiReqVO reqVO = new DataApiReqVO();
+
+ //인증번호
+ String CertNumber=numberGen(6,1);
+
+ commandMap.put("CertNumber",CertNumber);
+
+ reqVO.setInfo(commandMap);
+
+ System.out.println(phone);
+ System.out.println(CertNumber);
+
+ }
+
+ /**
+ * 핸드폰 인증번호 확인
+ * @exception Exception
+ */
+ @RequestMapping(value="/member/phoneCertNumChk.ajax" , method=RequestMethod.POST)
+ public @ResponseBody String phoneCertNumChk(HttpServletResponse response,HttpServletRequest request) throws Exception{
+ String phone = request.getParameter("phone");
+ String phoneCertNum = request.getParameter("phoneCertNum");
+
+ HashMap commandMap = new HashMap();
+ commandMap.put("phone", phone);
+ commandMap.put("phoneCertNum", phoneCertNum);
+ DataApiReqVO reqVO = new DataApiReqVO();
+
+ reqVO.setInfo(commandMap);
+
+ System.out.println(phone);
+ System.out.println(phoneCertNum);
+
+ return "true";
+ }
+
+ /**
+ * 전달된 파라미터에 맞게 난수를 생성한다
+ * @param len : 생성할 난수의 길이
+ * @param dupCd : 중복 허용 여부 (1: 중복허용, 2:중복제거)
+ *
+ */
+ public static String numberGen(int len, int dupCd ) {
+
+ Random rand = new Random();
+ String numStr = ""; //난수가 저장될 변수
+
+ for(int i=0;i
+ * @Class Name : userInfoController.java
+ *
+ * @Description : 회원 정보 controller
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 7. 14. JSYOO 최초 생성
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 14.
+ * @version 1.0
+ *
+ */
+@Controller
+public class userInfoController {
+ /**
+ * 내 정보 조회
+ * @exception Exception
+ */
+ @RequestMapping(value="/userInfo/getMyInfo.do")
+ public String getMyInfo(HttpServletResponse response,HttpServletRequest request) throws Exception{
+ return "nlib/userInfo/getMyInfo";
+ }
+
+ /**
+ * 내 정보 수정
+ * @exception Exception
+ */
+ @RequestMapping(value="/userInfo/putMyInfo.do")
+ public String putMyInfo(HttpServletResponse response,HttpServletRequest request,Authentication authentication,ModelMap model) throws Exception{
+ SecUserVO vo=(SecUserVO) authentication.getPrincipal();
+
+ HashMap map = new HashMap();
+ map.put("id", vo.getId());
+
+ //회원 ID로 회원의 정보를 조회해온다.
+ DataApiReqVO reqvo=new DataApiReqVO();
+ reqvo.setInfo(map);
+
+ model.addAttribute("result",vo);
+ return "nlib/userInfo/putMyInfo";
+ }
+ /**
+ * 내 정보 수정 전 password 인증
+ * @exception Exception
+ */
+ @RequestMapping(value="/userInfo/pwCertMyInfo.do")
+ public String pwCertMyInfo(HttpServletResponse response,HttpServletRequest request) throws Exception{
+ return "nlib/userInfo/pwCertMyInfo";
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties
index 6a69e32b..1f8e6eb0 100644
--- a/src/main/resources/nlib/nlib.properties
+++ b/src/main/resources/nlib/nlib.properties
@@ -33,3 +33,7 @@ dataapi.temp.xml.path = C:/iams/workspace/nlib/data/dataxml
# Aria \uc54c\uace0\ub9ac\uc998
crypto.aria.defaultKey = TheFederationOfKoreaCultureCenter027042322
+# \uba54\uc77c \uc815\ubcf4
+mailing.sender.membership.template = C:/iams/workspace/nlib/src/main/webapp/mail_template.html
+mailing.sender.membership.email = no-reply@nlib.org
+mailing.sender.membership.name = Nlib
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/login/loginForm.jsp b/src/main/webapp/WEB-INF/jsp/nlib/login/loginForm.jsp
index 19a4fb77..8590bac3 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/login/loginForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/login/loginForm.jsp
@@ -1,9 +1,9 @@
<%
/**
*
- * @Class Name : getSampleInfo.jsp
+ * @Class Name : loginForm.jsp
*
- * @Description : RESTful API 호출 샘플
+ * @Description : 로그인폼
*
*
* @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
@@ -13,11 +13,11 @@
* @ ------------ -------- ---------------------------
* @ 수정일 수정자 수정내용
* @ ------------ -------- ---------------------------
- * @ 2021. 6. 15. KNKIM 최초 생성
+ * @ 2021. 7. 12. JSYOO 최초 생성
*
*
- * @author 이씨플라자 * DIGITALSHIP KNKIM
- * @since 2021. 6. 15.
+ * @author 이씨플라자 * DIGITALSHIP JSYOO
+ * @since 2021. 7. 12.
* @version 1.0
*
*/
@@ -33,38 +33,135 @@
-${pageTitle}
-
-
-
-
-
-
-
-
+LoginTest
+
+
+
+
+
-
-
- 로그인 페이지입니다.
- error:
- logout:
-
-
-
-
+로그인
+
+
+
+
+
+
-
+