xit-app
/
external-system-test
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor : 유저 테이블 변경

Browse Source
main
이범준 1 year ago
parent ebbf4bdce2
commit 9a6de6f1bc
37 changed files with 111 additions and 197 deletions
Show Stats Download Patch File Download Diff File

10
src/main/java/kr/xit/fims/framework/biz/cmm/XitBbsVO.java
Unescape Escape View File

@ -34,7 +34,7 @@ public class XitBbsVO extends BaseVO {
protected String ntce_end_de; //게시 종료 일
protected String ntcr_id; //게시자 id
protected String ntcr_nm; //게시자 명
protected String password; //비밀번호
protected String passwd; //비밀번호
protected String atch_file_id; //첨부 파일 id
protected String reg_dt; //최초 등록 시점
protected String rgtr; //최초 등록자 id
@ -132,11 +132,11 @@ public class XitBbsVO extends BaseVO {
public void setNtcr_nm(String ntcr_nm) {
this.ntcr_nm = ntcr_nm;
}
public String getPassword() {
return password;
public String getPasswd() {
return passwd;
}
public void setPassword(String password) {
this.password = password;
public void setPasswd(String passwd) {
this.passwd = passwd;
}
public String getAtch_file_id() {
return atch_file_id;

4
src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java
Unescape Escape View File

@ -27,7 +27,7 @@ public class XitLoginVO implements Serializable{
/** 이메일주소 */
private String email;
/** 비밀번호 */
private String password;
private String passwd;
/** 비밀번호 힌트 */
private String passwdHint;
/** 비밀번호 정답 */
@ -86,7 +86,7 @@ public class XitLoginVO implements Serializable{
XitUserInfoVO vo = (XitUserInfoVO)obj;
this.id = vo.getUserId();
this.name = vo.getUserNm();
this.password = vo.getPassword();
this.passwd = vo.getPasswd();
this.email = vo.getEmlAdrs();
this.userSe = USER_SE.USR.name();
this.orgId = vo.getOrgId();

2
src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java
Unescape Escape View File

@ -244,7 +244,7 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF
case USR: // 업무사용자
XitUserInfoVO userUsrVO = new XitUserInfoVO();
userUsrVO.setUserId(id);
userUsrVO.setPassword(password);
userUsrVO.setPasswd(password);
xitFrameCrudService.modifyXitUserInfo(userUsrVO);
break;
default:

8
src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitLoginServiceBean.java
Unescape Escape View File

@ -61,11 +61,11 @@ public class XitLoginServiceBean extends AbstractServiceBean implements XitLogin
if(loginVO == null)
throw new RuntimeException("회원의 상태가 승인대기(or삭제) 이거나 등록되지 않은 회원 입니다.");
//비밀번호 확인
String enpassword = XitScrtyUtil.encryptPassword(vo.getPassword(), vo.getId());
if(!loginVO.getPassword().equals(enpassword))
String enpassword = XitScrtyUtil.encryptPassword(vo.getPasswd(), vo.getId());
if(!loginVO.getPasswd().equals(enpassword))
return new XitLoginVO();
//ID 또는 Password 공백 여부 확인
if(XitCmmnUtil.isEmpty(loginVO.getId()) || XitCmmnUtil.isEmpty(loginVO.getPassword()))
if(XitCmmnUtil.isEmpty(loginVO.getId()) || XitCmmnUtil.isEmpty(loginVO.getPasswd()))
return new XitLoginVO();
//로그인정책 확인
XitLoginPolicyVO loginPolicyVO = new XitLoginPolicyVO();
@ -245,7 +245,7 @@ public class XitLoginServiceBean extends AbstractServiceBean implements XitLogin
break;
}
//신규 비밀번호 Set
vo.setPassword(newpassword);
vo.setPasswd(newpassword);
// 임시 비밀번호를 이메일 발송한다.(메일연동솔루션 활용 시)
//SndngMailVO sndngMailVO = new SndngMailVO();

8
src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitSessionMapping.java
Unescape Escape View File

@ -45,11 +45,11 @@ public class XitSessionMapping extends EgovUsersByUsernameMapping {
* -"인증에 사용되는 사용자정보 조회 질의문" 조회 결과
*/
String strUserId = rs.getString("user_id");
String strPassWord = rs.getString("password");
String strPassWd = rs.getString("passwd");
boolean strEnabled = rs.getBoolean("enabled");
String strUserNm = rs.getString("user_nm");
String strUserSe = rs.getString("user_se");
String strUserEmail = rs.getString("user_email");
String strUserEmail = rs.getString("eml_adrs");
String strOrgId = rs.getString("org_id");
String strGrpId = rs.getString("grp_id");
String strNsttCd = rs.getString("nstt_cd");
@ -67,7 +67,7 @@ public class XitSessionMapping extends EgovUsersByUsernameMapping {
*/
XitLoginVO loginVO = new XitLoginVO();
loginVO.setId(strUserId); //아이디
loginVO.setPassword(strPassWord); //비밀번호
loginVO.setPasswd(strPassWd); //비밀번호
loginVO.setName(strUserNm); //이름
loginVO.setUserSe(strUserSe); //사용자구분
loginVO.setEmail(strUserEmail); //이메일주소
@ -81,6 +81,6 @@ public class XitSessionMapping extends EgovUsersByUsernameMapping {
loginVO.setElctrnsanctnUseYn(strElctrnsanctnUseYn); //전자결재 사용 여부
loginVO.setJobConfmAuthorYn(strJobConfmAuthorYn); //업무 승인 권한 여부
return new EgovUserDetails(strUserId, strPassWord, strEnabled, loginVO);
return new EgovUserDetails(strUserId, strPassWd, strEnabled, loginVO);
}
}

10
src/main/java/kr/xit/fims/framework/biz/cmm/web/XitLoginController.java
Unescape Escape View File

@ -391,7 +391,7 @@ public class XitLoginController extends AbstractController {
model.addAttribute("result", result?"Y":"N");
model.addAttribute("message", message);
model.addAttribute("failDetail", failDetail);
model.addAttribute("temp_pwd", vo.getPassword());
model.addAttribute("temp_pwd", vo.getPasswd());
sLocationUrl = "forward:/login/findPwdPopup/result.do";
break;
@ -483,13 +483,13 @@ public class XitLoginController extends AbstractController {
class RequestWrapperForSecurity extends HttpServletRequestWrapper {
private String username = null;
private String password = null;
private String passwd = null;
public RequestWrapperForSecurity(HttpServletRequest request, String username, String password) {
public RequestWrapperForSecurity(HttpServletRequest request, String username, String passwd) {
super(request);
this.username = username;
this.password = password;
this.passwd = passwd;
}
@Override
@ -509,7 +509,7 @@ class RequestWrapperForSecurity extends HttpServletRequestWrapper {
}
if (name.equals("xit_security_password")) {
return password;
return passwd;
}
return super.getParameter(name);

11
src/main/java/kr/xit/fims/framework/biz/cmm/web/XitMainController.java
Unescape Escape View File

@ -73,18 +73,11 @@ public class XitMainController extends AbstractController {
XitLoginVO user = EgovUserDetailsHelper.isAuthenticated()? (XitLoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
if(EgovUserDetailsHelper.isAuthenticated() && user!=null){
// menuManageVO.setTmp_Id(user.getId());
// menuManageVO.setTmp_Password(user.getPassword());
// menuManageVO.setTmp_UserSe(user.getUserSe());
// menuManageVO.setTmp_Name(user.getName());
// menuManageVO.setTmp_Email(user.getEmail());
// menuManageVO.setTmp_OrgId(user.getOrgId());
// menuManageVO.setTmp_UniqId(user.getUniqId());
model.addAttribute("list_headmenu", xitMainService.findMainMenuHeads(user.getUniqId()));
model.addAttribute("list_menulist", xitMainService.findtMainMenuLefts(user.getUniqId()));
}else{
//model.addAttribute("list_headmenu", menuManageService.selectMainMenuHeadAnonymous(menuManageVO));
//model.addAttribute("list_menulist", menuManageService.selectMainMenuLeftAnonymous(menuManageVO));
}
return "framework/egov/main/inc/EgovIncTopnav"; // 내부업무의 상단메뉴 화면
}

2
src/main/java/kr/xit/fims/framework/biz/cmm/web/XitTestController.java
Unescape Escape View File

@ -218,7 +218,7 @@ public class XitTestController extends AbstractController {
String newPassword = XitScrtyUtil.encryptPassword("1", userInfoVO.getUserId());
vo = new XitUserInfoVO();
vo.setUserId(userInfoVO.getUserId());
vo.setPassword(newPassword);
vo.setPasswd(newPassword);
xitFrameCrudService.modifyXitUserInfo(vo);
}

2
src/main/java/kr/xit/fims/framework/biz/mng/bbs/XitBasicBbsMngVO.java
Unescape Escape View File

@ -88,7 +88,7 @@ public class XitBasicBbsMngVO {
/**
* 비밀번호
*/
private String password;
private String passwd;
/**
* 첨부 파일 ID
*/

2
src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/XitBasicBbsMngServiceBean.java
Unescape Escape View File

@ -212,7 +212,7 @@ public class XitBasicBbsMngServiceBean extends AbstractServiceBean implements Xi
crudVO.setNtce_end_de(String.valueOf(vo.getAtchPosblFileNumber())); //게시 종료 일
crudVO.setNtcr_id(vo.getNtcrId()); //게시자 id
crudVO.setNtcr_nm(vo.getNtcrNm()); //게시자 명
crudVO.setPassword(vo.getPassword()); //비밀번호
crudVO.setPasswd(vo.getPasswd()); //비밀번호
crudVO.setAtch_file_id(vo.getAtchFileId()); //첨부 파일 id
return crudVO;

18
src/main/java/kr/xit/fims/framework/biz/mng/menu/MenuListMngVO.java
Unescape Escape View File

@ -51,8 +51,7 @@ public class MenuListMngVO {
/** Login 메뉴관련 VO변수 */
/** tmp_Id */
private String tmp_Id;
/** tmp_Password */
private String tmp_Password;
/** tmp_Name */
private String tmp_Name;
/** tmp_UserSe */
@ -221,20 +220,7 @@ public class MenuListMngVO {
public void setTmp_Id(String tmp_Id) {
this.tmp_Id = tmp_Id;
}
/**
* tmp_Password attribute를 리턴한다.
* @return String
*/
public String getTmp_Password() {
return tmp_Password;
}
/**
* tmp_Password attribute 값을 설정한다.
* @param tmp_Password String
*/
public void setTmp_Password(String tmp_Password) {
this.tmp_Password = tmp_Password;
}
/**
* tmp_Name attribute를 리턴한다.
* @return String

3
src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java
Unescape Escape View File

@ -27,8 +27,7 @@ public class XitUserInfoVO extends XitUserEtcOptionVO {
// protected String user_id; //사용자 id
protected String orgId; //조직 id
protected String userNm; //사용자 명
protected String password; //비밀번호
protected String password2; //비밀번호
protected String passwd; //비밀번호
protected String empNo; //사원 번호
protected String gender; //성별 코드
protected String brdt; //생일

2
src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserRegMngVO.java
Unescape Escape View File

@ -111,7 +111,7 @@ public class XitUserRegMngVO extends BaseVO {
/**
* 비밀번호
*/
private String password;
private String passwd;
/**
* 비밀번호 정답
*/

6
src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java
Unescape Escape View File

@ -68,7 +68,7 @@ public class UserMgtServiceBean extends AbstractServiceBean implements UserMgtSe
vo.setUserId(vo.getEmplyrId()); //사용자 id
vo.setUserNm(vo.getEmplyrNm()); //사용자 명
try {
vo.setPassword(XitScrtyUtil.encryptPassword(vo.getPassword(), vo.getEmplyrId()));
vo.setPasswd(XitScrtyUtil.encryptPassword(vo.getPasswd(), vo.getEmplyrId()));
} catch (Exception e) {
throw BizRuntimeException.create(MessageKey.CUSTOM_MSG, String.format("비밀번호 암호화 실패:: %s", e.getMessage()));
}
@ -301,7 +301,7 @@ public class UserMgtServiceBean extends AbstractServiceBean implements UserMgtSe
throw new RuntimeException(String.format("비밀번호 암호화 실패:: %s", e.getMessage()));
}
//비밀번호 동일 여부
if (vo.getPassword().equals(encryptPass)) {
if (vo.getPasswd().equals(encryptPass)) {
//신 비밀번호/비밀번호 확인 동일 여부
if (!newPassword.equals(newPassword2)) {
throw new RuntimeException(xitMessageSource.getMessage("fail.user.passwordUpdate2"));
@ -316,7 +316,7 @@ public class UserMgtServiceBean extends AbstractServiceBean implements UserMgtSe
*/
XitUserInfoVO xitUserInfoVO = new XitUserInfoVO();
xitUserInfoVO.setUserId(id);
xitUserInfoVO.setPassword(encryptNewPass);
xitUserInfoVO.setPasswd(encryptNewPass);
/**

74
src/main/resources/spring/service/context-security.xml
Unescape Escape View File

@ -32,71 +32,7 @@
<!-- swagger2 set -->
<!-- <security:http pattern="/webjars/springfox-swagger-ui/*.{js,css}" security="none"/>-->
<!-- 전자정부 프레임워크 사용 시 -->
<!-- <egov-security:config id="securityConfig" -->
<!-- loginUrl="/uat/uia/actionSecurityLogin.do" -->
<!-- logoutSuccessUrl="/uat/uia/actionMain.do" -->
<!-- loginFailureUrl="/uat/uia/actionSecurityLogin.do?login_error=1" -->
<!-- accessDeniedUrl="/sec/ram/accessDenied.do" -->
<!-- dataSource="egov.dataSource" -->
<!-- jdbcUsersByUsernameQuery="/** 인증에 사용되는 사용자정보 조회 질의문 */ -->
<!-- SELECT USER_ID -->
<!-- , ESNTL_ID AS PASSWORD -->
<!-- , 1 ENABLED -->
<!-- , USER_NM -->
<!-- , USER_ZIP -->
<!-- , USER_ADRES -->
<!-- , USER_EMAIL -->
<!-- , USER_SE -->
<!-- , '-' ORG_ID -->
<!-- , ESNTL_ID -->
<!-- , '-' ORGNZT_NM -->
<!-- FROM COMVNUSERMASTER -->
<!-- WHERE CONCAT(USER_SE, USER_ID) = ?" -->
<!-- jdbcAuthoritiesByUsernameQuery=" -->
<!-- /** 인증된 사용자의 권한(authority) 조회 질의문 */ -->
<!-- SELECT A.SCRTY_DTRMN_TRGET_ID USER_ID -->
<!-- , A.AUTHOR_CODE AUTHORITY -->
<!-- FROM LETTNEMPLYRSCRTYESTBS A -->
<!-- , COMVNUSERMASTER B -->
<!-- WHERE A.SCRTY_DTRMN_TRGET_ID = B.ESNTL_ID -->
<!-- AND B.USER_ID = ?" -->
<!-- jdbcMapClass="framework.egov.let.uat.uia.service.impl.EgovSessionMapping" -->
<!-- requestMatcherType="regex" -->
<!-- hash="plaintext" -->
<!-- hashBase64="false" -->
<!-- concurrentMaxSessons="2" -->
<!-- concurrentExpiredUrl="/uat/uia/actionMain.do" -->
<!-- defaultTargetUrl="/uat/uia/actionMain.do" -->
<!-- /> -->
<!-- <egov-security:secured-object-config id="securedObjectConfig" -->
<!-- sqlHierarchicalRoles=" -->
<!-- SELECT a.CHLDRN_ROLE child, a.PARNTS_ROLE parent -->
<!-- FROM LETTNROLES_HIERARCHY a LEFT JOIN LETTNROLES_HIERARCHY b on (a.CHLDRN_ROLE = b.PARNTS_ROLE)" -->
<!-- sqlRolesAndUrl=" -->
<!-- SELECT a.ROLE_PTTRN url, b.AUTHOR_CODE authority -->
<!-- FROM LETTNROLEINFO a, LETTNAUTHORROLERELATE b -->
<!-- WHERE a.ROLE_CODE = b.ROLE_CODE AND a.ROLE_TY = 'url' -->
<!-- ORDER BY a.ROLE_SORT" -->
<!-- sqlRolesAndMethod=" -->
<!-- SELECT a.ROLE_PTTRN method, b.AUTHOR_CODE authority -->
<!-- FROM LETTNROLEINFO a, LETTNAUTHORROLERELATE b -->
<!-- WHERE a.ROLE_CODE = b.ROLE_CODE AND a.ROLE_TY = 'method' -->
<!-- ORDER BY a.ROLE_SORT" -->
<!-- sqlRolesAndPointcut=" -->
<!-- SELECT a.ROLE_PTTRN pointcut, b.AUTHOR_CODE authority -->
<!-- FROM LETTNROLEINFO a, LETTNAUTHORROLERELATE b -->
<!-- WHERE a.ROLE_CODE = b.ROLE_CODE AND a.ROLE_TY = 'pointcut' -->
<!-- ORDER BY a.ROLE_SORT" -->
<!-- sqlRegexMatchedRequestMapping=" -->
<!-- SELECT a.resource_pattern uri, b.authority authority -->
<!-- FROM LETTNROLEINFO a, LETTNAUTHORROLERELATE b -->
<!-- WHERE a.ROLE_CODE = b.ROLE_CODE AND a.ROLE_TY = 'regex' -->
<!-- ORDER BY a.ROLE_SORT" -->
<!-- /> -->
<!-- //전자정부 프레임워크 사용 시 -->
@ -110,12 +46,12 @@
jdbcUsersByUsernameQuery="
/** 인증에 사용되는 사용자정보 조회 질의문 */
SELECT USER_ID
, ESNTL_ID AS PASSWORD
, ESNTL_ID AS PASSWD
, 1 ENABLED
, USER_NM
, USER_ZIP
, USER_ADRES
, USER_EMAIL
, ZIP
, ADDR
, EML_ADRS
, USER_SE
, ORG_ID
, ESNTL_ID

6
src/main/resources/sql/mapper/framework/cache/cacheboard-mysql-mapper.xml vendored
Unescape Escape View File

@ -9,7 +9,7 @@
<result column="ntcr_nm" property="ntcrNm" />
<result column="ntt_no" property="nttNo" />
<result column="ntt_cn" property="nttCn" />
<result column="password" property="password" />
<result column="passwd" property="passwd" />
<result column="rgtr" property="rgtr" />
<result column="frstRgtrNm" property="frstRgtrNm" />
<result column="regDt" property="regDt" />
@ -50,7 +50,7 @@
, ntce_end_de
, ntcr_id
, ntcr_nm
, password
, passwd
, atch_file_id
, reg_dt
, rgtr
@ -90,7 +90,7 @@
, XB.ntcr_nm
, XB.ntt_no
, XB.ntt_cn
, XB.password
, XB.passwd
, XB.rgtr
, IFNULL(VUM.user_nm, XB.ntcr_nm) AS frstRgtrNm
, DATE_FORMAT(XB.reg_dt, '%Y-%m-%d') AS regDt

32
src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml
Unescape Escape View File

@ -503,7 +503,7 @@
,NTCE_END_DE
,NTCR_ID
,NTCR_NM
,PASSWORD
,PASSWD
,ATCH_FILE_ID
,REG_DT
,RGTR
@ -526,7 +526,7 @@
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(ntce_end_de )">AND NTCE_END_DE = #{ntce_end_de }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(ntcr_id )">AND NTCR_ID = #{ntcr_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(ntcr_nm )">AND NTCR_NM = #{ntcr_nm }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(password )">AND PASSWORD = #{password }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(passwd )">AND PASSWD = #{passwd }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(atch_file_id )">AND ATCH_FILE_ID = #{atch_file_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(reg_dt)">AND REG_DT = #{reg_dt}</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(rgtr )">AND RGTR = #{rgtr }</if>
@ -551,7 +551,7 @@
,NTCE_END_DE
,NTCR_ID
,NTCR_NM
,PASSWORD
,PASSWD
,ATCH_FILE_ID
,REG_DT
,RGTR
@ -581,7 +581,7 @@
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(ntce_end_de )">,NTCE_END_DE </if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(ntcr_id )">,NTCR_ID </if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(ntcr_nm )">,NTCR_NM </if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(password )">,PASSWORD </if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(passwd )">,PASSWD </if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(atch_file_id )">,ATCH_FILE_ID </if>
,REG_DT
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(rgtr )">,RGTR </if>
@ -603,7 +603,7 @@
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(ntce_end_de )">,#{ntce_end_de }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(ntcr_id )">,#{ntcr_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(ntcr_nm )">,#{ntcr_nm }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(password )">,#{password }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(passwd )">,#{passwd }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(atch_file_id )">,#{atch_file_id }</if>
,NOW()
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(rgtr )">,#{rgtr }</if>
@ -630,7 +630,7 @@
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(ntce_end_de )">,NTCE_END_DE = #{ntce_end_de }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(ntcr_id )">,NTCR_ID = #{ntcr_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(ntcr_nm )">,NTCR_NM = #{ntcr_nm }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(password )">,PASSWORD = #{password }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(passwd )">,PASSWD = #{passwd }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(atch_file_id )">,ATCH_FILE_ID = #{atch_file_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(reg_dt)">,REG_DT = #{reg_dt}</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(rgtr )">,RGTR = #{rgtr }</if>
@ -2224,7 +2224,7 @@
SELECT USER_ID
,ORG_ID
,USER_NM
,PASSWORD
,PASSWD
,EMP_NO
,GENDER
,BRDT
@ -2250,7 +2250,7 @@
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(user_id )">AND USER_ID = #{user_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(org_id )">AND ORG_ID = #{org_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(user_nm )">AND USER_NM = #{user_nm }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(password )">AND PASSWORD = #{password }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(passwd )">AND PASSWD = #{passwd }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(emp_no )">AND EMP_NO = #{emp_no }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(gender )">AND GENDER = #{gender }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(brdt )">AND BRDT = #{brdt }</if>
@ -2277,7 +2277,7 @@
SELECT USER_ID
,ORG_ID
,USER_NM
,PASSWORD
,PASSWD
,EMP_NO
,GENDER
,BRDT
@ -2310,7 +2310,7 @@
user_id
, org_id
, user_nm
, password
, passwd
, emp_no
, gender
, brdt
@ -2322,7 +2322,7 @@
, daddr
, zip
, telno
, mblTelno
, mbl_telno
, eml_adrs
, pos_nm
, grp_id
@ -2335,7 +2335,7 @@
#{userId}
, #{orgId}
, #{userNm}
, #{password}
, #{passwd}
, #{empNo}
, #{gender}
, #{brdt}
@ -2366,7 +2366,7 @@
REG_DT = REG_DT
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(org_id )">,ORG_ID = #{org_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(user_nm )">,USER_NM = #{user_nm }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(password )">,PASSWORD = #{password }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(passwd )">,PASSWD = #{passwd }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(emp_no )">,EMP_NO = #{emp_no }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(gender )">,GENDER = #{gender }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(brdt )">,BRDT = #{brdt }</if>
@ -2402,7 +2402,7 @@
SELECT A.USER_ID
,A.ORG_ID
,A.USER_NM
,A.PASSWORD
,A.PASSWD
,A.EMP_NO
,A.GENDER
,A.BRDT
@ -2433,7 +2433,7 @@
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(user_id )">AND A.USER_ID = #{user_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(org_id )">AND A.ORG_ID = #{org_id }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(user_nm )">AND A.USER_NM = #{user_nm }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(password )">AND A.PASSWORD = #{password }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(passwd )">AND A.PASSWD = #{passwd }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(emp_no )">AND A.EMP_NO = #{emp_no }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(gender )">AND A.GENDER = #{gender }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(brdt )">AND A.BRDT = #{brdt }</if>
@ -2464,7 +2464,7 @@
SELECT A.USER_ID
,A.ORG_ID
,A.USER_NM
,A.PASSWORD
,A.PASSWD
,A.EMP_NO
,A.GENDER
,A.BRDT

2
src/main/resources/sql/mapper/framework/cmm/XitFrameUnit-mysql-mapper.xml
Unescape Escape View File

@ -139,7 +139,7 @@
,NTCE_END_DE
,NTCR_ID
,NTCR_NM
,PASSWORD
,PASSWD
,ATCH_FILE_ID
,REG_DT
,RGTR

4
src/main/resources/sql/mapper/framework/mng/bbs/XitBasicBbsMng-mysql-mapper.xml
Unescape Escape View File

@ -17,7 +17,7 @@
,A.NTCR_NM AS "ntcrNm"
,A.NTT_NO AS "nttNo"
,A.NTT_CN AS "nttCn"
,A.PASSWORD AS "password"
,A.PASSWD AS "passwd"
,A.RGTR AS "rgtr"
,IFNULL (B.USER_NM, A.NTCR_NM) AS "frstRgtrNm"
,DATE_FORMAT(A.REG_DT, '%Y-%m-%d') AS "regDt"
@ -68,7 +68,7 @@
<result column="ntcrNm" property="ntcrNm" />
<result column="nttNo" property="nttNo" />
<result column="nttCn" property="nttCn" />
<result column="password" property="password" />
<result column="passwd" property="passwd" />
<result column="rgtr" property="rgtr" />
<result column="frstRgtrNm" property="frstRgtrNm" />
<result column="regDt" property="regDt" />

8
src/main/resources/sql/mapper/framework/mng/bbs/board-basic-mysql-mapper.xml
Unescape Escape View File

@ -22,7 +22,7 @@
, xb.ntcr_nm
, xb.ntt_no
, xb.ntt_cn
, xb.password
, xb.passwd
, xb.rgtr
, IFNULL (xvum.user_nm, xb.ntcr_nm) AS "frstRgtrNm"
, xb.reg_dt
@ -118,7 +118,7 @@
, ntce_end_de
, ntcr_id
, ntcr_nm
, password
, passwd
, atch_file_id
, reg_dt
, rgtr
@ -137,7 +137,7 @@
, #{ntceEndDe}
, #{ntcrId}
, #{ntcrNm}
, #{password}
, #{passwd}
, #{atchFileId}
, NOW()
, #{rgtr}
@ -159,7 +159,7 @@
, ntce_end_de = IF(ntce_end_de = #{ntceEndDe}, ntce_end_de, #{ntceEndDe})
, ntcr_id = IF(ntcr_id = #{ntcrId}, ntcr_id, #{ntcrId})
, ntcr_nm = IF(ntcr_nm = #{ntcrNm}, ntcr_nm, #{ntcrNm})
, password = IF(password = #{password}, password, #{password})
, passwd = IF(passwd = #{passwd}, passwd, #{passwd})
, atch_file_id = IF(atch_file_id = #{atchFileId}, atch_file_id, #{atchFileId})
</if>
, mdfcn_dt = NOW()

2
src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml
Unescape Escape View File

@ -77,7 +77,7 @@
,'USR03' AS "userTy"
,A.USER_ID AS "emplyrId"
,A.USER_NM AS "emplyrNm"
,A.PASSWORD AS "password"
,A.PASSWD AS "passwd"
,A.PASSWD_HINT AS "passwdHint"
,A.PASSWD_NSR AS "passwdNsr"
,A.EMP_NO AS "empNo"

18
src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml
Unescape Escape View File

@ -13,7 +13,7 @@
, xui.user_nm
, xui.eml_adrs
, xui.area_no
, xui.mblTelno
, xui.mbl_telno
, xui.grp_id
, xui.user_sttus_code
, xui.REG_DT
@ -42,7 +42,7 @@
, 'USR03' AS userTy
, user_id AS emplyrId
, user_nm AS emplyrNm
, password
, passwd
, passwd_hint
, passwd_nsr
, emp_no
@ -54,7 +54,7 @@
, daddr
, zip
, telno
, mblTelno
, mbl_telno
, eml_adrs
, pos_nm
, grp_id
@ -74,7 +74,7 @@
user_id
, org_id
, user_nm
, password
, passwd
, emp_no
, gender
, brdt
@ -86,7 +86,7 @@
, daddr
, zip
, telno
, mblTelno
, mbl_telno
, eml_adrs
, pos_nm
, grp_id
@ -99,7 +99,7 @@
#{userId}
, #{orgId}
, #{userNm}
, #{password}
, #{passwd}
, #{empNo}
, #{gender}
, #{brdt}
@ -138,7 +138,7 @@
, daddr = IF(daddr = #{daddr}, daddr, #{daddr})
, area_no = IF(area_no = #{areaNo}, area_no, #{areaNo})
, telno = IF(telno = #{telno}, telno, #{telno})
, mblTelno = IF(mblTelno = #{mblTelno}, mblTelno, #{mblTelno})
, mbl_telno = IF(mbl_telno = #{mblTelno}, mbl_telno, #{mblTelno})
, eml_adrs = IF(eml_adrs = #{emlAdrs}, eml_adrs, #{emlAdrs})
, pos_nm = IF(pos_nm = #{posNm}, pos_nm, #{posNm})
, grp_id = IF(grp_id = #{grpId}, grp_id, #{grpId})
@ -366,7 +366,7 @@
, daddr
, zip
, telno
, mblTelno
, mbl_telno
, eml_adrs
, nstt_cd
, user_sttus_code
@ -384,7 +384,7 @@
, daddr
, zip
, telno
, mblTelno
, mbl_telno
, eml_adrs
, nstt_cd
, user_sttus_code

2
src/main/resources/validator/framework/mng/bbs/XitBasicBbsMng.xml
Unescape Escape View File

@ -27,7 +27,7 @@
<field property="ntcrNm" depends="required">
<arg0 key="cop.ntcrNm" />
</field>
<field property="password" depends="required">
<field property="passwd" depends="required">
<arg0 key="cop.password" />
</field>
</form>

2
src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml
Unescape Escape View File

@ -27,7 +27,7 @@
</var>
</field>
<!--
<field property="password" depends="required, password1, password2, password3, password4">
<field property="passwd" depends="required, password1, password2, password3, password4">
<arg0 key="비밀번호" resource="false"/>
</field>
-->

8
src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/XitUserReg_input.jsp
Unescape Escape View File

@ -31,7 +31,7 @@ function showModalDialogCallback(retVal) {
}
function fnInsert(){
if(validateUserManageVO(document.userManageVO)){
if(document.userManageVO.password.value != document.userManageVO.password2.value){
if(document.userManageVO.passwd.value != document.userManageVO.passwd2.value){
alert("<spring:message code="fail.user.passwordUpdate2" />");
return;
}
@ -155,14 +155,14 @@ table {
<label class="required">비밀번호</label>
</th>
<td width="35%" >
<form:password path="password" id="password" title="비밀번호" size="20" maxlength="20" />
<form:errors path="password" cssClass="error" />
<form:password path="passwd" id="passwd" title="비밀번호" size="20" maxlength="20" />
<form:errors path="passwd" cssClass="error" />
</td>
<th width="15%" height="23">
<label class="required">비밀번호확인</label>
</th>
<td width="35%" >
<input name="password2" id="password2" title="비밀번호확인" type="password" size="20" maxlength="20" />
<input name="passwd2" id="passwd2" title="비밀번호확인" type="password" size="20" maxlength="20" />
</td>
</tr>

12
src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/forms/UserForm.jsp
Unescape Escape View File

@ -43,19 +43,19 @@
<tr>
<th>
<label for="password" class="required">비밀번호</label>
<label for="passwd" class="required">비밀번호</label>
</th>
<td>
<form:password path="password" id="password" title="비밀번호" size="20" maxlength="20" />
<form:errors path="password" cssClass="error" />
<form:password path="passwd" id="passwd" title="비밀번호" size="20" maxlength="20" />
<form:errors path="passwd" cssClass="error" />
</td>
</tr>
<tr>
<th>
<label for="password2" class="required">비밀번호확인</label>
<label for="passwd2" class="required">비밀번호확인</label>
</th>
<td>
<input name="password2" id="password2" title="비밀번호확인" type="password" size="20" maxlength="20" />
<input name="passwd2" id="passwd2" title="비밀번호확인" type="password" size="20" maxlength="20" />
</td>
</tr>
@ -262,7 +262,7 @@ var UserForm = {
addData: function(){
if(!validateUserManageVO(document.userManageVO))
return false;
if(document.userManageVO.password.value != document.userManageVO.password2.value){
if(document.userManageVO.passwd.value != document.userManageVO.passwd2.value){
alert("<spring:message code="fail.user.passwordUpdate2" />");
return false;
}

4
src/main/webapp/WEB-INF/jsp/fims/framework/biz/login/XitLoginEvrUsr.jsp
Unescape Escape View File

@ -25,7 +25,7 @@ function actionLogin() {
if (document.loginForm.id.value =="") {
alert("아이디를 입력하세요");
return false;
} else if (document.loginForm.password.value =="") {
} else if (document.loginForm.passwd.value =="") {
alert("비밀번호를 입력하세요");
return false;
} else {
@ -290,7 +290,7 @@ var TabsUtil = {
<form:form id="loginForm" name="loginForm" method="post">
<div class="input_wrap">
<input type="text" name="id" id="id" title="아이디 입력" class="typeText required form-control inp-long" placeholder="아이디" />
<input type="password" name="password" id="password" title="비밀번호 입력" class="typePassword required form-control inp-long" placeholder="비밀번호" onkeydown="javascript:if (event.keyCode == 13) { actionLogin(); }"/>
<input type="password" name="passwd" id="passwd" title="비밀번호 입력" class="typePassword required form-control inp-long" placeholder="비밀번호" onkeydown="javascript:if (event.keyCode == 13) { actionLogin(); }"/>
<!-- 캡차인증 -->
<div class="captcha_wrap">
<img id="captchaImg" alt="자동로그인 방지 이미지"/>

4
src/main/webapp/WEB-INF/jsp/fims/framework/biz/login/XitLoginUsr.jsp
Unescape Escape View File

@ -52,7 +52,7 @@
<input type="text" name="id" id="id" title="아이디 입력" class="typeText required form-control inp-long" placeholder="아이디" />
</div>
<div class="input-group input-group-merge mt-2">
<input type="password" name="password" id="password" title="비밀번호 입력" class="typePassword required form-control inp-long" placeholder="비밀번호"
<input type="password" name="passwd" id="passwd" title="비밀번호 입력" class="typePassword required form-control inp-long" placeholder="비밀번호"
onkeydown="javascript:if (event.keyCode == 13) { actionLogin(); }"/>
<span class="input-group-text cursor-pointer"><i class="bx bxs-lock"></i></span>
</div>
@ -96,7 +96,7 @@
if (document.loginForm.id.value =="") {
alert("아이디를 입력하세요");
return false;
} else if (document.loginForm.password.value =="") {
} else if (document.loginForm.passwd.value =="") {
alert("비밀번호를 입력하세요");
return false;
} else {

2
src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_edit.jsp
Unescape Escape View File

@ -48,7 +48,7 @@
<c:if test="${anonymous != 'true'}">
<input type="hidden" name="ntcrNm" value="dummy"> <!-- validator 처리를 위해 지정 -->
<input type="hidden" name="password" value="dummy"> <!-- validator 처리를 위해 지정 -->
<input type="hidden" name="passwd" value="dummy"> <!-- validator 처리를 위해 지정 -->
</c:if>
<c:if test="${bdMstr.bbsAttrbCode != 'BBSA01'}">

2
src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_input.jsp
Unescape Escape View File

@ -45,7 +45,7 @@
<c:if test="${anonymous != 'true'}">
<input type="hidden" name="ntcrNm" value="dummy"> <!-- validator 처리를 위해 지정 -->
<input type="hidden" name="password" value="dummy"> <!-- validator 처리를 위해 지정 -->
<input type="hidden" name="passwd" value="dummy"> <!-- validator 처리를 위해 지정 -->
</c:if>
<c:if test="${bdMstr.bbsAttrbCode != 'BBSA01'}">

2
src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_inputReply.jsp
Unescape Escape View File

@ -54,7 +54,7 @@
<c:if test="${anonymous != 'true'}">
<input type="hidden" name="ntcrNm" value="dummy"> <!-- validator 처리를 위해 지정 -->
<input type="hidden" name="password" value="dummy"> <!-- validator 처리를 위해 지정 -->
<input type="hidden" name="passwd" value="dummy"> <!-- validator 처리를 위해 지정 -->
</c:if>
<c:if test="${bdMstr.bbsAttrbCode != 'BBSA01'}">

2
src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_preview.jsp
Unescape Escape View File

@ -95,7 +95,7 @@
<c:if test="${anonymous != 'true'}">
<input type="hidden" name="ntcrNm" value="dummy"> <!-- validator 처리를 위해 지정 -->
<input type="hidden" name="password" value="dummy"> <!-- validator 처리를 위해 지정 -->
<input type="hidden" name="passwd" value="dummy"> <!-- validator 처리를 위해 지정 -->
</c:if>
<c:if test="${bdMstr.bbsAttrbCode != 'BBSA01'}">

12
src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_view.jsp
Unescape Escape View File

@ -134,9 +134,9 @@
</c:if>
<c:if test="${anonymous == 'true'}">
<tr>
<th height="23"><label for="password"><spring:message code="cop.password" /></label></th>
<th height="23"><label for="passwd"><spring:message code="cop.password" /></label></th>
<td colspan="5">
<input name="password" title="암호" type="password" size="20" value="" maxlength="20" >
<input name="passwd" title="암호" type="passwd" size="20" value="" maxlength="20" >
</td>
</tr>
</c:if>
@ -245,9 +245,9 @@
* 데이터 수정
======================== */
modifyData : function(){
if ("<c:out value='${anonymous}'/>" == "true" && document.frm.password.value == '') {
if ("<c:out value='${anonymous}'/>" == "true" && document.frm.passwd.value == '') {
alert('등록시 사용한 패스워드를 입력해 주세요.');
document.frm.password.focus();
document.frm.passwd.focus();
return;
}
@ -258,9 +258,9 @@
* 데이터 삭제
======================== */
removeData : function(){
if ("<c:out value='${anonymous}'/>" == "true" && document.frm.password.value == '') {
if ("<c:out value='${anonymous}'/>" == "true" && document.frm.passwd.value == '') {
alert('등록시 사용한 패스워드를 입력해 주세요.');
document.frm.password.focus();
document.frm.passwd.focus();
return;
}

2
src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_edit.jsp
Unescape Escape View File

@ -327,5 +327,5 @@ table {
</table>
</div>
<!-- 버튼 끝 -->
<form:hidden path="password" />
<form:hidden path="passwd" />
</form:form>

8
src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_input.jsp
Unescape Escape View File

@ -51,14 +51,14 @@
<label class="required">비밀번호</label>
</th>
<td >
<form:password path="password" id="password" title="비밀번호" size="20" maxlength="20" />
<form:errors path="password" cssClass="error" />
<form:password path="passwd" id="passwd" title="비밀번호" size="20" maxlength="20" />
<form:errors path="passwd" cssClass="error" />
</td>
<th height="23">
<label class="required">비밀번호확인</label>
</th>
<td >
<input name="password2" id="password2" title="비밀번호확인" type="password" size="20" maxlength="20" />
<input name="passwd2" id="passwd2" title="비밀번호확인" type="password" size="20" maxlength="20" />
</td>
</tr>
@ -247,7 +247,7 @@ var XitUserRegMng_input = {
click: function(){
if (confirm('등록하시겠습니까?')) {
if(validateUserManageVO(document.userManageVO)){
if(document.userManageVO.password.value != document.userManageVO.password2.value){
if(document.userManageVO.passwd.value != document.userManageVO.passwd2.value){
alert("비밀번호와 비밀번호 확인이 일치하지 않습니다.");
return;
}

2
src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp
Unescape Escape View File

@ -325,5 +325,5 @@ table {
</div>
</div>
<form:hidden path="password" />
<form:hidden path="passwd" />
</form:form>

10
src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtPopup.jsp
Unescape Escape View File

@ -52,16 +52,16 @@
<label class="required">비밀번호</label>
</th>
<td >
<form:input path="password" id="password" title="비밀번호" cssClass="txaIpt" size="20" maxlength="20" />
<form:errors path="password" cssClass="error" />
<form:input path="passwd" id="passwd" title="비밀번호" cssClass="txaIpt" size="20" maxlength="20" />
<form:errors path="passwd" cssClass="error" />
</td>
<th height="23">
<label class="required">비밀번호 확인</label>
</th>
<td >
<%-- <input name="password2" id="password2" title="비밀번호확인" type="password" size="20" maxlength="20" />--%>
<form:input path="password2" id="password2" title="비밀번호" cssClass="txaIpt" size="20" maxlength="20" />
<form:errors path="password2" cssClass="error" />
<%-- <input name="passwd2" id="passwd2" title="비밀번호확인" type="password" size="20" maxlength="20" />--%>
<form:input path="passwd2" id="passwd2" title="비밀번호" cssClass="txaIpt" size="20" maxlength="20" />
<form:errors path="passwd2" cssClass="error" />
</td>
</tr>
<tr>

Write Preview
Loading…
Cancel
Save