From 35ba08e4afd4bdea0c5447edf2085dad1ab532c2 Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Wed, 5 Jun 2024 09:17:20 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B3=B5=ED=86=B5=20=EB=A6=AC=EC=86=8C?=
 =?UTF-8?q?=EC=8A=A4(js,=20css)=20=EA=B2=BD=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/adds/nims/barcode-main.jsp    |  2 +-
 .../webapp/WEB-INF/jsp/error/errorPage.jsp    |  2 +-
 src/main/webapp/WEB-INF/jsp/include/head.jsp  |  2 +-
 src/main/webapp/WEB-INF/jsp/include/tail.jsp  | 43 ++++++++++---------
 src/main/webapp/resources/css/xit-core.css    |  2 +-
 .../webapp/resources/js/base/base-fims.js     |  2 +-
 .../webapp/resources/js/fims/photo-main.js    |  2 +-
 7 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/barcode-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/barcode-main.jsp
index d5e0729..16970f5 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/barcode-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/barcode-main.jsp
@@ -49,7 +49,7 @@
 </div>
 
 <!--<script type="text/javascript" src="https://unpkg.com/@zxing/library@latest/umd/index.min.js"></script>-->
-<%--<script src="<c:url value="/resources/js/base/base.js?${ver}"/>" defer></script>--%>
+<%--<script src="<c:url value="/webjars/js/base/base.js"/>" defer></script>--%>
 <script src="<c:url value='/resources/js/zxing-library-0.20.0.min.js' />" defer></script>
 <script type="text/javascript">
     window.addEventListener('load', function () {
diff --git a/src/main/webapp/WEB-INF/jsp/error/errorPage.jsp b/src/main/webapp/WEB-INF/jsp/error/errorPage.jsp
index 133608b..6e66279 100644
--- a/src/main/webapp/WEB-INF/jsp/error/errorPage.jsp
+++ b/src/main/webapp/WEB-INF/jsp/error/errorPage.jsp
@@ -60,7 +60,7 @@
         <a onclick="history.back();" class="btn btn-primary mt-2" href="javascript:void(0);" autofocus>이전으로 돌아가기</a>
         <div class="mt-3">
           <img
-            src="<c:url value="/resources/img/illustrations/page-misc-error-light.png"/>"
+            src="<c:url value="/webjars/img/illustrations/page-misc-error-light.png"/>"
             alt="page-misc-error-light"
             width="500"
             class="img-fluid"
diff --git a/src/main/webapp/WEB-INF/jsp/include/head.jsp b/src/main/webapp/WEB-INF/jsp/include/head.jsp
index 0595871..291d221 100644
--- a/src/main/webapp/WEB-INF/jsp/include/head.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/head.jsp
@@ -15,7 +15,7 @@
   <title>${appName}</title>
 
   <!-- Favicon -->
-  <link rel="icon" type="image/x-icon" href="<c:url value="/resources/image/favicon.ico"/>" />
+  <link rel="icon" type="image/x-icon" href="<c:url value="/webjars/image/favicon.ico"/>" />
 
   <!-- Fonts -->
   <link rel="preconnect" href="https://fonts.googleapis.com">
diff --git a/src/main/webapp/WEB-INF/jsp/include/tail.jsp b/src/main/webapp/WEB-INF/jsp/include/tail.jsp
index 521eb08..7458bb6 100644
--- a/src/main/webapp/WEB-INF/jsp/include/tail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/tail.jsp
@@ -5,33 +5,34 @@
 </div>
 
 <!-- Core JS -->
-<script src="<c:url value="/resources/sneat/libs/popper/popper.js?${ver}"/>"></script>
-<script src="<c:url value="/resources/sneat/js/bootstrap.js?${ver}"/>"></script>
-<script src="<c:url value="/resources/sneat/libs/jquery/jquery.js?${ver}"/>"></script>
+<script src="<c:url value="/webjars/3rd-party/sneat/libs/popper/popper.js"/>"></script>
+<script src="<c:url value="/webjars/3rd-party/sneat/js/bootstrap.js"/>"></script>
+<script src="<c:url value="/webjars/3rd-party/sneat/libs/jquery/jquery.js"/>"></script>
+<script src="<c:url value="/webjars/3rd-party/jquery-ui/1.13.2/jquery-ui.js"/>"></script>
 
-<script src="<c:url value="/resources/sneat/js/config.js?${ver}"/>"></script>
-<script src="<c:url value="/resources/sneat/libs/perfect-scrollbar/perfect-scrollbar.js?${ver}"/>"></script>
-<script src="<c:url value="/resources/sneat/js/helpers.js?${ver}"/>"></script>
-<script src="<c:url value="/resources/sneat/js/menu.js?${ver}"/>"></script>
-<script src="<c:url value="/resources/sneat/libs/jstree/jstree.js?${ver}"/>"></script>
-<script src="<c:url value="/resources/js/base/jstree-support.js?${ver}"/>"></script>
-<script src="<c:url value='/resources/sneat/libs/jquery-sticky/jquery-sticky.js' />"></script>
-<script src="<c:url value="/resources/sneat/libs/bootstrap-datepicker/bootstrap-datepicker.js?${ver}"/>"></script>
+<script src="<c:url value="/webjars/3rd-party/sneat/js/config.js"/>"></script>
+<script src="<c:url value="/webjars/3rd-party/sneat/libs/perfect-scrollbar/perfect-scrollbar.js"/>"></script>
+<script src="<c:url value="/webjars/3rd-party/sneat/js/helpers.js"/>"></script>
+<script src="<c:url value="/webjars/3rd-party/sneat/js/menu.js"/>"></script>
+<script src="<c:url value="/webjars/3rd-party/sneat/libs/jstree/jstree.js"/>"></script>
+<script src="<c:url value="/webjars/3rd-party/jstree/jstree-support.js"/>"></script>
+<script src="<c:url value="/webjars/3rd-party/sneat/libs/jquery-sticky/jquery-sticky.js" />"></script>
+<script src="<c:url value="/webjars/3rd-party/sneat/libs/bootstrap-datepicker/bootstrap-datepicker.js"/>"></script>
 <!-- base -->
-<script src="<c:url value="/resources/js/base/base.js?${ver}"/>"></script>
-<script src="<c:url value="/resources/js/base/dataset.js?${ver}"/>"></script>
+<script src="<c:url value="/webjars/js/base/base.js"/>"></script>
+<script src="<c:url value="/webjars/js/base/dataset.js"/>"></script>
 <script src="<c:url value="/resources/js/base/upload-support.js?${ver}"/>"></script>
-<script src="<c:url value="/resources/js/base/code.js?${ver}"/>"></script>
-<script src="<c:url value="/resources/js/base/code-support.js?${ver}"/>"></script>
-<script src="<c:url value="/resources/js/base/menu.js?${ver}"/>"></script>
-<script src="<c:url value="/resources/js/base/menu-support.js?${ver}"/>"></script>
-<script src="<c:url value="/resources/js/base/actionGroup.js?${ver}"/>"></script>
-<script src="<c:url value="/resources/js/base/user.js?${ver}"/>"></script>
-<script src="<c:url value="/resources/js/base/authority.js?${ver}"/>"></script>
+<script src="<c:url value="/webjars/js/base/code.js"/>"></script>
+<script src="<c:url value="/webjars/js/base/code-support.js"/>"></script>
+<script src="<c:url value="/webjars/js/base/menu.js"/>"></script>
+<script src="<c:url value="/webjars/js/base/menu-support.js"/>"></script>
+<script src="<c:url value="/webjars/js/base/actionGroup.js"/>"></script>
+<script src="<c:url value="/webjars/js/base/user.js"/>"></script>
+<script src="<c:url value="/webjars/js/base/authority.js"/>"></script>
 
 
 <!-- 전체화면 비활성화 -->
-<script src="<c:url value="/resources/sneat/libs/block-ui/block-ui.js?${ver}"/>"></script>
+<script src="<c:url value="/webjars/3rd-party/sneat/libs/block-ui/block-ui.js"/>"></script>
     
 <script src="<c:url value="/resources/js/base/base-fims.js?${ver}"/>"></script>
 
diff --git a/src/main/webapp/resources/css/xit-core.css b/src/main/webapp/resources/css/xit-core.css
index 2ccb8b6..c49af09 100644
--- a/src/main/webapp/resources/css/xit-core.css
+++ b/src/main/webapp/resources/css/xit-core.css
@@ -107,7 +107,7 @@
 }
 
 .hidden {
-	display:none !important;
+	display:none;
 }
 
 [hidden] {
diff --git a/src/main/webapp/resources/js/base/base-fims.js b/src/main/webapp/resources/js/base/base-fims.js
index 0ad10b1..ac4f8c4 100644
--- a/src/main/webapp/resources/js/base/base-fims.js
+++ b/src/main/webapp/resources/js/base/base-fims.js
@@ -15,7 +15,7 @@ async function prompt2(msg){
 
 async function dialog2(msg, type, buttons){
 	var dlgId = "dlg-" + uuid();
-	var resp = await fetch(wctx.url("/resources/html/dialog.html"));
+	var resp = await fetch(wctx.url("/webjars/html/dialog.html"));
 	var template = await resp.text();
 	var container = "<div class='container-fluid text-center fs-4'>{content}</div>";
 	if(type == "prompt"){
diff --git a/src/main/webapp/resources/js/fims/photo-main.js b/src/main/webapp/resources/js/fims/photo-main.js
index cdfb8f5..b65e08b 100644
--- a/src/main/webapp/resources/js/fims/photo-main.js
+++ b/src/main/webapp/resources/js/fims/photo-main.js
@@ -1,4 +1,4 @@
-LoadScript("sortableScript","/resources/sneat/libs/sortablejs/sortable.js");
+LoadScript("sortableScript","/webjars/3rd-party/sneat/libs/sortablejs/sortable.js");
 
 function settingPhotoMain(pageName, crdnIdElementId, carInfoFunc, carLinkFunc){