From ebbf4bdce263072a7da7054d4a5afc8aa14a36a3 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 2 Jun 2023 15:48:56 +0900 Subject: [PATCH] =?UTF-8?q?refactor=20:=20=EC=9C=A0=EC=A0=80=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fims/framework/biz/cmm/XitLoginVO.java | 4 +-- .../biz/cmm/service/XitFrameUnitService.java | 6 ++-- .../service/bean/XitFrameUnitServiceBean.java | 10 +++--- .../cmm/web/XitFrameAnonymousController.java | 6 ++-- .../framework/biz/mng/user/XitUserInfoVO.java | 4 +-- .../biz/mng/user/XitUserRegMngVO.java | 4 +-- .../cmm/XitFrameCrud-mysql-mapper.xml | 36 +++++++++---------- .../mng/usr/XitUserEtcOptMng-mysql-mapper.xml | 4 +-- .../framework/mng/usr/user-mysql-mapper.xml | 12 +++---- .../framework/mng/usr/XitUserRegMng.xml | 4 +-- .../biz/cmm/anonymous/XitUserReg_input.jsp | 10 +++--- .../biz/cmm/anonymous/forms/UserForm.jsp | 14 ++++---- .../biz/mng/usr/backup/XitUserRegMng_edit.jsp | 10 +++--- .../mng/usr/backup/XitUserRegMng_input.jsp | 10 +++--- .../biz/mng/usr/backup/XitUserRegMng_view.jsp | 10 +++--- .../framework/biz/mng/usr/mngUserMgtPopup.jsp | 8 ++--- 16 files changed, 76 insertions(+), 76 deletions(-) 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 b6ebc2d0..3a6fe6ec 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 @@ -29,9 +29,9 @@ public class XitLoginVO implements Serializable{ /** 비밀번호 */ private String password; /** 비밀번호 힌트 */ - private String passwordHint; + private String passwdHint; /** 비밀번호 정답 */ - private String passwordCnsr; + private String passwdNsr; /** 사용자구분 */ private String userSe; /** diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/service/XitFrameUnitService.java b/src/main/java/kr/xit/fims/framework/biz/cmm/service/XitFrameUnitService.java index 3b65667c..8ce78b79 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/service/XitFrameUnitService.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/service/XitFrameUnitService.java @@ -99,13 +99,13 @@ public interface XitFrameUnitService { * @param id 로그인 ID * @param name * @param email - * @param passwordHint - * @param passwordCnsr + * @param passwdHint + * @param passwdNsr * @return XitLoginVO 요청처리 후 응답객체 * @author: 박민규 * @date: 2020. 3. 24. */ - public XitLoginVO findUserInUseByUserSe(USER_SE user_se, String id, String name, String email, String passwordHint, String passwordCnsr); + public XitLoginVO findUserInUseByUserSe(USER_SE user_se, String id, String name, String email, String passwdHint, String passwdNsr); 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 7462f03b..48d7bd56 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 @@ -188,8 +188,8 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF } @Override - public XitLoginVO findUserInUseByUserSe(USER_SE user_se, String id, String name, String email, String passwordHint, - String passwordCnsr) { + public XitLoginVO findUserInUseByUserSe(USER_SE user_se, String id, String name, String email, String passwdHint, + String passwdNsr) { /** * 필수값 확인 */ @@ -197,9 +197,9 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF throw new RuntimeException("이름(은)는 필수조건 입니다."); if (XitCmmnUtil.isEmpty(email)) throw new RuntimeException("이메일주소(은)는 필수조건 입니다."); - if (XitCmmnUtil.isEmpty(passwordHint)) + if (XitCmmnUtil.isEmpty(passwdHint)) throw new RuntimeException("비밀번호힌트(은)는 필수조건 입니다."); - if (XitCmmnUtil.isEmpty(passwordCnsr)) + if (XitCmmnUtil.isEmpty(passwdNsr)) throw new RuntimeException("비밀번호정답(은)는 필수조건 입니다."); /** @@ -213,7 +213,7 @@ public class XitFrameUnitServiceBean extends AbstractServiceBean implements XitF if (loginVO == null) return loginVO; if (name.equals(loginVO.getName()) && email.equals(loginVO.getEmail()) - && passwordHint.equals(loginVO.getPasswordHint()) && passwordCnsr.equals(loginVO.getPasswordHint())) + && passwdHint.equals(loginVO.getPasswdHint()) && passwdNsr.equals(loginVO.getPasswdHint())) return loginVO; else return null; diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitFrameAnonymousController.java b/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitFrameAnonymousController.java index 1b23adc1..fde6a05d 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitFrameAnonymousController.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/web/XitFrameAnonymousController.java @@ -121,7 +121,7 @@ public class XitFrameAnonymousController extends AbstractController { /*================ * 코드목록 조회 ================*/ - model.addAttribute("passwordHint_result" , xitFrameCodeService.findCmmnDetailCodes("XIT022")); //패스워트힌트코드 목록 + model.addAttribute("passwdHint_result" , xitFrameCodeService.findCmmnDetailCodes("XIT022")); //패스워트힌트코드 목록 model.addAttribute("gender_result" , xitFrameCodeService.findCmmnDetailCodes("XIT014")); //성별구분코드 목록 model.addAttribute("nsttCd_result" , xitFrameCodeService.findCmmnDetailCodes("XIT025")); //소속기관코드 목록 model.addAttribute("orgId_result" , xitFrameCodeService.findOrgnztCodes("XIT_ORGNZT_INFO")); //조직정보코드 목록 @@ -133,7 +133,7 @@ public class XitFrameAnonymousController extends AbstractController { // * 코드목록 조회 // ================*/ // //모든 사용자 공통 -// model.addAttribute("passwordHint_result" , xitFrameCodeService.findCmmnDetailCodes("XIT022")); //패스워트힌트코드 목록 +// model.addAttribute("passwdHint_result" , xitFrameCodeService.findCmmnDetailCodes("XIT022")); //패스워트힌트코드 목록 // model.addAttribute("gender_result" , xitFrameCodeService.findCmmnDetailCodes("XIT014")); //성별구분코드 목록 // model.addAttribute("grpId_result" , xitFrameCodeService.findGroupCodes("XIT_ORGNZT_INFO")); //그룹정보코드 목록 // List userSttus_result = xitFrameCodeService.findCmmnDetailCodes("XIT013"); @@ -181,7 +181,7 @@ public class XitFrameAnonymousController extends AbstractController { /*================ * 코드목록 조회 ================*/ - model.addAttribute("passwordHint_result" , xitFrameCodeService.findCmmnDetailCodes("XIT022")); //패스워트힌트코드 목록 + model.addAttribute("passwdHint_result" , xitFrameCodeService.findCmmnDetailCodes("XIT022")); //패스워트힌트코드 목록 model.addAttribute("gender_result" , xitFrameCodeService.findCmmnDetailCodes("XIT014")); //성별구분코드 목록 model.addAttribute("grpId_result" , xitFrameCodeService.findGroupCodes("XIT_ORGNZT_INFO")); //그룹정보코드 목록 model.addAttribute("userSttusCode_result" , xitFrameCodeService.findCmmnDetailCodes("XIT013")); //사용자상태코드 목록 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 5a0ec4cd..89b63fb0 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 @@ -34,8 +34,8 @@ public class XitUserInfoVO extends XitUserEtcOptionVO { protected String brdt; //생일 protected String fxno; //팩스번호 protected String addr; //주택 주소 - protected String passwordHint; //비밀번호 힌트 - protected String passwordCnsr; //비밀번호 정답 + protected String passwdHint; //비밀번호 힌트 + protected String passwdNsr; //비밀번호 정답 protected String areaNo; //지역 번호 protected String daddr; //상세 주소 protected String zip; //우편번호 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 6d3ea9ff..50f7bc48 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 @@ -115,11 +115,11 @@ public class XitUserRegMngVO extends BaseVO { /** * 비밀번호 정답 */ - private String passwordCnsr; + private String passwdNsr; /** * 비밀번호 힌트 */ - private String passwordHint; + private String passwdHint; /** * 검색조건 가입일자 시작일 */ 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 70e699ab..1636930d 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 @@ -2230,8 +2230,8 @@ ,BRDT ,FXNO ,ADDR - ,PASSWORD_HINT - ,PASSWORD_CNSR + ,PASSWD_HINT + ,PASSWD_NSR ,AREA_NO ,DADDR ,ZIP @@ -2256,8 +2256,8 @@ AND BRDT = #{brdt } AND FXNO = #{fxno } AND ADDR = #{addr } - AND PASSWORD_HINT = #{password_hint } - AND PASSWORD_CNSR = #{password_cnsr } + AND PASSWD_HINT = #{passwd_hint } + AND PASSWD_NSR = #{passwd_nsr } AND AREA_NO = #{area_no } AND DADDR = #{daddr } AND ZIP = #{zip } @@ -2283,8 +2283,8 @@ ,BRDT ,FXNO ,ADDR - ,PASSWORD_HINT - ,PASSWORD_CNSR + ,PASSWD_HINT + ,PASSWD_NSR ,AREA_NO ,DADDR ,ZIP @@ -2316,8 +2316,8 @@ , brdt , fxno , addr - , password_hint - , password_cnsr + , passwd_hint + , passwd_nsr , area_no , daddr , zip @@ -2341,8 +2341,8 @@ , #{brdt} , #{fxno} , #{addr} - , #{passwordHint} - , #{passwordCnsr} + , #{passwdHint} + , #{passwdNsr} , #{areaNo} , #{daddr} , #{zip} @@ -2372,8 +2372,8 @@ ,BRDT = #{brdt } ,FXNO = #{fxno } ,ADDR = #{addr } - ,PASSWORD_HINT = #{password_hint } - ,PASSWORD_CNSR = #{password_cnsr } + ,PASSWD_HINT = #{passwd_hint } + ,PASSWD_NSR = #{passwd_nsr } ,AREA_NO = #{area_no } ,DADDR = #{daddr } ,ZIP = #{zip } @@ -2408,8 +2408,8 @@ ,A.BRDT ,A.FXNO ,A.ADDR - ,A.PASSWORD_HINT - ,A.PASSWORD_CNSR + ,A.PASSWD_HINT + ,A.PASSWD_NSR ,A.AREA_NO ,A.DADDR ,A.ZIP @@ -2439,8 +2439,8 @@ AND A.BRDT = #{brdt } AND A.FXNO = #{fxno } AND A.ADDR = #{addr } - AND A.PASSWORD_HINT = #{password_hint } - AND A.PASSWORD_CNSR = #{password_cnsr } + AND A.PASSWD_HINT = #{passwd_hint } + AND A.PASSWD_NSR = #{passwd_nsr } AND A.AREA_NO = #{area_no } AND A.DADDR = #{daddr } AND A.ZIP = #{zip } @@ -2470,8 +2470,8 @@ ,A.BRDT ,A.FXNO ,A.ADDR - ,A.PASSWORD_HINT - ,A.PASSWORD_CNSR + ,A.PASSWD_HINT + ,A.PASSWD_NSR ,A.AREA_NO ,A.DADDR ,A.ZIP 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 5808a4eb..f229e7bd 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 @@ -78,8 +78,8 @@ ,A.USER_ID AS "emplyrId" ,A.USER_NM AS "emplyrNm" ,A.PASSWORD AS "password" - ,A.PASSWORD_HINT AS "passwordHint" - ,A.PASSWORD_CNSR AS "passwordCnsr" + ,A.PASSWD_HINT AS "passwdHint" + ,A.PASSWD_NSR AS "passwdNsr" ,A.EMP_NO AS "empNo" ,A.GENDER AS "gender" ,A.BRDT AS "brdt" 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 21c8e676..f4f6431d 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 @@ -43,8 +43,8 @@ , user_id AS emplyrId , user_nm AS emplyrNm , password - , password_hint - , password_cnsr + , passwd_hint + , passwd_nsr , emp_no , gender , brdt @@ -80,8 +80,8 @@ , brdt , fxno , addr - , password_hint - , password_cnsr + , passwd_hint + , passwd_nsr , area_no , daddr , zip @@ -105,8 +105,8 @@ , #{brdt} , #{fxno} , #{addr} - , #{passwordHint} - , #{passwordCnsr} + , #{passwdHint} + , #{passwdNsr} , #{areaNo} , #{daddr} , #{zip} diff --git a/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml b/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml index 9421c486..18962898 100644 --- a/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml +++ b/src/main/resources/validator/framework/mng/usr/XitUserRegMng.xml @@ -32,11 +32,11 @@ -->