();
- info.put("id", username);
- reqVO.setInfo(info);
-
- SecUserVO secUserVO = secUserDAO.loadUserByUsername(reqVO);
+ SecUserVO secUserVO = secUserDAO.loadUserByUsername(username);
if(secUserVO == null) {
throw new UsernameNotFoundException(username);
diff --git a/src/main/java/nlib/security/SecUserVO.java b/src/main/java/nlib/security/SecUserVO.java
index 621e56a3..9b2ef352 100644
--- a/src/main/java/nlib/security/SecUserVO.java
+++ b/src/main/java/nlib/security/SecUserVO.java
@@ -7,7 +7,7 @@ import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
-import nlib.user.service.NlibLoginVO;
+import nlib.user.service.UserInfoVO;
/**
*
@@ -31,7 +31,7 @@ import nlib.user.service.NlibLoginVO;
* @version 1.0
*
*/
-public class SecUserVO extends NlibLoginVO implements UserDetails {
+public class SecUserVO extends UserInfoVO implements UserDetails {
private static final long serialVersionUID = -8274004534207618048L;
@@ -39,7 +39,7 @@ public class SecUserVO extends NlibLoginVO implements UserDetails {
public static final String ROLE_ADMIN = "ROLE_ADMIN";
public static final String DEFAULT_ROLE = ROLE_USER;
- ArrayList auth = null;
+ ArrayList auth = null; /* 권한 목록 */
public void addAuthority(String authName) {
if(auth == null) auth = new ArrayList();
@@ -62,16 +62,16 @@ public class SecUserVO extends NlibLoginVO implements UserDetails {
*/
@Override
public String getPassword() {
- return super.getPassword();
+ return super.getUserPwd();
}
- /* 계정의 이름을 리턴한다. (사용자ID:email)
+ /* 계정의 이름을 리턴한다. (사용자ID:email형식의 LOGIN_USER_ID 정보)
* (non-Javadoc)
* @see org.springframework.security.core.userdetails.UserDetails#getUsername()
*/
@Override
public String getUsername() {
- return super.getId();
+ return super.getLoginUserId();
}
/* 계정이 만료되지 않았는 지 여부를 리턴한다. (true: 만료안됨)
@@ -92,7 +92,7 @@ public class SecUserVO extends NlibLoginVO implements UserDetails {
@Override
public boolean isAccountNonLocked() {
- // TODO : 계정잠금 기능 사용안함으로 임시 처리. 추후 구현 필요
+ // SNS 로그인만 허용하므로, 별도 계정 LOCK 기능 불필요
return true;
}
diff --git a/src/main/java/nlib/security/SpringSecurityConfig.java b/src/main/java/nlib/security/SpringSecurityConfig.java
index 731b2acb..dbc0d02a 100644
--- a/src/main/java/nlib/security/SpringSecurityConfig.java
+++ b/src/main/java/nlib/security/SpringSecurityConfig.java
@@ -58,6 +58,7 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
.antMatchers("/inform/**")
.antMatchers("/alert/**")
.antMatchers("/code/**")
+ .antMatchers("/**")
;
}
diff --git a/src/main/java/nlib/user/service/UserInfoVO.java b/src/main/java/nlib/user/service/UserInfoVO.java
new file mode 100644
index 00000000..d469738c
--- /dev/null
+++ b/src/main/java/nlib/user/service/UserInfoVO.java
@@ -0,0 +1,330 @@
+package nlib.user.service;
+
+/**
+ *
+ * @Class Name : UserInfoVO.java
+ *
+ * @Description : 사용자정보 VO 클래스
+ *
+ *
+ * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
+ *
+ *
+ *
+ * @ ------------ -------- ---------------------------
+ * @ 수정일 수정자 수정내용
+ * @ ------------ -------- ---------------------------
+ * @ 2021. 8. 13. KNKIM 최초 생성
+ *
+ *
+ * @author 이씨플라자 * DIGITALSHIP KNKIM
+ * @since 2021. 8. 13.
+ * @version 1.0
+ *
+ */
+public class UserInfoVO {
+
+ private String userId; /* 사용자아이디 (ex: U1000000001) */
+ private String loginUserId; /* 로그인사용자ID (이메일주소) */
+ private String deptSeq; /* 조직코드 */
+ private String userDiv; /* 사용자구분 */
+ private String userNm; /* 사용자명 */
+ private String userPwd; /* 비밀번호 */
+ private String posNm; /* 직위 */
+ private String rank; /* 직급 */
+ private String workFlag; /* 근무여부 */
+ private String telNo; /* 전화번호 */
+ private String zipcode; /* 우편번호 */
+ private String addr1; /* 주소1 */
+ private String addr2; /* 주소2 */
+ private String strtMenuSeq; /* 시작페이지 */
+ private String idCardChkYn; /* 신분증 확인여부 */
+ private String useYn; /* 사용여부 */
+ private String ssoFlag; /* 시스템구분(1:기록관리,2:기관배치) */
+ private String loginErrorCnt; /* 로그인오류건수 */
+ private String onnaraUserid; /* 온나라사용자아이디(웹서비스용) */
+ private String pkiNameCheck; /* 인증서 등록시 이름 체크 구분 */
+ private String ssoKey; /* SSO 인증KEY (SSO를 위한 사용자의 KEY값) */
+ private String regId; /* 등록자 */
+ private String regDd; /* 등록일자 */
+ private String modId; /* 수정자 */
+ private String modDd; /* 수정일자 */
+ private String email; /* 이메일 */
+ private String mobileNo; /* 모바일 */
+ private String websiteAddr; /* 웹사이트 */
+ private String facebookId; /* 페이스북아이디 */
+ private String twitterId; /* 트위터아이디 */
+ private String googleId; /* 구글플러스아이디 */
+ private String boardRowCnt; /* 글목록수 */
+
+ private String authKey; /* 로그인 인증키 */
+
+ //----------------------------------------------------------------
+ // SETTER.GETTER
+ //----------------------------------------------------------------
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getLoginUserId() {
+ return loginUserId;
+ }
+
+ public void setLoginUserId(String loginUserId) {
+ this.loginUserId = loginUserId;
+ }
+
+ public String getDeptSeq() {
+ return deptSeq;
+ }
+
+ public void setDeptSeq(String deptSeq) {
+ this.deptSeq = deptSeq;
+ }
+
+ public String getUserDiv() {
+ return userDiv;
+ }
+
+ public void setUserDiv(String userDiv) {
+ this.userDiv = userDiv;
+ }
+
+ public String getUserNm() {
+ return userNm;
+ }
+
+ public void setUserNm(String userNm) {
+ this.userNm = userNm;
+ }
+
+ public String getUserPwd() {
+ return userPwd;
+ }
+
+ public void setUserPwd(String userPwd) {
+ this.userPwd = userPwd;
+ }
+
+ public String getPosNm() {
+ return posNm;
+ }
+
+ public void setPosNm(String posNm) {
+ this.posNm = posNm;
+ }
+
+ public String getRank() {
+ return rank;
+ }
+
+ public void setRank(String rank) {
+ this.rank = rank;
+ }
+
+ public String getWorkFlag() {
+ return workFlag;
+ }
+
+ public void setWorkFlag(String workFlag) {
+ this.workFlag = workFlag;
+ }
+
+ public String getTelNo() {
+ return telNo;
+ }
+
+ public void setTelNo(String telNo) {
+ this.telNo = telNo;
+ }
+
+ public String getZipcode() {
+ return zipcode;
+ }
+
+ public void setZipcode(String zipcode) {
+ this.zipcode = zipcode;
+ }
+
+ public String getAddr1() {
+ return addr1;
+ }
+
+ public void setAddr1(String addr1) {
+ this.addr1 = addr1;
+ }
+
+ public String getAddr2() {
+ return addr2;
+ }
+
+ public void setAddr2(String addr2) {
+ this.addr2 = addr2;
+ }
+
+ public String getStrtMenuSeq() {
+ return strtMenuSeq;
+ }
+
+ public void setStrtMenuSeq(String strtMenuSeq) {
+ this.strtMenuSeq = strtMenuSeq;
+ }
+
+ public String getIdCardChkYn() {
+ return idCardChkYn;
+ }
+
+ public void setIdCardChkYn(String idCardChkYn) {
+ this.idCardChkYn = idCardChkYn;
+ }
+
+ public String getUseYn() {
+ return useYn;
+ }
+
+ public void setUseYn(String useYn) {
+ this.useYn = useYn;
+ }
+
+ public String getSsoFlag() {
+ return ssoFlag;
+ }
+
+ public void setSsoFlag(String ssoFlag) {
+ this.ssoFlag = ssoFlag;
+ }
+
+ public String getLoginErrorCnt() {
+ return loginErrorCnt;
+ }
+
+ public void setLoginErrorCnt(String loginErrorCnt) {
+ this.loginErrorCnt = loginErrorCnt;
+ }
+
+ public String getOnnaraUserid() {
+ return onnaraUserid;
+ }
+
+ public void setOnnaraUserid(String onnaraUserid) {
+ this.onnaraUserid = onnaraUserid;
+ }
+
+ public String getPkiNameCheck() {
+ return pkiNameCheck;
+ }
+
+ public void setPkiNameCheck(String pkiNameCheck) {
+ this.pkiNameCheck = pkiNameCheck;
+ }
+
+ public String getSsoKey() {
+ return ssoKey;
+ }
+
+ public void setSsoKey(String ssoKey) {
+ this.ssoKey = ssoKey;
+ }
+
+ public String getRegId() {
+ return regId;
+ }
+
+ public void setRegId(String regId) {
+ this.regId = regId;
+ }
+
+ public String getRegDd() {
+ return regDd;
+ }
+
+ public void setRegDd(String regDd) {
+ this.regDd = regDd;
+ }
+
+ public String getModId() {
+ return modId;
+ }
+
+ public void setModId(String modId) {
+ this.modId = modId;
+ }
+
+ public String getModDd() {
+ return modDd;
+ }
+
+ public void setModDd(String modDd) {
+ this.modDd = modDd;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ public String getMobileNo() {
+ return mobileNo;
+ }
+
+ public void setMobileNo(String mobileNo) {
+ this.mobileNo = mobileNo;
+ }
+
+ public String getWebsiteAddr() {
+ return websiteAddr;
+ }
+
+ public void setWebsiteAddr(String websiteAddr) {
+ this.websiteAddr = websiteAddr;
+ }
+
+ public String getFacebookId() {
+ return facebookId;
+ }
+
+ public void setFacebookId(String facebookId) {
+ this.facebookId = facebookId;
+ }
+
+ public String getTwitterId() {
+ return twitterId;
+ }
+
+ public void setTwitterId(String twitterId) {
+ this.twitterId = twitterId;
+ }
+
+ public String getGoogleId() {
+ return googleId;
+ }
+
+ public void setGoogleId(String googleId) {
+ this.googleId = googleId;
+ }
+
+ public String getBoardRowCnt() {
+ return boardRowCnt;
+ }
+
+ public void setBoardRowCnt(String boardRowCnt) {
+ this.boardRowCnt = boardRowCnt;
+ }
+
+ public String getAuthKey() {
+ return authKey;
+ }
+
+ public void setAuthKey(String authKey) {
+ this.authKey = authKey;
+ }
+
+
+}
diff --git a/src/main/java/nlib/user/web/MemberController.java b/src/main/java/nlib/user/web/MemberController.java
index 32498a1f..f2009f32 100644
--- a/src/main/java/nlib/user/web/MemberController.java
+++ b/src/main/java/nlib/user/web/MemberController.java
@@ -174,7 +174,7 @@ public class MemberController {
if(flashMap != null)
{
- vo.setId(String.valueOf(flashMap.get("email")));
+ vo.setLoginUserId(String.valueOf(flashMap.get("email")));
}else {
return "forward:/member/selectMemberJoiningInfo.do";
}
diff --git a/src/main/java/nlib/user/web/userInfoController.java b/src/main/java/nlib/user/web/userInfoController.java
index 3885cf9d..aba95454 100644
--- a/src/main/java/nlib/user/web/userInfoController.java
+++ b/src/main/java/nlib/user/web/userInfoController.java
@@ -57,7 +57,7 @@ public class userInfoController {
SecUserVO vo=(SecUserVO) authentication.getPrincipal();
HashMap map = new HashMap();
- map.put("id", vo.getId());
+ map.put("id", vo.getUserId());
//회원 ID로 회원의 정보를 조회해온다.
DataApiReqVO reqvo=new DataApiReqVO();
diff --git a/src/main/resources/egovframework/spring/context-aspect.xml b/src/main/resources/egovframework/spring/context-aspect.xml
index c7828abd..497183e1 100644
--- a/src/main/resources/egovframework/spring/context-aspect.xml
+++ b/src/main/resources/egovframework/spring/context-aspect.xml
@@ -6,7 +6,10 @@
+ execution(* nlib..impl.*Impl.*(..)) or
+ execution(* cmm..impl.*Impl.*(..)) or
+ execution(* kccf..impl.*Impl.*(..))
+ " />
diff --git a/src/main/resources/egovframework/spring/context-oauth.xml b/src/main/resources/egovframework/spring/context-oauth.xml
new file mode 100644
index 00000000..1d920758
--- /dev/null
+++ b/src/main/resources/egovframework/spring/context-oauth.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/config/egovframework/springmvc/dispatcher-servlet.xml b/src/main/webapp/WEB-INF/config/egovframework/springmvc/dispatcher-servlet.xml
index 92966eb0..af994099 100644
--- a/src/main/webapp/WEB-INF/config/egovframework/springmvc/dispatcher-servlet.xml
+++ b/src/main/webapp/WEB-INF/config/egovframework/springmvc/dispatcher-servlet.xml
@@ -7,7 +7,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd">
-
+