From 6cca0884d9375eac730ff9331404e689ff3d6ba2 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Mon, 31 Jul 2023 09:09:13 +0900 Subject: [PATCH] =?UTF-8?q?=EC=83=89=EC=83=81=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=EA=B0=80=EB=8A=A5=ED=95=9C=20svg=ED=8C=8C=EC=9D=BC=20=EA=B2=BD?= =?UTF-8?q?=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 --- .../cokr/xit/fims/base/FileController.java | 13 +--- .../svg}/계도장 발송현황.svg | 0 .../svg}/고정형cctv.svg | 0 .../svg}/고지서 발송현황.svg | 0 .../framework => resources/svg}/도보단속.svg | 0 .../framework => resources/svg}/등록대상.svg | 0 .../svg}/민원(즉시단속).svg | 0 .../svg}/사전통보 발송현황.svg | 0 .../svg}/수용_미수용.svg | 0 .../svg}/이동형cctv.svg | 0 .../framework => resources/svg}/이첩대상.svg | 0 .../framework => resources/svg}/자진취하.svg | 0 .../fims/framework => resources/svg}/접수.svg | 0 .../css/fims/framework/common/xit-icon.css | 72 +++++++++---------- 14 files changed, 39 insertions(+), 46 deletions(-) rename src/main/{webapp/resources/image/fims/framework => resources/svg}/계도장 발송현황.svg (100%) rename src/main/{webapp/resources/image/fims/framework => resources/svg}/고정형cctv.svg (100%) rename src/main/{webapp/resources/image/fims/framework => resources/svg}/고지서 발송현황.svg (100%) rename src/main/{webapp/resources/image/fims/framework => resources/svg}/도보단속.svg (100%) rename src/main/{webapp/resources/image/fims/framework => resources/svg}/등록대상.svg (100%) rename src/main/{webapp/resources/image/fims/framework => resources/svg}/민원(즉시단속).svg (100%) rename src/main/{webapp/resources/image/fims/framework => resources/svg}/사전통보 발송현황.svg (100%) rename src/main/{webapp/resources/image/fims/framework => resources/svg}/수용_미수용.svg (100%) rename src/main/{webapp/resources/image/fims/framework => resources/svg}/이동형cctv.svg (100%) rename src/main/{webapp/resources/image/fims/framework => resources/svg}/이첩대상.svg (100%) rename src/main/{webapp/resources/image/fims/framework => resources/svg}/자진취하.svg (100%) rename src/main/{webapp/resources/image/fims/framework => resources/svg}/접수.svg (100%) diff --git a/src/main/java/cokr/xit/fims/base/FileController.java b/src/main/java/cokr/xit/fims/base/FileController.java index b305c9f1..c8282513 100644 --- a/src/main/java/cokr/xit/fims/base/FileController.java +++ b/src/main/java/cokr/xit/fims/base/FileController.java @@ -45,18 +45,11 @@ public class FileController extends cokr.xit.base.file.web.FileController { public void modifySvg(HttpServletRequest request, HttpServletResponse response) throws URISyntaxException, IOException, ParserConfigurationException, SAXException { String requestURI = request.getRequestURI().toString(); - String filepath = requestURI.replace("/file/modifySvg","/resources/image"); - System.out.println("log : "+filepath); + String filepath = requestURI.split("modifySvg")[1]; filepath = URLDecoder.decode(filepath); - System.out.println("log : "+filepath); - filepath = request.getSession().getServletContext().getRealPath(filepath); - System.out.println("log : "+filepath); filepath = filepath.replace("\\","/"); - System.out.println("log : "+filepath); - String contextPath = request.getSession().getServletContext().getContextPath(); - filepath = filepath.replace("webapp"+contextPath+"/resources", "webapp/resources"); - System.out.println("log : "+filepath); - filepath = "file:///"+filepath; + String svgRootPath = ("classpath:svg"); + filepath = svgRootPath + filepath; DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilder documentBuilder = factory.newDocumentBuilder(); diff --git a/src/main/webapp/resources/image/fims/framework/계도장 발송현황.svg b/src/main/resources/svg/계도장 발송현황.svg similarity index 100% rename from src/main/webapp/resources/image/fims/framework/계도장 발송현황.svg rename to src/main/resources/svg/계도장 발송현황.svg diff --git a/src/main/webapp/resources/image/fims/framework/고정형cctv.svg b/src/main/resources/svg/고정형cctv.svg similarity index 100% rename from src/main/webapp/resources/image/fims/framework/고정형cctv.svg rename to src/main/resources/svg/고정형cctv.svg diff --git a/src/main/webapp/resources/image/fims/framework/고지서 발송현황.svg b/src/main/resources/svg/고지서 발송현황.svg similarity index 100% rename from src/main/webapp/resources/image/fims/framework/고지서 발송현황.svg rename to src/main/resources/svg/고지서 발송현황.svg diff --git a/src/main/webapp/resources/image/fims/framework/도보단속.svg b/src/main/resources/svg/도보단속.svg similarity index 100% rename from src/main/webapp/resources/image/fims/framework/도보단속.svg rename to src/main/resources/svg/도보단속.svg diff --git a/src/main/webapp/resources/image/fims/framework/등록대상.svg b/src/main/resources/svg/등록대상.svg similarity index 100% rename from src/main/webapp/resources/image/fims/framework/등록대상.svg rename to src/main/resources/svg/등록대상.svg diff --git a/src/main/webapp/resources/image/fims/framework/민원(즉시단속).svg b/src/main/resources/svg/민원(즉시단속).svg similarity index 100% rename from src/main/webapp/resources/image/fims/framework/민원(즉시단속).svg rename to src/main/resources/svg/민원(즉시단속).svg diff --git a/src/main/webapp/resources/image/fims/framework/사전통보 발송현황.svg b/src/main/resources/svg/사전통보 발송현황.svg similarity index 100% rename from src/main/webapp/resources/image/fims/framework/사전통보 발송현황.svg rename to src/main/resources/svg/사전통보 발송현황.svg diff --git a/src/main/webapp/resources/image/fims/framework/수용_미수용.svg b/src/main/resources/svg/수용_미수용.svg similarity index 100% rename from src/main/webapp/resources/image/fims/framework/수용_미수용.svg rename to src/main/resources/svg/수용_미수용.svg diff --git a/src/main/webapp/resources/image/fims/framework/이동형cctv.svg b/src/main/resources/svg/이동형cctv.svg similarity index 100% rename from src/main/webapp/resources/image/fims/framework/이동형cctv.svg rename to src/main/resources/svg/이동형cctv.svg diff --git a/src/main/webapp/resources/image/fims/framework/이첩대상.svg b/src/main/resources/svg/이첩대상.svg similarity index 100% rename from src/main/webapp/resources/image/fims/framework/이첩대상.svg rename to src/main/resources/svg/이첩대상.svg diff --git a/src/main/webapp/resources/image/fims/framework/자진취하.svg b/src/main/resources/svg/자진취하.svg similarity index 100% rename from src/main/webapp/resources/image/fims/framework/자진취하.svg rename to src/main/resources/svg/자진취하.svg diff --git a/src/main/webapp/resources/image/fims/framework/접수.svg b/src/main/resources/svg/접수.svg similarity index 100% rename from src/main/webapp/resources/image/fims/framework/접수.svg rename to src/main/resources/svg/접수.svg diff --git a/src/main/webapp/resources/css/fims/framework/common/xit-icon.css b/src/main/webapp/resources/css/fims/framework/common/xit-icon.css index 2394723f..a832dfaf 100644 --- a/src/main/webapp/resources/css/fims/framework/common/xit-icon.css +++ b/src/main/webapp/resources/css/fims/framework/common/xit-icon.css @@ -1,73 +1,73 @@ .svg-cctv-fixed:before { - --bs-origin : url("../../../../../resources/image/fims/framework/고정형cctv.svg"); - --bs-active : url("../../../../../file/modifySvg/fims/framework/고정형cctv.svg?modify=active"); - --bs-alert : url("../../../../../file/modifySvg/fims/framework/고정형cctv.svg?modify=alert"); + --bs-origin : url("../../../../../file/modifySvg/고정형cctv.svg"); + --bs-active : url("../../../../../file/modifySvg/고정형cctv.svg?modify=active"); + --bs-alert : url("../../../../../file/modifySvg/고정형cctv.svg?modify=alert"); } .svg-cctv-drive:before { - --bs-origin : url("../../../../../resources/image/fims/framework/이동형cctv.svg"); - --bs-active : url("../../../../../file/modifySvg/fims/framework/이동형cctv.svg?modify=active"); - --bs-alert : url("../../../../../file/modifySvg/fims/framework/이동형cctv.svg?modify=alert"); + --bs-origin : url("../../../../../file/modifySvg/이동형cctv.svg"); + --bs-active : url("../../../../../file/modifySvg/이동형cctv.svg?modify=active"); + --bs-alert : url("../../../../../file/modifySvg/이동형cctv.svg?modify=alert"); } .svg-crackdown-road:before { - --bs-origin : url("../../../../../resources/image/fims/framework/도보단속.svg"); - --bs-active : url("../../../../../file/modifySvg/fims/framework/도보단속.svg?modify=active"); - --bs-alert : url("../../../../../file/modifySvg/fims/framework/도보단속.svg?modify=alert"); + --bs-origin : url("../../../../../file/modifySvg/도보단속.svg"); + --bs-active : url("../../../../../file/modifySvg/도보단속.svg?modify=active"); + --bs-alert : url("../../../../../file/modifySvg/도보단속.svg?modify=alert"); } .svg-crackdown-minwon:before { - --bs-origin : url("../../../../../resources/image/fims/framework/민원(즉시단속).svg"); - --bs-active : url("../../../../../file/modifySvg/fims/framework/민원(즉시단속).svg?modify=active"); - --bs-alert : url("../../../../../file/modifySvg/fims/framework/민원(즉시단속).svg?modify=alert"); + --bs-origin : url("../../../../../file/modifySvg/민원(즉시단속).svg"); + --bs-active : url("../../../../../file/modifySvg/민원(즉시단속).svg?modify=active"); + --bs-alert : url("../../../../../file/modifySvg/민원(즉시단속).svg?modify=alert"); } .svg-target-lvy:before { - --bs-origin : url("../../../../../resources/image/fims/framework/등록대상.svg"); - --bs-active : url("../../../../../file/modifySvg/fims/framework/등록대상.svg?modify=active"); - --bs-alert : url("../../../../../file/modifySvg/fims/framework/등록대상.svg?modify=alert"); + --bs-origin : url("../../../../../file/modifySvg/등록대상.svg"); + --bs-active : url("../../../../../file/modifySvg/등록대상.svg?modify=active"); + --bs-alert : url("../../../../../file/modifySvg/등록대상.svg?modify=alert"); } .svg-target-transfer:before { - --bs-origin : url("../../../../../resources/image/fims/framework/이첩대상.svg"); - --bs-active : url("../../../../../file/modifySvg/fims/framework/이첩대상.svg?modify=active"); - --bs-alert : url("../../../../../file/modifySvg/fims/framework/이첩대상.svg?modify=alert"); + --bs-origin : url("../../../../../file/modifySvg/이첩대상.svg"); + --bs-active : url("../../../../../file/modifySvg/이첩대상.svg?modify=active"); + --bs-alert : url("../../../../../file/modifySvg/이첩대상.svg?modify=alert"); } .svg-sendstat-guide:before { - --bs-origin : url("../../../../../resources/image/fims/framework/계도장 발송현황.svg"); - --bs-active : url("../../../../../file/modifySvg/fims/framework/계도장 발송현황.svg?modify=active"); - --bs-alert : url("../../../../../file/modifySvg/fims/framework/계도장 발송현황.svg?modify=alert"); + --bs-origin : url("../../../../../file/modifySvg/계도장 발송현황.svg"); + --bs-active : url("../../../../../file/modifySvg/계도장 발송현황.svg?modify=active"); + --bs-alert : url("../../../../../file/modifySvg/계도장 발송현황.svg?modify=alert"); } .svg-sendstat-before:before { - --bs-origin : url("../../../../../resources/image/fims/framework/사전통보 발송현황.svg"); - --bs-active : url("../../../../../file/modifySvg/fims/framework/사전통보 발송현황.svg?modify=active"); - --bs-alert : url("../../../../../file/modifySvg/fims/framework/사전통보 발송현황.svg?modify=alert"); + --bs-origin : url("../../../../../file/modifySvg/사전통보 발송현황.svg"); + --bs-active : url("../../../../../file/modifySvg/사전통보 발송현황.svg?modify=active"); + --bs-alert : url("../../../../../file/modifySvg/사전통보 발송현황.svg?modify=alert"); } .svg-sendstat-nop:before { - --bs-origin : url("../../../../../resources/image/fims/framework/고지서 발송현황.svg"); - --bs-active : url("../../../../../file/modifySvg/fims/framework/고지서 발송현황.svg?modify=active"); - --bs-alert : url("../../../../../file/modifySvg/fims/framework/고지서 발송현황.svg?modify=alert"); + --bs-origin : url("../../../../../file/modifySvg/고지서 발송현황.svg"); + --bs-active : url("../../../../../file/modifySvg/고지서 발송현황.svg?modify=active"); + --bs-alert : url("../../../../../file/modifySvg/고지서 발송현황.svg?modify=alert"); } .svg-opn-rcp:before { - --bs-origin : url("../../../../../resources/image/fims/framework/접수.svg"); - --bs-active : url("../../../../../file/modifySvg/fims/framework/접수.svg?modify=active"); - --bs-alert : url("../../../../../file/modifySvg/fims/framework/접수.svg?modify=alert"); + --bs-origin : url("../../../../../file/modifySvg/접수.svg"); + --bs-active : url("../../../../../file/modifySvg/접수.svg?modify=active"); + --bs-alert : url("../../../../../file/modifySvg/접수.svg?modify=alert"); } .svg-opn-decision:before { - --bs-origin : url("../../../../../resources/image/fims/framework/수용_미수용.svg"); - --bs-active : url("../../../../../file/modifySvg/fims/framework/수용_미수용.svg?modify=active"); - --bs-alert : url("../../../../../file/modifySvg/fims/framework/수용_미수용.svg?modify=alert"); + --bs-origin : url("../../../../../file/modifySvg/수용_미수용.svg"); + --bs-active : url("../../../../../file/modifySvg/수용_미수용.svg?modify=active"); + --bs-alert : url("../../../../../file/modifySvg/수용_미수용.svg?modify=alert"); } .svg-opn-selfdrop:before { - --bs-origin : url("../../../../../resources/image/fims/framework/자진취하.svg"); - --bs-active : url("../../../../../file/modifySvg/fims/framework/자진취하.svg?modify=active"); - --bs-alert : url("../../../../../file/modifySvg/fims/framework/자진취하.svg?modify=alert"); + --bs-origin : url("../../../../../file/modifySvg/자진취하.svg"); + --bs-active : url("../../../../../file/modifySvg/자진취하.svg?modify=active"); + --bs-alert : url("../../../../../file/modifySvg/자진취하.svg?modify=alert"); } [class^=svg-]:before {