From 398a4927e195755bd6a46be99337efd8dacc3dc2 Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 월, 07 3월 2022 18:08:13 +0900
Subject: [PATCH] Merge branch 'master' of http://maprex.iptime.org:9001/r/owl-kisa

---
 src/main/java/kr/wisestone/owl/constant/MsgConstants.java |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/constant/MsgConstants.java b/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
index 7a9959e..9e00613 100644
--- a/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
+++ b/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
@@ -185,6 +185,7 @@
     public static final String EXCEL_IMPORT_DATETIME_NOT_DASH = "EXCEL_IMPORT_DATETIME_NOT_DASH"; //  �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �엯�젰�븳 �궗�슜�옄 �젙�쓽 �븘�뱶�뿉 臾몄젣媛� �엳�뒿�땲�떎. '-'�씠 �룷�븿�릺�뼱 �엳�뒗吏� �솗�씤 �썑 '-'瑜� �룷�븿 �떆耳쒖<�꽭�슂. ex) 2022-01-01
     public static final String EXCEL_CUSTOM_FIELD_VALUE_NOT_VALIDITY = "EXCEL_CUSTOM_FIELD_VALUE_NOT_VALIDITY"; //  �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �엯�젰�븳 �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪씠 �쑀�슚�븯吏� �븡�뒿�땲�떎.
     public static final String EXCEL_IMPORT_HEADER_CUSTOM_FIELD_NOT_EXIST = "EXCEL_IMPORT_HEADER_CUSTOM_FIELD_NOT_EXIST";   //  �벑濡앺븯�젮�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 李얠쓣 �닔 �뾾�뒿�땲�떎. �빐�떦 �궗�슜�옄 �젙�쓽�븘�뱶�쓽 �씠由꾩씠 蹂�寃쎈릺�뿀嫄곕굹 �궘�젣�릺�뿀�뒿�땲�떎.
+    public static final String EXCEL_IMPORT_IP_ADDRESS_NOT_VALIDITY = "EXCEL_IMPORT_IP_ADDRESS_NOT_VALIDITY"; //  �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �엯�젰�븳 �궗�슜�옄 �젙�쓽 �븘�뱶 以� IP_ADDRESS �뿉 臾몄젣媛� �엳�뒿�땲�떎. IP二쇱냼 �삎�떇�뿉 留욊쾶 �엯�젰 �빐二쇱꽭�슂.
 
     public static final String EXCEL_IMPORT_COMPANY_NAME_IS_NULL = "EXCEL_IMPORT_COMPANY_NAME_IS_NULL";   //  �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �뾽泥대챸�씠 �엯�젰吏� �븡�븯�뒿�땲�떎.
     public static final String EXCEL_IMPORT_URL_IS_NULL = "EXCEL_IMPORT_URL_IS_NULL";   //  �떎�쓬 �뿊�� �씪�씤�뿉�꽌 URL�씠 �엯�젰吏� �븡�븯�뒿�땲�떎.
@@ -200,6 +201,12 @@
     public static final String EXCEL_IMPORT_PARENT_SECTOR_NOT_EXIST = "EXCEL_IMPORT_PARENT_SECTOR_NOT_EXIST";   //  �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �엯�젰�맂 �뾽醫낅챸�쑝濡� 寃��깋�릺�뒗 �뾽醫�(��遺꾨쪟)�씠 �뾾�뒿�땲�떎
     public static final String EXCEL_IMPORT_CHILD_SECTOR_NOT_EXIST = "EXCEL_IMPORT_CHILD_SECTOR_NOT_EXIST";   //  �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �엯�젰�맂 �뾽醫낅챸�쑝濡� 寃��깋�릺�뒗 �뾽醫�(以묐텇瑜�)�씠 �뾾�뒿�땲�떎
     public static final String EXCEL_IMPORT_REGION_NOT_EXIST = "EXCEL_IMPORT_REGION_NOT_EXIST";   //  �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �엯�젰�맂 吏��뿭紐낆쑝濡� 寃��깋�릺�뒗 吏��뿭�씠 �뾾�뒿�땲�떎
+
+    public static final String EXCEL_IMPORT_ISP_NAME_IS_NULL = "EXCEL_IMPORT_ISP_NAME_IS_NULL";   //  �떎�쓬 �뿊�� �씪�씤�뿉�꽌 ISP紐낆씠 �엯�젰�릺吏� �븡�븯�뒿�땲�떎.
+    public static final String EXCEL_IMPORT_ISP_CODE_IS_NULL = "EXCEL_IMPORT_ISP_CODE_IS_NULL";   //  �떎�쓬 �뿊�� �씪�씤�뿉�꽌 肄붾뱶媛� �엯�젰�릺吏� �븡�븯�뒿�땲�떎.
+
+    public static final String EXCEL_IMPORT_HOSTING_NAME_IS_NULL = "EXCEL_IMPORT_HOSTING_NAME_IS_NULL";   //  �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �샇�뒪�똿紐낆씠 �엯�젰�릺吏� �븡�븯�뒿�땲�떎.
+    public static final String EXCEL_IMPORT_HOSTING_CODE_IS_NULL = "EXCEL_IMPORT_HOSTING_CODE_IS_NULL";   //  �떎�쓬 �뿊�� �씪�씤�뿉�꽌 肄붾뱶媛� �엯�젰�릺吏� �븡�븯�뒿�땲�떎.
 
     public static final String DOWN_ISSUE_NOT_EXIST = "DOWN_ISSUE_NOT_EXIST";   //  �븯�쐞 �씠�뒋 李얠쓣�닔 �뾾�쓬
 
@@ -246,6 +253,9 @@
 
     public static final String DEPARTMENT_NOT_EXIST = "DEPARTMENT_NOT_EXIST";   // 遺��꽌媛� 議댁옱�븯吏� �븡�뒿�땲�떎.
     public static final String DEPARTMENT_ALREADY_IN_USE = "DEPARTMENT_ALREADY_IN_USE";   // �꽑�깮�븳 遺��꽌�뒗 �씠誘� �궗�슜�븯怨� �엳�뒿�땲�떎.
+    public static final String DEPARTMENT_ALREADY_IN_USE_IN_WORKFLOW = "DEPARTMENT_ALREADY_IN_USE_IN_WORKFLOW";   // �꽑�깮�븳 遺��꽌�뒗 �썙�겕�뵆濡쒖슦�쓽 �떞�떦遺��꽌�뿉 �냽�빐 �엳�뒿�땲�떎.
+    public static final String DEPARTMENT_ALREADY_IN_USE_IN_PROJECT = "DEPARTMENT_ALREADY_IN_USE_IN_PROJECT";   // �꽑�깮�븳 遺��꽌�뒗 �봽濡쒖젥�듃�쓽 �떞�떦遺��꽌�뿉 �냽�빐 �엳�뒿�땲�떎.
+    public static final String DEPARTMENT_ALREADY_IN_USE_IN_ISSUE = "DEPARTMENT_ALREADY_IN_USE_IN_ISSUE";   // �꽑�깮�븳 遺��꽌�뒗 �씠�뒋�쓽 �떞�떦遺��꽌�뿉 �냽�빐 �엳�뒿�땲�떎.
     public static final String DEPARTMENT_REMOVE_NOT_SELECT = "DEPARTMENT_REMOVE_NOT_SELECT";   // �궘�젣�븷 遺��꽌媛� �꽑�깮�릺吏� �븡�븯�뒿�땲�떎.
     public static final String USER_DEPARTMENT_CHANGE = "USER_DEPARTMENT_CHANGE";   // �궗�슜�옄�쓽 遺��꽌媛� 蹂�寃� �릺�뿀�뒿�땲�떎. �떎�떆 濡쒓렇�씤 �빐二쇱꽭�슂.
 
@@ -257,16 +267,32 @@
     public static final String COMPANY_USED_URL = "COMPANY_USED_URL";   // URL�씠 �씠誘� �궗�슜�릺怨� �엳�뒿�땲�떎.
     public static final String COMPANY_NAME_MAX_LENGTH_OUT = "COMPANY_NAME_MAX_LENGTH_OUT";   //  �뾽泥대챸�� 理쒕� 300湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
 
-    public static final String HOSTING_NOT_EXIST = "HOSTING_NOT_EXIST";   // �샇�뒪�똿�씠 議댁옱�븯吏� �븡�뒿�땲�떎.
+    public static final String HOSTING_NO_TITLE = "HOSTING_NO_TITLE";   // �샇�뒪�똿紐낆씠 �엯�젰�릺吏� �븡�븯�뒿�땲�떎.
     public static final String HOSTING_CODE_NOT_ENTER = "HOSTING_CODE_NOT_ENTER";   // �샇�뒪�똿�쓽 肄붾뱶�뒗 �븘�닔 �엯�젰 媛믪엯�땲�떎.
+    public static final String HOSTING_CODE_USED_EXIST_VALUE = "HOSTING_CODE_USED_EXIST_VALUE"; // �엯�젰�븳 �샇�뒪�똿�쓽 肄붾뱶媛� �씠誘� 議댁옱�빀�땲�떎.
     public static final String HOSTING_REMOVE_NOT_SELECT = "HOSTING_REMOVE_NOT_SELECT";   // �궘�젣�븷 �샇�뒪�똿�씠 �꽑�깮�릺吏� �븡�븯�뒿�땲�떎.
+    public static final String HOSTING_NOT_EXIST = "HOSTING_NOT_EXIST";   // �샇�뒪�똿�씠 議댁옱�븯吏� �븡�뒿�땲�떎.
+    public static final String HOSTING_NAME_MAX_LENGTH_OUT = "HOSTING_NAME_MAX_LENGTH_OUT";  // �샇�뒪�똿紐낆� 理쒕� 300湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
+    public static final String HOSTING_NAME_ALREADY_IN_USE = "HOSTING_NAME_ALREADY_IN_USE";   // �빐�떦 �샇�뒪�똿紐낆� �씠誘� �벑濡앸릺�뼱 �엳�뒿�땲�떎.
     public static final String HOSTING_EXIST_COMPANY = "HOSTING_EXIST_COMPANY";   // �뾽泥댁뿉 �꽕�젙�릺�뼱�엳�뒗 �샇�뒪�똿�씠 議댁옱�빀�땲�떎.
 
-    public static final String ISP_NOT_EXIST = "ISP_NOT_EXIST";   // ISP媛� 議댁옱�븯吏� �븡�뒿�땲�떎.
+    public static final String ISP_NO_TITLE = "ISP_NO_TITLE";   // ISP紐낆씠 �엯�젰�릺吏� �븡�븯�뒿�땲�떎.
     public static final String ISP_CODE_NOT_ENTER = "ISP_CODE_NOT_ENTER";   // ISP�쓽 肄붾뱶�뒗 �븘�닔 �엯�젰 媛믪엯�땲�떎.
+    public static final String ISP_CODE_USED_EXIST_VALUE = "ISP_CODE_USED_EXIST_VALUE";   // �엯�젰�븳 ISP�쓽 肄붾뱶媛� �씠誘� 議댁옱�빀�땲�떎.
     public static final String ISP_REMOVE_NOT_SELECT = "ISP_REMOVE_NOT_SELECT";   // �궘�젣�븷 ISP媛� �꽑�깮�릺吏� �븡�븯�뒿�땲�떎.
+    public static final String ISP_NOT_EXIST = "ISP_NOT_EXIST";   // ISP媛� 議댁옱�븯吏� �븡�뒿�땲�떎.
+    public static final String ISP_NAME_MAX_LENGTH_OUT = "ISP_NAME_MAX_LENGTH_OUT";  // ISP紐낆� 理쒕� 300湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
+    public static final String ISP_NAME_ALREADY_IN_USE = "ISP_NAME_ALREADY_IN_USE";   // �빐�떦 ISP紐낆� �씠誘� �벑濡앸릺�뼱 �엳�뒿�땲�떎.
     public static final String ISP_EXIST_COMPANY = "ISP_EXIST_COMPANY";   // �뾽泥댁뿉 �꽕�젙�릺�뼱�엳�뒗 ISP媛� 議댁옱�빀�땲�떎.
+
+    public static final String CODE_NOT_INVALID = "CODE_NOT_INVALID";   // 肄붾뱶紐낆뿉�뒗 �듅�닔臾몄옄瑜� �엯�젰 �븷 �닔 �뾾�뒿�땲�떎.
+    public static final String TEL_NOT_INVALID = "TEL_NOT_INVALID";   // �뿰�씫泥섏뿉�뒗 �닽�옄留� �삉�뒗 �닽�옄 + �븯�씠�뵂('-')留� �엯�젰 �븷 �닔 �엳�뒿�땲�떎.
+    public static final String EMAIL_NOT_INVALID = "EMAIL_NOT_INVALID";   //  �씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+    public static final String IP_NOT_INVALID = "IP_NOT_INVALID";   //  IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+    public static final String IP_START_NOT_LARGER_THAN_END = "IP_START_NOT_LARGER_THAN_END";   //  �떆�옉 IP媛� �걹 IP 蹂대떎 �겢 �닔 �뾾�뒿�땲�떎.
+
     public static final String PROJECT_NOT_INCLUDE_DEPARTMENT = "PROJECT_NOT_INCLUDE_DEPARTMENT";   // �꽑�깮�븳 遺��꽌 以� �봽濡쒖젥�듃�뿉 李몄뿬�븯怨� �엳吏� �븡�� 遺��꽌媛� �엳�뒿�땲�떎.
+    public static final String PROJECT_DEPARTMENT_NOT_EQUAL_WORKFLOW = "PROJECT_DEPARTMENT_NOT_EQUAL_WORKFLOW"; // �빐�떦 �봽濡쒖젥�듃�뿉 �냽�빐�엳�뒗 �썙�겕�뵆濡쒖슦�쓽 �떞�떦遺��꽌�뒗 �봽濡쒖젥�듃�쓽 �떞�떦遺��꽌�뿉�꽌 �젣�쇅�떆�궗 �닔 �뾾�뒿�땲�떎.
 
     public static final String EMAIL_TEMPLATE_NOT_EXIST = "EMAIL_TEMPLATE_NOT_EXIST"; //  �씠硫붿씪 �뀥�뵆由우쓣 李얠쓣�닔 �뾾�뒿�땲�떎.
 

--
Gitblit v1.8.0