() {
});
-
+
// ID Token만 추출 (사용자의 정보는 jwt로 인코딩 되어있다)
String jwtToken = result.getIdToken();
String requestUrl = UriComponentsBuilder.fromHttpUrl("https://oauth2.googleapis.com/tokeninfo")
@@ -443,4 +484,20 @@ public class MemberController {
rttr.addFlashAttribute("email",kemail);
return "redirect:/member/insertMemberInfoForm.do";
}// end kakaoLogin()
+
+ /**
+ * 주소검색 팝업
+ * @param request
+ * @param response
+ * @param session
+ * @return
+ * @throws Exception
+ */
+ @RequestMapping(value = "/popup/jusoPopup.do")
+ public String jusoPopup(HttpServletRequest request, HttpServletResponse response, HttpSession session)
+ throws Exception {
+
+ return "nlib/popup/jusoPopup";
+ }// end kakaoLogin()
+
}
\ No newline at end of file
diff --git a/src/main/java/nlib/user/web/UserInfoController.java b/src/main/java/nlib/user/web/UserInfoController.java
new file mode 100644
index 00000000..34e6adb0
--- /dev/null
+++ b/src/main/java/nlib/user/web/UserInfoController.java
@@ -0,0 +1,112 @@
+
+package nlib.user.web;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+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.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import egovframework.rte.fdl.cryptography.EgovPasswordEncoder;
+import nlib.restful.service.DataApiReqVO;
+import nlib.security.SecUserVO;
+import nlib.user.service.MemberService;
+import nlib.user.service.NlibLoginVO;
+import nlib.user.service.UserInfoService;
+
+
+/**
+ *
+ * @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 {
+
+ @Resource(name="userInfoService")
+ private UserInfoService userInfoService;
+
+ @Resource(name = "egovEnvPasswordEncoderService")
+ EgovPasswordEncoder egovPasswordEncoder;
+
+ /**
+ * 내 정보 조회
+ * @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(NlibLoginVO vo,HttpServletResponse response,HttpServletRequest request,Authentication authentication,ModelMap model) throws Exception{
+ NlibLoginVO loginVO =userInfoService.selectMyInfo(vo);
+
+ String encodedText=null;
+ encodedText = egovPasswordEncoder.encryptPassword(vo.getUserPwd());
+ vo.setUserPwd(encodedText);
+
+ //암호화된 패스워드 비교
+ if(loginVO.getUserPwd().equals(vo.getUserPwd())) {
+ model.addAttribute("loginVO",loginVO);
+ return "nlib/userInfo/putMyInfo";
+ }else {
+ String message="비밀번호가 잘못되었습니다.";
+ model.addAttribute("message",message);
+ return "nlib/userInfo/pwCertMyInfo";
+ }
+ }
+
+ /**
+ * 내 정보 수정
+ * @return
+ * @exception Exception
+ */
+ @RequestMapping(value="/userInfo/updateMyInfo.ajax" , method=RequestMethod.POST)
+ public @ResponseBody void updateMyInfo(NlibLoginVO vo,HttpServletResponse response,HttpServletRequest request) throws Exception{
+
+ String encodedText=null;
+ encodedText = egovPasswordEncoder.encryptPassword(vo.getUserPwd());
+ vo.setUserPwd(encodedText);
+
+ userInfoService.updateMyInfo(vo);
+ }
+ /**
+ * 내 정보 수정 전 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/java/nlib/user/web/userInfoController.java b/src/main/java/nlib/user/web/userInfoController.java
deleted file mode 100644
index aba95454..00000000
--- a/src/main/java/nlib/user/web/userInfoController.java
+++ /dev/null
@@ -1,77 +0,0 @@
-
-package nlib.user.web;
-
-import java.util.HashMap;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import nlib.restful.service.DataApiReqVO;
-import nlib.security.SecUserVO;
-
-
-/**
- *
- * @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.getUserId());
-
- //회원 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/egovframework/mapper/nlib/user/USER_MEMBER_SQL.xml b/src/main/resources/egovframework/mapper/nlib/user/USER_MEMBER_SQL.xml
new file mode 100644
index 00000000..6841f412
--- /dev/null
+++ b/src/main/resources/egovframework/mapper/nlib/user/USER_MEMBER_SQL.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SELECT CONCAT(LEFT(MAX(USER_ID),2),
+ LPAD(RIGHT(MAX(USER_ID),9)+1,9,0)) FROM TMP_SM_USER;
+
+ INSERT INTO
+ TMP_SM_USER
+ (USER_ID,LOGIN_USER_ID,USER_DIV,USER_NM,USER_PWD,BIRTHDATE,GENDER,TEL_NO,ZIPCODE,ADDR1,ADDR2,REG_ID,MOD_ID)
+ VALUES
+ (#{userId},#{loginUserId},'N',#{userNm},#{userPwd},#{birthdate},#{gender},#{telNo},#{zipcode},#{addr1},#{addr2},#{userId},#{userId})
+
+
+ UPDATE
+ TMP_SM_USER
+ SET
+ USER_PWD=#{userPwd}
+ ,MOD_ID = #{userId}
+ ,MOD_DD = SYSDATE()
+
+ WHERE 1=1
+ AND LOGIN_USER_ID = #{loginUserId}
+ AND TEL_NO = #{telNo}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/egovframework/mapper/nlib/user/USER_USERINFO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/user/USER_USERINFO_SQL.xml
new file mode 100644
index 00000000..3c7ae867
--- /dev/null
+++ b/src/main/resources/egovframework/mapper/nlib/user/USER_USERINFO_SQL.xml
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ UPDATE
+ TMP_SM_USER
+ SET
+ USER_NM=#{userNm}
+ ,USER_PWD=#{userPwd}
+ ,BIRTHDATE=#{birthdate}
+ ,GENDER=#{gender}
+ ,TEL_NO=#{telNo}
+ ,ZIPCODE=#{zipcode}
+ ,ADDR1=#{addr1}
+ ,ADDR2=#{addr2}
+ WHERE 1=1
+ AND USER_ID="U2000000003"
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/egovframework/spring/context-mail.xml b/src/main/resources/egovframework/spring/context-mail.xml
new file mode 100644
index 00000000..d60df14e
--- /dev/null
+++ b/src/main/resources/egovframework/spring/context-mail.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+ true
+ true
+ true
+ smtp.gmail.com
+ TLSv1.2
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties
index 0062fe1f..cb6038af 100644
--- a/src/main/resources/nlib/nlib.properties
+++ b/src/main/resources/nlib/nlib.properties
@@ -55,6 +55,8 @@ fileupload.bbs.qna.subpath = /bbs/qna
# \uba54\uc77c \uacbd\ub85c
mailing.sender.membership.template = C:/iams/workspace/nlib/src/main/webapp/mail/mail_template.html
+mailing.sender.membership.pwdTemplate = C:/iams/workspace/nlib/src/main/webapp/mail/pwd_mail_template.html
+
#\uba54\uc77c \ubcf4\ub0b4\ub294 \uc8fc\uc18c
mailing.sender.membership.email = no-reply@nlib.org
@@ -91,3 +93,8 @@ oauth2.client.provider.naver.token-uri = https://nid.naver.com/oauth2.0/token
oauth2.client.provider.naver.user-info-uri = https://openapi.naver.com/v1/nid/me
oauth2.client.provider.naver.user-name-attribute = response
+
+#----------------------------------------
+# \uc190\ub2d8\uc815\ubcf4
+#----------------------------------------
+guest.userid = GUEST
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 5cfc396e..6790ee2e 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/login/loginForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/login/loginForm.jsp
@@ -40,10 +40,10 @@
@@ -57,7 +57,7 @@
-
+