diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginPolicyVO.java b/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginPolicyVO.java index 42cf45c9..b754af20 100644 --- a/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginPolicyVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginPolicyVO.java @@ -21,9 +21,9 @@ public class XitLoginPolicyVO extends BaseVO { protected String user_id; //사용자 id - protected String ip_info; //ip 정보 + protected String ip_addr; //ip 정보 protected String dplct_yn; //중복 허용 여부 - protected String lmtt_yn; //제한 여부 + protected String limit_yn; //제한 여부 protected String reg_dt; //최초 등록 시점 protected String rgtr; //최초 등록자 id protected String mdfcn_dt; //최종 수정 시점 @@ -35,11 +35,11 @@ public class XitLoginPolicyVO extends BaseVO { public void setUser_id(String user_id) { this.user_id = user_id; } - public String getIp_info() { - return ip_info; + public String getIp_addr() { + return ip_addr; } - public void setIp_info(String ip_info) { - this.ip_info = ip_info; + public void setIp_addr(String ip_addr) { + this.ip_addr = ip_addr; } public String getDplct_yn() { return dplct_yn; @@ -47,11 +47,11 @@ public class XitLoginPolicyVO extends BaseVO { public void setDplct_yn(String dplct_yn) { this.dplct_yn = dplct_yn; } - public String getLmtt_yn() { - return lmtt_yn; + public String getLimit_yn() { + return limit_yn; } - public void setLmtt_yn(String lmtt_yn) { - this.lmtt_yn = lmtt_yn; + public void setLimit_yn(String limit_yn) { + this.limit_yn = limit_yn; } public String getReg_dt() { return reg_dt; 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 947b4ba0..260272f4 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 @@ -72,9 +72,9 @@ public class XitLoginServiceBean extends AbstractServiceBean implements XitLogin loginPolicyVO.setUser_id(loginVO.getId()); loginPolicyVO = xitFrameCrudService.findXitLoginPolicy(loginPolicyVO); if (XitCmmnUtil.notEmpty(loginPolicyVO)) { - if ("Y".equals(loginPolicyVO.getLmtt_yn())) { + if ("Y".equals(loginPolicyVO.getLimit_yn())) { String userIp = XitCmmnUtil.getClientIpAddr(XitHttpRequestHelper.getCurrentRequest()); // 사용자의 접속IP - if (!userIp.equals(loginPolicyVO.getIp_info())) { + if (!userIp.equals(loginPolicyVO.getIp_addr())) { throw new RuntimeException(String.format("접속하신 아이피(%s)가 등록된 아이피와 일치하지 않습니다.", userIp)); } } diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/auth/XitLoginPolicyMngVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/auth/XitLoginPolicyMngVO.java index 3e3a61ae..1ad553ee 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/auth/XitLoginPolicyMngVO.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/auth/XitLoginPolicyMngVO.java @@ -33,7 +33,7 @@ public class XitLoginPolicyMngVO extends BaseVO { /** * IP정보 */ - private String ipInfo; + private String ipAddr; /** * 중복허용여부 */ @@ -41,7 +41,7 @@ public class XitLoginPolicyMngVO extends BaseVO { /** * 제한여부 */ - private String lmttYn; + private String limitYn; /** * 등록자 ID */ @@ -92,16 +92,16 @@ public class XitLoginPolicyMngVO extends BaseVO { this.emplyrSe = emplyrSe; } /** - * @return the ipInfo + * @return the ipAddr */ - public String getIpInfo() { - return ipInfo; + public String getIpAddr() { + return ipAddr; } /** - * @param ipInfo the ipInfo to set + * @param ipAddr the ipAddr to set */ - public void setIpInfo(String ipInfo) { - this.ipInfo = ipInfo; + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; } /** * @return the dplctYn @@ -116,16 +116,16 @@ public class XitLoginPolicyMngVO extends BaseVO { this.dplctYn = dplctYn; } /** - * @return the lmttYn + * @return the limitYn */ - public String getLmttYn() { - return lmttYn; + public String getLimitYn() { + return limitYn; } /** - * @param lmttYn the lmttYn to set + * @param limitYn the limitYn to set */ - public void setLmttYn(String lmttYn) { - this.lmttYn = lmttYn; + public void setLimitYn(String limitYn) { + this.limitYn = limitYn; } /** * @return the userId diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/XitLoginPolicyMngServiceBean.java b/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/XitLoginPolicyMngServiceBean.java index 617686e4..e4ccbf5b 100644 --- a/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/XitLoginPolicyMngServiceBean.java +++ b/src/main/java/kr/xit/fims/framework/biz/mng/auth/service/bean/XitLoginPolicyMngServiceBean.java @@ -127,9 +127,9 @@ public class XitLoginPolicyMngServiceBean extends AbstractServiceBean implements private XitLoginPolicyVO convertToCrudVO(XitLoginPolicyMngVO vo) { XitLoginPolicyVO crudVO = new XitLoginPolicyVO(); crudVO.setUser_id(vo.getEmplyrId()); //사용자 id - crudVO.setIp_info(vo.getIpInfo()); //ip 정보 + crudVO.setIp_addr(vo.getIpAddr()); //ip 정보 crudVO.setDplct_yn(vo.getDplctYn()); //중복 허용 여부 - crudVO.setLmtt_yn(vo.getLmttYn()); //제한 여부 + crudVO.setLimit_yn(vo.getLimitYn()); //제한 여부 return crudVO; } 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 bb0b2d58..18e16a14 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 @@ -1568,9 +1568,9 @@ /** findXitLoginPolicys */ /** 로그인정책 다건 조회 */ SELECT USER_ID - ,IP_INFO + ,IP_ADDR ,DPLCT_YN - ,LMTT_YN + ,LIMIT_YN ,REG_DT ,RGTR ,MDFCN_DT @@ -1578,9 +1578,9 @@ FROM XIT_LOGIN_POLICY WHERE 1=1 AND USER_ID = #{user_id } - AND IP_INFO = #{ip_info } + AND IP_ADDR = #{ip_addr } AND DPLCT_YN = #{dplct_yn } - AND LMTT_YN = #{lmtt_yn } + AND LIMIT_YN = #{limit_yn } AND REG_DT = #{reg_dt} AND RGTR = #{rgtr } AND MDFCN_DT = #{mdfcn_dt } @@ -1590,9 +1590,9 @@ /** findXitLoginPolicy */ /** 로그인정책 조회 */ SELECT USER_ID - ,IP_INFO + ,IP_ADDR ,DPLCT_YN - ,LMTT_YN + ,LIMIT_YN ,REG_DT ,RGTR ,MDFCN_DT @@ -1606,9 +1606,9 @@ /** 로그인정책 등록 */ INSERT INTO XIT_LOGIN_POLICY( USER_ID - ,IP_INFO + ,IP_ADDR ,DPLCT_YN - ,LMTT_YN + ,LIMIT_YN ,REG_DT ,RGTR ,MDFCN_DT @@ -1616,9 +1616,9 @@ ,MDFR )VALUES( #{user_id } - ,#{ip_info } + ,#{ip_addr } ,#{dplct_yn } - ,#{lmtt_yn } + ,#{limit_yn } ,NOW() ,#{rgtr } ,NOW() @@ -1632,9 +1632,9 @@ UPDATE XIT_LOGIN_POLICY SET MDFCN_DT = NOW() - ,IP_INFO = #{ip_info } + ,IP_ADDR = #{ip_addr } ,DPLCT_YN = #{dplct_yn } - ,LMTT_YN = #{lmtt_yn } + ,LIMIT_YN = #{limit_yn } ,REG_DT = #{reg_dt} ,RGTR = #{rgtr } ,MDFR = #{mdfr } diff --git a/src/main/resources/sql/mapper/framework/mng/auth/XitLoginPolicyMng-mysql-mapper.xml b/src/main/resources/sql/mapper/framework/mng/auth/XitLoginPolicyMng-mysql-mapper.xml index fe2f0115..89cc878a 100644 --- a/src/main/resources/sql/mapper/framework/mng/auth/XitLoginPolicyMng-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/framework/mng/auth/XitLoginPolicyMng-mysql-mapper.xml @@ -15,9 +15,9 @@ SELECT A.USER_ID AS "emplyrId" ,A.USER_NM AS "emplyrNm" ,A.USER_SE AS "emplyrSe" - ,B.IP_INFO AS "ipInfo" + ,B.IP_ADDR AS "ipAddr" ,B.DPLCT_YN AS "dplctYn" - ,B.LMTT_YN AS "lmttYn" + ,B.LIMIT_YN AS "limitYn" ,B.MDFR AS "userId" ,B.MDFCN_DT AS "regDate" ,CASE B.USER_ID WHEN NULL THEN 'N' ELSE 'Y' END AS "regYn" diff --git a/src/main/resources/validator/framework/mng/policy/XitLoginPolicyMng.xml b/src/main/resources/validator/framework/mng/policy/XitLoginPolicyMng.xml index 1d1a195f..61f8eb93 100644 --- a/src/main/resources/validator/framework/mng/policy/XitLoginPolicyMng.xml +++ b/src/main/resources/validator/framework/mng/policy/XitLoginPolicyMng.xml @@ -7,7 +7,7 @@
- + @@ -15,7 +15,7 @@ 23 - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/XitLoginPolicyMng_edit.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/XitLoginPolicyMng_edit.jsp index 776358bc..e6795922 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/XitLoginPolicyMng_edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/XitLoginPolicyMng_edit.jsp @@ -44,16 +44,16 @@ -   +   - + + (Y로 설정되면 등록된 IP에서의 접속만을 허용하도록 제한됨) @@ -231,7 +231,7 @@ switch(flag){ case 'ip' : //아이피 var varFrom = document.loginPolicy; - var IPvalue = varFrom.ipInfo.value; + var IPvalue = varFrom.ipAddr.value; var ipPattern = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/; var ipArray = IPvalue.match(ipPattern); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/XitLoginPolicyMng_input.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/XitLoginPolicyMng_input.jsp index 73933d4d..e6358889 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/XitLoginPolicyMng_input.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/XitLoginPolicyMng_input.jsp @@ -43,17 +43,17 @@ -   +   - -   +   (Y로 설정되면 등록된 IP에서의 접속만을 허용하도록 제한됨) @@ -186,7 +186,7 @@ switch(flag){ case 'ip' : //아이피 var varFrom = document.loginPolicy; - var IPvalue = varFrom.ipInfo.value; + var IPvalue = varFrom.ipAddr.value; var ipPattern = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/; var ipArray = IPvalue.match(ipPattern); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/XitLoginPolicyMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/XitLoginPolicyMng_list.jsp index 389f4ad4..bd5f159d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/XitLoginPolicyMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/XitLoginPolicyMng_list.jsp @@ -268,14 +268,14 @@ GridConfig.setOptColumns([ //Grid 컬럼 정보(명칭,매핑 field, 기타옵 }, { header: 'IP정보', - name: 'ipInfo', + name: 'ipAddr', minWidth: 200, sortable: false, align: 'center' }, { header: '제한여부', - name: 'lmttYn', + name: 'limitYn', minWidth: 60, sortable: false, align: 'center' diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitLoginPolicyMng_list2.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitLoginPolicyMng_list2.jsp index 52d7240c..ba785394 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitLoginPolicyMng_list2.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitLoginPolicyMng_list2.jsp @@ -232,8 +232,8 @@ function press() { - - YN + + YN