diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/XitBbsVO.java b/src/main/java/kr/xit/fims/framework/biz/cmm/XitBbsVO.java index 67901522..0f5ef7ff 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/XitBbsVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/XitBbsVO.java @@ -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; diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java b/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java index 3a6fe6ec..75476c49 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java @@ -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(); diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java index 48d7bd56..2f525c0e 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitFrameUnitServiceBean.java @@ -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: diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitLoginServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitLoginServiceBean.java index 260272f4..fff4766b 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitLoginServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitLoginServiceBean.java @@ -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(); diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitSessionMapping.java b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitSessionMapping.java index b9b33754..ea27e61e 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitSessionMapping.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/service/bean/XitSessionMapping.java @@ -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); } } diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitLoginController.java b/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitLoginController.java index 6cf6bb5a..4da4df33 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitLoginController.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitLoginController.java @@ -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); diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitMainController.java b/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitMainController.java index 7a843c13..c91f8c96 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitMainController.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitMainController.java @@ -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"; // 내부업무의 상단메뉴 화면 } diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitTestController.java b/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitTestController.java index 6f610601..58248327 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitTestController.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitTestController.java @@ -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); } diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/XitBasicBbsMngVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/XitBasicBbsMngVO.java index 3430a7c4..0f0f79c7 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/XitBasicBbsMngVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/XitBasicBbsMngVO.java @@ -88,7 +88,7 @@ public class XitBasicBbsMngVO { /** * 비밀번호 */ - private String password; + private String passwd; /** * 첨부 파일 ID */ diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/XitBasicBbsMngServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/XitBasicBbsMngServiceBean.java index 851b8108..2aa0ee2b 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/XitBasicBbsMngServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/bbs/service/bean/XitBasicBbsMngServiceBean.java @@ -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; diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/menu/MenuListMngVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/menu/MenuListMngVO.java index 6160cb77..67bea9fe 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/menu/MenuListMngVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/menu/MenuListMngVO.java @@ -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 diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java index 89b63fb0..0b48c912 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java @@ -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; //생일 diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserRegMngVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserRegMngVO.java index 50f7bc48..cce803bb 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserRegMngVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserRegMngVO.java @@ -111,7 +111,7 @@ public class XitUserRegMngVO extends BaseVO { /** * 비밀번호 */ - private String password; + private String passwd; /** * 비밀번호 정답 */ diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java index 6b223c8d..5e58f820 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/service/bean/UserMgtServiceBean.java @@ -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); /** diff --git a/src/main/resources/spring/service/context-security.xml b/src/main/resources/spring/service/context-security.xml index e4d500dc..c6bbeb7a 100644 --- a/src/main/resources/spring/service/context-security.xml +++ b/src/main/resources/spring/service/context-security.xml @@ -32,71 +32,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -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 diff --git a/src/main/resources/sql/mapper/framework/cache/cacheboard-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cache/cacheboard-mysql-mapper.xml index 8ee00b7b..b9adf6d2 100644 --- a/src/main/resources/sql/mapper/framework/cache/cacheboard-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cache/cacheboard-mysql-mapper.xml @@ -9,7 +9,7 @@ - + @@ -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 diff --git a/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml index 1636930d..fd93010b 100644 --- a/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cmm/XitFrameCrud-mysql-mapper.xml @@ -503,7 +503,7 @@ ,NTCE_END_DE ,NTCR_ID ,NTCR_NM - ,PASSWORD + ,PASSWD ,ATCH_FILE_ID ,REG_DT ,RGTR @@ -526,7 +526,7 @@ AND NTCE_END_DE = #{ntce_end_de } AND NTCR_ID = #{ntcr_id } AND NTCR_NM = #{ntcr_nm } - AND PASSWORD = #{password } + AND PASSWD = #{passwd } AND ATCH_FILE_ID = #{atch_file_id } AND REG_DT = #{reg_dt} AND RGTR = #{rgtr } @@ -551,7 +551,7 @@ ,NTCE_END_DE ,NTCR_ID ,NTCR_NM - ,PASSWORD + ,PASSWD ,ATCH_FILE_ID ,REG_DT ,RGTR @@ -581,7 +581,7 @@ ,NTCE_END_DE ,NTCR_ID ,NTCR_NM - ,PASSWORD + ,PASSWD ,ATCH_FILE_ID ,REG_DT ,RGTR @@ -603,7 +603,7 @@ ,#{ntce_end_de } ,#{ntcr_id } ,#{ntcr_nm } - ,#{password } + ,#{passwd } ,#{atch_file_id } ,NOW() ,#{rgtr } @@ -630,7 +630,7 @@ ,NTCE_END_DE = #{ntce_end_de } ,NTCR_ID = #{ntcr_id } ,NTCR_NM = #{ntcr_nm } - ,PASSWORD = #{password } + ,PASSWD = #{passwd } ,ATCH_FILE_ID = #{atch_file_id } ,REG_DT = #{reg_dt} ,RGTR = #{rgtr } @@ -2224,7 +2224,7 @@ SELECT USER_ID ,ORG_ID ,USER_NM - ,PASSWORD + ,PASSWD ,EMP_NO ,GENDER ,BRDT @@ -2250,7 +2250,7 @@ AND USER_ID = #{user_id } AND ORG_ID = #{org_id } AND USER_NM = #{user_nm } - AND PASSWORD = #{password } + AND PASSWD = #{passwd } AND EMP_NO = #{emp_no } AND GENDER = #{gender } AND BRDT = #{brdt } @@ -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 ,ORG_ID = #{org_id } ,USER_NM = #{user_nm } - ,PASSWORD = #{password } + ,PASSWD = #{passwd } ,EMP_NO = #{emp_no } ,GENDER = #{gender } ,BRDT = #{brdt } @@ -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 @@ AND A.USER_ID = #{user_id } AND A.ORG_ID = #{org_id } AND A.USER_NM = #{user_nm } - AND A.PASSWORD = #{password } + AND A.PASSWD = #{passwd } AND A.EMP_NO = #{emp_no } AND A.GENDER = #{gender } AND A.BRDT = #{brdt } @@ -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 diff --git a/src/main/resources/sql/mapper/framework/cmm/XitFrameUnit-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/cmm/XitFrameUnit-mysql-mapper.xml index 96264589..4be7e6da 100644 --- a/src/main/resources/sql/mapper/framework/cmm/XitFrameUnit-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/cmm/XitFrameUnit-mysql-mapper.xml @@ -139,7 +139,7 @@ ,NTCE_END_DE ,NTCR_ID ,NTCR_NM - ,PASSWORD + ,PASSWD ,ATCH_FILE_ID ,REG_DT ,RGTR diff --git a/src/main/resources/sql/mapper/framework/mng/bbs/XitBasicBbsMng-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/bbs/XitBasicBbsMng-mysql-mapper.xml index 950635ac..6d9b8f03 100644 --- a/src/main/resources/sql/mapper/framework/mng/bbs/XitBasicBbsMng-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/bbs/XitBasicBbsMng-mysql-mapper.xml @@ -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 @@ - + diff --git a/src/main/resources/sql/mapper/framework/mng/bbs/board-basic-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/bbs/board-basic-mysql-mapper.xml index f7ecb276..925e7079 100644 --- a/src/main/resources/sql/mapper/framework/mng/bbs/board-basic-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/bbs/board-basic-mysql-mapper.xml @@ -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}) , mdfcn_dt = NOW() diff --git a/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml index f229e7bd..eff0a642 100644 --- a/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/usr/XitUserEtcOptMng-mysql-mapper.xml @@ -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" diff --git a/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml index f4f6431d..91758b82 100644 --- a/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/usr/user-mysql-mapper.xml @@ -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 diff --git a/src/main/resources/validator/framework/mng/bbs/XitBasicBbsMng.xml b/src/main/resources/validator/framework/mng/bbs/XitBasicBbsMng.xml index 476188aa..01ad7bba 100644 --- a/src/main/resources/validator/framework/mng/bbs/XitBasicBbsMng.xml +++ b/src/main/resources/validator/framework/mng/bbs/XitBasicBbsMng.xml @@ -27,7 +27,7 @@ - + diff --git a/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml b/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml index 18962898..47d472df 100644 --- a/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml +++ b/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml @@ -27,7 +27,7 @@ diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/XitUserReg_input.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/XitUserReg_input.jsp index 0273acb1..b62f9e93 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/XitUserReg_input.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/XitUserReg_input.jsp @@ -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(""); return; } @@ -155,14 +155,14 @@ table { - - + + - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/forms/UserForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/forms/UserForm.jsp index e063384a..03ed5710 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/forms/UserForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/cmm/anonymous/forms/UserForm.jsp @@ -43,19 +43,19 @@ - + - - + + - + - + @@ -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(""); return false; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/login/XitLoginEvrUsr.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/login/XitLoginEvrUsr.jsp index cbcf4b65..1b4fa014 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/login/XitLoginEvrUsr.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/login/XitLoginEvrUsr.jsp @@ -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 = {
- +
자동로그인 방지 이미지 diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/login/XitLoginUsr.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/login/XitLoginUsr.jsp index 5e45947b..a01f4dea 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/login/XitLoginUsr.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/login/XitLoginUsr.jsp @@ -52,7 +52,7 @@
-
@@ -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 { diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_edit.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_edit.jsp index b38123f9..5310db93 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_edit.jsp @@ -48,7 +48,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_input.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_input.jsp index b2c9362a..f2496c21 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_input.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_input.jsp @@ -45,7 +45,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_inputReply.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_inputReply.jsp index c7387414..fa31d362 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_inputReply.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_inputReply.jsp @@ -54,7 +54,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_preview.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_preview.jsp index b48df5da..38e31455 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_preview.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_preview.jsp @@ -95,7 +95,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_view.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_view.jsp index 748b53df..1b928870 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_view.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_view.jsp @@ -134,9 +134,9 @@ - + - + @@ -245,9 +245,9 @@ * 데이터 수정 ======================== */ modifyData : function(){ - if ("" == "true" && document.frm.password.value == '') { + if ("" == "true" && document.frm.passwd.value == '') { alert('등록시 사용한 패스워드를 입력해 주세요.'); - document.frm.password.focus(); + document.frm.passwd.focus(); return; } @@ -258,9 +258,9 @@ * 데이터 삭제 ======================== */ removeData : function(){ - if ("" == "true" && document.frm.password.value == '') { + if ("" == "true" && document.frm.passwd.value == '') { alert('등록시 사용한 패스워드를 입력해 주세요.'); - document.frm.password.focus(); + document.frm.passwd.focus(); return; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_edit.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_edit.jsp index 50a08d51..354f2f23 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_edit.jsp @@ -327,5 +327,5 @@ table {
- + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_input.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_input.jsp index a357ebd8..a6c29e18 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_input.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_input.jsp @@ -51,14 +51,14 @@ - - + + - + @@ -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; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp index 78e80f55..9beace5c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp @@ -325,5 +325,5 @@ table { - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtPopup.jsp index 1f401b70..9a186e81 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/mngUserMgtPopup.jsp @@ -52,16 +52,16 @@ - - + + - <%-- --%> - - + <%-- --%> + +