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 695ec8be18
commit ebbf4bdce2
16 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File

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

@ -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;
/**

6
src/main/java/kr/xit/fims/framework/biz/cmm/service/XitFrameUnitService.java
Unescape Escape View File

@ -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);

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

@ -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;

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

@ -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<XitCodeVO> 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")); //사용자상태코드 목록

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

@ -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; //우편번호

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

@ -115,11 +115,11 @@ public class XitUserRegMngVO extends BaseVO {
/**
* 비밀번호 정답
*/
private String passwordCnsr;
private String passwdNsr;
/**
* 비밀번호 힌트
*/
private String passwordHint;
private String passwdHint;
/**
* 검색조건 가입일자 시작일
*/

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

@ -2230,8 +2230,8 @@
,BRDT
,FXNO
,ADDR
,PASSWORD_HINT
,PASSWORD_CNSR
,PASSWD_HINT
,PASSWD_NSR
,AREA_NO
,DADDR
,ZIP
@ -2256,8 +2256,8 @@
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(brdt )">AND BRDT = #{brdt }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(fxno )">AND FXNO = #{fxno }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(addr )">AND ADDR = #{addr }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(password_hint )">AND PASSWORD_HINT = #{password_hint }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(password_cnsr )">AND PASSWORD_CNSR = #{password_cnsr }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(passwd_hint )">AND PASSWD_HINT = #{passwd_hint }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(passwd_nsr )">AND PASSWD_NSR = #{passwd_nsr }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(area_no )">AND AREA_NO = #{area_no }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(daddr )">AND DADDR = #{daddr }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(zip )">AND ZIP = #{zip }</if>
@ -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 @@
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(brdt )">,BRDT = #{brdt }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(fxno )">,FXNO = #{fxno }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(addr )">,ADDR = #{addr }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(password_hint )">,PASSWORD_HINT = #{password_hint }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(password_cnsr )">,PASSWORD_CNSR = #{password_cnsr }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(passwd_hint )">,PASSWD_HINT = #{passwd_hint }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(passwd_nsr )">,PASSWD_NSR = #{passwd_nsr }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(area_no )">,AREA_NO = #{area_no }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(daddr )">,DADDR = #{daddr }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notBlank(zip )">,ZIP = #{zip }</if>
@ -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 @@
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(brdt )">AND A.BRDT = #{brdt }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(fxno )">AND A.FXNO = #{fxno }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(addr )">AND A.ADDR = #{addr }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(password_hint )">AND A.PASSWORD_HINT = #{password_hint }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(password_cnsr )">AND A.PASSWORD_CNSR = #{password_cnsr }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(passwd_hint )">AND A.PASSWD_HINT = #{passwd_hint }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(passwd_nsr )">AND A.PASSWD_NSR = #{passwd_nsr }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(area_no )">AND A.AREA_NO = #{area_no }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(daddr )">AND A.DADDR = #{daddr }</if>
<if test="@kr.xit.fims.framework.core.utils.XitCmmnUtil@notEmpty(zip )">AND A.ZIP = #{zip }</if>
@ -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

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

@ -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"

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

@ -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}

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

@ -32,11 +32,11 @@
</field>
-->
<!--
<field property="passwordHint" depends="required">
<field property="passwdHint" depends="required">
<arg0 key="비밀번호힌트" resource="false"/>
</field>
<field property="passwordCnsr" depends="required, maxlength">
<field property="passwdNsr" depends="required, maxlength">
<arg0 key="비밀번호정답" resource="false"/>
<arg1 key="100" resource="false"/>
<var>

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

@ -171,18 +171,18 @@ table {
<label class="required">비밀번호힌트</label>
</th>
<td width="35%" >
<form:select path="passwordHint" id="passwordHint" title="비밀번호힌트">
<form:select path="passwdHint" id="passwdHint" title="비밀번호힌트">
<form:option value="" label="--선택하세요--"/>
<form:options items="${passwordHint_result}" itemValue="code" itemLabel="codeVal"/>
<form:options items="${passwdHint_result}" itemValue="code" itemLabel="codeVal"/>
</form:select>
<form:errors path="passwordHint" cssClass="error"/>
<form:errors path="passwdHint" cssClass="error"/>
</td>
<th width="15%" height="23">
<label class="required">비밀번호정답</label>
</th>
<td width="35%" >
<form:input path="passwordCnsr" id="passwordCnsr" title="비밀번호정답" cssClass="txaIpt" size="50" maxlength="100" />
<form:errors path="passwordCnsr" cssClass="error"/>
<form:input path="passwdNsr" id="passwdNsr" title="비밀번호정답" cssClass="txaIpt" size="50" maxlength="100" />
<form:errors path="passwdNsr" cssClass="error"/>
</td>
</tr>

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

@ -61,23 +61,23 @@
<tr>
<th>
<label for="passwordHint" class="required">비밀번호힌트</label>
<label for="passwdHint" class="required">비밀번호힌트</label>
</th>
<td>
<form:select path="passwordHint" id="passwordHint" title="비밀번호힌트">
<form:select path="passwdHint" id="passwdHint" title="비밀번호힌트">
<form:option value="" label="--선택하세요--"/>
<form:options items="${passwordHint_result}" itemValue="code" itemLabel="codeVal"/>
<form:options items="${passwdHint_result}" itemValue="code" itemLabel="codeVal"/>
</form:select>
<form:errors path="passwordHint" cssClass="error"/>
<form:errors path="passwdHint" cssClass="error"/>
</td>
</tr>
<tr>
<th>
<label for="passwordCnsr" class="required">비밀번호정답</label>
<label for="passwdNsr" class="required">비밀번호정답</label>
</th>
<td>
<form:input path="passwordCnsr" id="passwordCnsr" title="비밀번호정답" cssClass="txaIpt" size="50" maxlength="100" />
<form:errors path="passwordCnsr" cssClass="error"/>
<form:input path="passwdNsr" id="passwdNsr" title="비밀번호정답" cssClass="txaIpt" size="50" maxlength="100" />
<form:errors path="passwdNsr" cssClass="error"/>
</td>
</tr>

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

@ -116,18 +116,18 @@ table {
<label class="required">비밀번호힌트</label>
</th>
<td width="30%" >
<form:select path="passwordHint" id="passwordHint">
<form:select path="passwdHint" id="passwdHint">
<form:option value="" label="--선택하세요--"/>
<form:options items="${passwordHint_result}" itemValue="code" itemLabel="codeVal"/>
<form:options items="${passwdHint_result}" itemValue="code" itemLabel="codeVal"/>
</form:select>
<form:errors path="passwordHint" cssClass="error"/>
<form:errors path="passwdHint" cssClass="error"/>
</td>
<th width="20%" height="23">
<label class="required">비밀번호정답</label>
</th>
<td width="30%" >
<form:input path="passwordCnsr" id="passwordCnsr" cssClass="txaIpt" size="50" maxlength="100" />
<form:errors path="passwordCnsr" cssClass="error"/>
<form:input path="passwdNsr" id="passwdNsr" cssClass="txaIpt" size="50" maxlength="100" />
<form:errors path="passwdNsr" cssClass="error"/>
</td>
</tr>

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

@ -67,17 +67,17 @@
<label class="required">비밀번호힌트</label>
</th>
<td>
<form:select path="passwordHint" id="passwordHint" title="비밀번호힌트">
<form:select path="passwdHint" id="passwdHint" title="비밀번호힌트">
<form:option value="" label="--선택하세요--" />
<form:options items="${passwordHint_result}" itemValue="code" itemLabel="codeVal" />
</form:select> <form:errors path="passwordHint" cssClass="error" />
<form:options items="${passwdHint_result}" itemValue="code" itemLabel="codeVal" />
</form:select> <form:errors path="passwdHint" cssClass="error" />
</td>
<th height="23">
<label class="required">비밀번호정답 </label>
</th>
<td>
<form:input path="passwordCnsr" id="passwordCnsr" title="비밀번호정답" cssClass="txaIpt" size="50" maxlength="100" />
<form:errors path="passwordCnsr" cssClass="error" />
<form:input path="passwdNsr" id="passwdNsr" title="비밀번호정답" cssClass="txaIpt" size="50" maxlength="100" />
<form:errors path="passwdNsr" cssClass="error" />
</td>
</tr>

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

@ -175,18 +175,18 @@ table {
<label class="required">비밀번호힌트</label>
</th>
<td>
<form:select path="passwordHint" id="passwordHint">
<form:select path="passwdHint" id="passwdHint">
<form:option value="" label="--선택하세요--"/>
<form:options items="${passwordHint_result}" itemValue="code" itemLabel="codeVal"/>
<form:options items="${passwdHint_result}" itemValue="code" itemLabel="codeVal"/>
</form:select>
<form:errors path="passwordHint" cssClass="error"/>
<form:errors path="passwdHint" cssClass="error"/>
</td>
<th height="23">
<label class="required">비밀번호정답</label>
</th>
<td>
<form:input path="passwordCnsr" id="passwordCnsr" cssClass="txaIpt" size="50" maxlength="100" />
<form:errors path="passwordCnsr" cssClass="error"/>
<form:input path="passwdNsr" id="passwdNsr" cssClass="txaIpt" size="50" maxlength="100" />
<form:errors path="passwdNsr" cssClass="error"/>
</td>
</tr>

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

@ -69,14 +69,14 @@
<label class="required">비밀번호 힌트</label>
</th>
<td>
<code:select id="passwordHint" name="passwordHint" grpId="XIT022" defaultSelect="${userInfoVO.passwordHint}" title="비밀번호힌트" cls="form-select" alt="비밀번호힌트"/>
<form:errors path="passwordHint" cssClass="error" /></td>
<code:select id="passwdHint" name="passwdHint" grpId="XIT022" defaultSelect="${userInfoVO.passwdHint}" title="비밀번호힌트" cls="form-select" alt="비밀번호힌트"/>
<form:errors path="passwdHint" cssClass="error" /></td>
<th height="23">
<label class="required">비밀번호 정답</label>
</th>
<td>
<form:input path="passwordCnsr" id="passwordCnsr" title="비밀번호정답" cssClass="txaIpt" size="50" maxlength="100" />
<form:errors path="passwordCnsr" cssClass="error" />
<form:input path="passwdNsr" id="passwdNsr" title="비밀번호정답" cssClass="txaIpt" size="50" maxlength="100" />
<form:errors path="passwdNsr" cssClass="error" />
</td>
</tr>
</c:if>

Write Preview
Loading…
Cancel
Save